Skip to content

S
sdkjs
Commit 8d9f6db4 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov
Browse files
Options

правки 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68757 954022d7-b5bf-4e40-9824-e11837661b57
parent 1b490850
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 553 additions and 610 deletions
Common/FontsFreeType/Private/FreeType/config.js
View file @ 8d9f6db4
...@@ -905,36 +905,45 @@ function _FT_Common() ...@@ -905,36 +905,45 @@ function _FT_Common()
this.tt_coderange_cvt = 2; this.tt_coderange_cvt = 2;
this.tt_coderange_glyph = 3; this.tt_coderange_glyph = 3;
this.TT_INTERPRETER_VERSION_35 = 35;
this.TT_INTERPRETER_VERSION_38 = 38;
this.SPH_OPTION_BITMAP_WIDTHS = false; this.SPH_OPTION_BITMAP_WIDTHS = false;
this.SPH_OPTION_SET_SUBPIXEL = true; this.SPH_OPTION_SET_SUBPIXEL = true;
this.SPH_OPTION_SET_GRAYSCALE = false; this.SPH_OPTION_SET_GRAYSCALE = false;
this.SPH_OPTION_SET_COMPATIBLE_WIDTHS = false; this.SPH_OPTION_SET_COMPATIBLE_WIDTHS = false;
this.SPH_OPTION_SET_RASTERIZER_VERSION = 38; this.SPH_OPTION_SET_RASTERIZER_VERSION = 38;
this.SPH_TWEAK_ALLOW_X_DMOVE = 0x0000001; this.SPH_FDEF_INLINE_DELTA_1 = 0x0000001;
this.SPH_TWEAK_ALLOW_X_DMOVEX = 0x0000002; this.SPH_FDEF_INLINE_DELTA_2 = 0x0000002;
this.SPH_TWEAK_ALLOW_X_MOVE_ZP2 = 0x0000004; this.SPH_FDEF_DIAGONAL_STROKE = 0x0000004;
this.SPH_TWEAK_ALWAYS_DO_DELTAP = 0x0000008; this.SPH_FDEF_VACUFORM_ROUND_1 = 0x0000008;
this.SPH_TWEAK_ALWAYS_SKIP_DELTAP = 0x0000010; this.SPH_FDEF_TTFAUTOHINT_1 = 0x0000010;
this.SPH_TWEAK_COURIER_NEW_2_HACK = 0x0000020; this.SPH_FDEF_SPACING_1 = 0x0000020;
this.SPH_TWEAK_DEEMBOLDEN = 0x0000040; this.SPH_FDEF_SPACING_2 = 0x0000040;
this.SPH_TWEAK_DELTAP_SKIP_EXAGGERATED_VALUES = 0x0000080; this.SPH_FDEF_TYPEMAN_STROKES = 0x0000080;
this.SPH_TWEAK_DO_SHPIX = 0x0000100; this.SPH_FDEF_TYPEMAN_DIAGENDCTRL = 0x0000100;
this.SPH_TWEAK_EMBOLDEN = 0x0000200;
this.SPH_TWEAK_MIAP_HACK = 0x0000400; this.SPH_TWEAK_ALLOW_X_DMOVE = 0x0000001;
this.SPH_TWEAK_NORMAL_ROUND = 0x0000800; this.SPH_TWEAK_ALWAYS_DO_DELTAP = 0x0000002;
this.SPH_TWEAK_NO_ALIGNRP_AFTER_IUP = 0x0001000; this.SPH_TWEAK_ALWAYS_SKIP_DELTAP = 0x0000004;
this.SPH_TWEAK_NO_CALL_AFTER_IUP = 0x0002000; this.SPH_TWEAK_COURIER_NEW_2_HACK = 0x0000008;
this.SPH_TWEAK_NO_DELTAP_AFTER_IUP = 0x0004000; this.SPH_TWEAK_DEEMBOLDEN = 0x0000010;
this.SPH_TWEAK_PIXEL_HINTING = 0x0008000; this.SPH_TWEAK_DO_SHPIX = 0x0000020;
this.SPH_TWEAK_RASTERIZER_35 = 0x0010000; this.SPH_TWEAK_EMBOLDEN = 0x0000040;
this.SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES = 0x0020000; this.SPH_TWEAK_MIAP_HACK = 0x0000080;
this.SPH_TWEAK_SKIP_INLINE_DELTAS = 0x0040000; this.SPH_TWEAK_NORMAL_ROUND = 0x0000100;
this.SPH_TWEAK_SKIP_IUP = 0x0080000; this.SPH_TWEAK_NO_ALIGNRP_AFTER_IUP = 0x0000200;
this.SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES = 0x0100000; this.SPH_TWEAK_NO_CALL_AFTER_IUP = 0x0000400;
this.SPH_TWEAK_SKIP_OFFPIXEL_Y_MOVES = 0x0200000; this.SPH_TWEAK_NO_DELTAP_AFTER_IUP = 0x0000800;
this.SPH_TWEAK_TIMES_NEW_ROMAN_HACK = 0x0400000; this.SPH_TWEAK_PIXEL_HINTING = 0x0001000;
this.SPH_TWEAK_MIRP_CVT_ZERO = 0x0800000; this.SPH_TWEAK_RASTERIZER_35 = 0x0002000;
this.SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES = 0x0004000;
this.SPH_TWEAK_SKIP_IUP = 0x0008000;
this.SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES = 0x0010000;
this.SPH_TWEAK_SKIP_OFFPIXEL_Y_MOVES = 0x0020000;
this.SPH_TWEAK_TIMES_NEW_ROMAN_HACK = 0x0040000;
this.SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES_DELTAP = 0x0080000;
this.FT_CURVE_TAG_HAS_SCANMODE = 4; this.FT_CURVE_TAG_HAS_SCANMODE = 4;
this.FT_CURVE_TAG_TOUCH_X = 8; /* reserved for the TrueType hinter */ this.FT_CURVE_TAG_TOUCH_X = 8; /* reserved for the TrueType hinter */
......
Common/FontsFreeType/Private/FreeType/drivers/truetype.js
View file @ 8d9f6db4
...@@ -307,6 +307,10 @@ function TT_Face() ...@@ -307,6 +307,10 @@ function TT_Face()
this.read_glyph_header = null; this.read_glyph_header = null;
this.read_simple_glyph = null; this.read_simple_glyph = null;
this.read_composite_glyph = null; this.read_composite_glyph = null;
this.sph_found_func_flags = 0; /* special functions found */
/* for this face */
this.sph_compatibility_mode = false;
} }
/******************************************************************************/ /******************************************************************************/
// gxvar // gxvar
...@@ -1210,10 +1214,14 @@ function TT_Get_HMetrics(face, idx) ...@@ -1210,10 +1214,14 @@ function TT_Get_HMetrics(face, idx)
{ {
return face.sfnt.get_metrics(face, 0, idx); return face.sfnt.get_metrics(face, 0, idx);
} }
function TT_Get_VMetrics(face, idx) function TT_Get_VMetrics(face, idx, yMax)
{ {
if (face.vertical_info === true) if (face.vertical_info === true)
return face.sfnt.get_metrics(face, 1, idx); return face.sfnt.get_metrics(face, 1, idx);
else if (face.os2.version != 0xFFFF)
return {bearing : (face.os2.sTypoAscender - yMax), advance : (face.os2.sTypoAscender - face.os2.sTypoDescender)};
else
return {bearing : (face.horizontal.Ascender - yMax), advance : (face.horizontal.Ascender - face.horizontal.Descender)};
return {bearing : 0, advance : face.units_per_EM}; return {bearing : 0, advance : face.units_per_EM};
} }
...@@ -1223,7 +1231,7 @@ function tt_get_metrics(loader, glyph_index) ...@@ -1223,7 +1231,7 @@ function tt_get_metrics(loader, glyph_index)
var face = loader.face; var face = loader.face;
var h = TT_Get_HMetrics(face, glyph_index); var h = TT_Get_HMetrics(face, glyph_index);
var v = TT_Get_VMetrics(face, glyph_index); var v = TT_Get_VMetrics(face, glyph_index, loader.bbox.yMax);
loader.left_bearing = h.bearing; loader.left_bearing = h.bearing;
loader.advance = h.advance; loader.advance = h.advance;
...@@ -1251,7 +1259,7 @@ function tt_get_metrics_incr_overrides(loader, glyph_index) ...@@ -1251,7 +1259,7 @@ function tt_get_metrics_incr_overrides(loader, glyph_index)
var face = loader.face; var face = loader.face;
var h = TT_Get_HMetrics(face, glyph_index); var h = TT_Get_HMetrics(face, glyph_index);
var v = TT_Get_VMetrics(face, glyph_index); var v = TT_Get_VMetrics(face, glyph_index, 0);
if (face.internal.incremental_interface && face.internal.incremental_interface.funcs.get_glyph_metrics) if (face.internal.incremental_interface && face.internal.incremental_interface.funcs.get_glyph_metrics)
{ {
...@@ -1712,8 +1720,7 @@ function TT_Process_Simple_Glyph(loader) ...@@ -1712,8 +1720,7 @@ function TT_Process_Simple_Glyph(loader)
var ppem = loader.size.metrics.x_ppem; var ppem = loader.size.metrics.x_ppem;
if ((loader.load_flags & FT_Common.FT_LOAD_NO_HINTING) == 0) if ((loader.load_flags & FT_Common.FT_LOAD_NO_HINTING) == 0)
{ {
x_scale_factor = global_SubpixHintingHacks.scale_test_tweak(_face, _face.family_name, ppem, _face.style_name, loader.glyph_index, x_scale_factor = global_SubpixHintingHacks.sph_test_tweak_x_scaling(_face, _face.family_name, ppem, _face.style_name, loader.glyph_index);
global_SubpixHintingHacks.X_SCALING_Rules, global_SubpixHintingHacks.X_SCALING_RULES_SIZE);
} }
if ((loader.load_flags & FT_Common.FT_LOAD_NO_SCALE) == 0 || x_scale_factor != 1000) if ((loader.load_flags & FT_Common.FT_LOAD_NO_SCALE) == 0 || x_scale_factor != 1000)
...@@ -2329,6 +2336,30 @@ function tt_loader_init(loader, size, glyph, load_flags, glyf_table_only) ...@@ -2329,6 +2336,30 @@ function tt_loader_init(loader, size, glyph, load_flags, glyf_table_only)
return 0; return 0;
} }
function tt_face_get_device_metrics(face, ppem, gindex)
{
var _ret = null;
var record_size = face.hdmx_record_size;
for (var nn = 0; nn < face.hdmx_record_count; nn++ )
{
if ( face.hdmx_record_sizes[nn] == ppem )
{
gindex += 2;
if (gindex < record_size)
{
_ret = dublicate_pointer(face.hdmx_table);
_ret.pos += (8 + nn * record_size + gindex);
}
break;
}
}
return _ret;
}
function compute_glyph_metrics(loader, glyph_index) function compute_glyph_metrics(loader, glyph_index)
{ {
var bbox = new FT_BBox(); var bbox = new FT_BBox();
...@@ -2358,7 +2389,20 @@ function compute_glyph_metrics(loader, glyph_index) ...@@ -2358,7 +2389,20 @@ function compute_glyph_metrics(loader, glyph_index)
if (face.postscript.isFixedPitch == 0 && (loader.load_flags & FT_Common.FT_LOAD_NO_HINTING) == 0) if (face.postscript.isFixedPitch == 0 && (loader.load_flags & FT_Common.FT_LOAD_NO_HINTING) == 0)
{ {
// TODO: var widthp = tt_face_get_device_metrics(face, loader.size.metrics.x_ppem, glyph_index);
if (face.driver.library.tt_hint_props.TT_CONFIG_OPTION_SUBPIXEL_HINTING)
{
var ignore_x_mode = (FT_LOAD_TARGET_MODE(loader.load_flags) != FT_Common.FT_RENDER_MODE_MONO);
if (null != widthp && ((ignore_x_mode && loader.exec.compatible_widths) || !ignore_x_mode || FT_Common.SPH_OPTION_BITMAP_WIDTHS))
glyph.metrics.horiAdvance = widthp.data[widthp.pos] << 6;
}
else
{
if (null != widthp)
glyph.metrics.horiAdvance = widthp.data[widthp.pos] << 6;
}
} }
glyph.metrics.width = bbox.xMax - bbox.xMin; glyph.metrics.width = bbox.xMax - bbox.xMin;
...@@ -2584,6 +2628,10 @@ function load_truetype_glyph(loader, glyph_index, recurse_count, header_only) ...@@ -2584,6 +2628,10 @@ function load_truetype_glyph(loader, glyph_index, recurse_count, header_only)
return error; return error;
} }
var subpixel_ = (loader.exec && loader.exec.subpixel_hinting) ? true : false;
var subpixel_ = (loader.exec && loader.exec.grayscale_hinting) ? true : false;
var use_aw_2_ = (subpixel_ && grayscale_);
if (loader.byte_len == 0 || loader.n_contours == 0) if (loader.byte_len == 0 || loader.n_contours == 0)
{ {
loader.bbox.xMin = 0; loader.bbox.xMin = 0;
...@@ -2598,9 +2646,9 @@ function load_truetype_glyph(loader, glyph_index, recurse_count, header_only) ...@@ -2598,9 +2646,9 @@ function load_truetype_glyph(loader, glyph_index, recurse_count, header_only)
loader.pp1.y = 0; loader.pp1.y = 0;
loader.pp2.x = loader.pp1.x + loader.advance; loader.pp2.x = loader.pp1.x + loader.advance;
loader.pp2.y = 0; loader.pp2.y = 0;
loader.pp3.x = 0; loader.pp3.x = use_aw_2_ ? (loader.advance >> 0) : 0;
loader.pp3.y = loader.top_bearing + loader.bbox.yMax; loader.pp3.y = loader.top_bearing + loader.bbox.yMax;
loader.pp4.x = 0; loader.pp4.x = use_aw_2_ ? (loader.advance >> 0) : 0;
loader.pp4.y = loader.pp3.y - loader.vadvance; loader.pp4.y = loader.pp3.y - loader.vadvance;
//#ifdef FT_CONFIG_OPTION_INCREMENTAL //#ifdef FT_CONFIG_OPTION_INCREMENTAL
...@@ -2640,9 +2688,9 @@ function load_truetype_glyph(loader, glyph_index, recurse_count, header_only) ...@@ -2640,9 +2688,9 @@ function load_truetype_glyph(loader, glyph_index, recurse_count, header_only)
loader.pp1.y = 0; loader.pp1.y = 0;
loader.pp2.x = loader.pp1.x + loader.advance; loader.pp2.x = loader.pp1.x + loader.advance;
loader.pp2.y = 0; loader.pp2.y = 0;
loader.pp3.x = 0; loader.pp3.x = use_aw_2_ ? (loader.advance >> 0) : 0;
loader.pp3.y = loader.top_bearing + loader.bbox.yMax; loader.pp3.y = loader.top_bearing + loader.bbox.yMax;
loader.pp4.x = 0; loader.pp4.x = use_aw_2_ ? (loader.advance >> 0) : 0;
loader.pp4.y = loader.pp3.y - loader.vadvance; loader.pp4.y = loader.pp3.y - loader.vadvance;
//#ifdef FT_CONFIG_OPTION_INCREMENTAL //#ifdef FT_CONFIG_OPTION_INCREMENTAL
...@@ -3468,7 +3516,8 @@ function tt_get_advances(face, start, count, flags, advances) ...@@ -3468,7 +3516,8 @@ function tt_get_advances(face, start, count, flags, advances)
{ {
for (var nn = 0; nn < count; nn++) for (var nn = 0; nn < count; nn++)
{ {
var res = TT_Get_VMetrics(face, start + nn); /* since we don't need `tsb', we use zero for `yMax' parameter */
var res = TT_Get_VMetrics(face, start + nn, 0);
advances[nn] = res.ah; advances[nn] = res.ah;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7