From cf31e7ac4e58738f8ddaae716b50535bca0174ec Mon Sep 17 00:00:00 2001 From: Qunxin Liu <48925186+qxliu76@users.noreply.github.com> Date: Thu, 11 Dec 2025 09:54:49 -0800 Subject: [PATCH] [instancer] support full instancing for avar2 (#5676) --- src/hb-ot-var-avar-table.hh | 48 ++++++++ src/hb-subset-plan-var.cc | 106 ++++++++++++------ src/hb-subset-plan.cc | 3 +- src/hb-subset-plan.hh | 2 +- ...slnt=-6,GRAD=-150,XTSP=50.iup_optimize.ttf | Bin 0 -> 4436 bytes ...600,wdth=120,slnt=-6,GRAD=-150,XTSP=50.ttf | Bin 0 -> 4436 bytes .../fonts/RobotoDelta-Roman-VF-subset.ttf | Bin 0 -> 23776 bytes .../data/tests/avar2_full_instance.tests | 20 ++++ test/subset/meson.build | 1 + test/subset/subset_test_suite.py | 4 +- 10 files changed, 147 insertions(+), 37 deletions(-) create mode 100644 test/subset/data/expected/avar2_full_instance/RobotoDelta-Roman-VF-subset.default.all.opsz=70,wght=600,wdth=120,slnt=-6,GRAD=-150,XTSP=50.iup_optimize.ttf create mode 100644 test/subset/data/expected/avar2_full_instance/RobotoDelta-Roman-VF-subset.default.all.opsz=70,wght=600,wdth=120,slnt=-6,GRAD=-150,XTSP=50.ttf create mode 100644 test/subset/data/fonts/RobotoDelta-Roman-VF-subset.ttf create mode 100644 test/subset/data/tests/avar2_full_instance.tests diff --git a/src/hb-ot-var-avar-table.hh b/src/hb-ot-var-avar-table.hh index 71aed2e8e..86ef254f3 100644 --- a/src/hb-ot-var-avar-table.hh +++ b/src/hb-ot-var-avar-table.hh @@ -411,6 +411,54 @@ struct avar #endif } + bool has_v2_data () const { return version.major > 1; } + + // axis normalization is done in 2.14 here + // TODO: deprecate this API once fonttools is updated to use 16.16 normalization + bool map_coords_2_14 (float *coords, unsigned int coords_length) const + { + hb_vector_t coords_2_14; + if (!coords_2_14.resize (coords_length)) return false; + unsigned int count = hb_min (coords_length, axisCount); + + const SegmentMaps *map = &firstAxisSegmentMaps; + for (unsigned int i = 0; i < count; i++) + { + int v = roundf (map->map_float (coords[i]) * 16384.f); + coords_2_14[i] = v; + coords[i] = v / 16384.f; + map = &StructAfter (*map); + } + +#ifndef HB_NO_AVAR2 + if (version.major < 2) + return true; + hb_barrier (); + + for (; count < axisCount; count++) + map = &StructAfter (*map); + + const auto &v2 = * (const avarV2Tail *) map; + + const auto &varidx_map = this+v2.varIdxMap; + const auto &var_store = this+v2.varStore; + auto *var_store_cache = var_store.create_cache (); + + for (unsigned i = 0; i < coords_length; i++) + { + int v = coords_2_14[i]; + uint32_t varidx = varidx_map.map (i); + float delta = var_store.get_delta (varidx, coords_2_14.arrayZ, coords_2_14.length, var_store_cache); + v += roundf (delta); + v = hb_clamp (v, -(1<<16), +(1<<16)); + coords[i] = v / 16384.f; + } + + OT::ItemVariationStore::destroy_cache (var_store_cache); + return true; +#endif + } + bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); diff --git a/src/hb-subset-plan-var.cc b/src/hb-subset-plan-var.cc index 3fe3d633d..fe29127d9 100644 --- a/src/hb-subset-plan-var.cc +++ b/src/hb-subset-plan-var.cc @@ -160,36 +160,43 @@ #endif -void +bool normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan) { if (plan->user_axes_location.is_empty ()) - return; + return true; hb_array_t axes = face->table.fvar->get_axes (); - plan->normalized_coords.resize (axes.length); + if (!plan->check_success (plan->normalized_coords.resize (axes.length))) + return false; bool has_avar = face->table.avar->has_data (); - const OT::SegmentMaps *seg_maps = nullptr; - unsigned avar_axis_count = 0; + hb_vector_t normalized_mins; + hb_vector_t normalized_defaults; + hb_vector_t normalized_maxs; if (has_avar) { - seg_maps = face->table.avar->get_segment_maps (); - avar_axis_count = face->table.avar->get_axis_count(); + if (!plan->check_success (normalized_mins.resize (axes.length)) || + !plan->check_success (normalized_defaults.resize (axes.length)) || + !plan->check_success (normalized_maxs.resize (axes.length))) + return false; } bool axis_not_pinned = false; - unsigned old_axis_idx = 0, new_axis_idx = 0; - for (const auto& axis : axes) + unsigned new_axis_idx = 0; + unsigned last_idx = 0; + for (const auto& _ : + hb_enumerate (axes)) { + unsigned i = _.first; + const OT::AxisRecord &axis = _.second; hb_tag_t axis_tag = axis.get_axis_tag (); - plan->axes_old_index_tag_map.set (old_axis_idx, axis_tag); + plan->axes_old_index_tag_map.set (i, axis_tag); if (!plan->user_axes_location.has (axis_tag) || !plan->user_axes_location.get (axis_tag).is_point ()) { axis_not_pinned = true; - plan->axes_index_map.set (old_axis_idx, new_axis_idx); + plan->axes_index_map.set (i, new_axis_idx); plan->axis_tags.push (axis_tag); new_axis_idx++; } @@ -216,35 +223,66 @@ normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan) normalized_default = roundf (normalized_default * 16384.f) / 16384.f; normalized_max = roundf (normalized_max * 16384.f) / 16384.f; - if (has_avar && old_axis_idx < avar_axis_count) + if (has_avar) { - normalized_min = seg_maps->map_float (normalized_min); - normalized_default = seg_maps->map_float (normalized_default); - normalized_max = seg_maps->map_float (normalized_max); - - // Round to 2.14 - normalized_min = roundf (normalized_min * 16384.f) / 16384.f; - normalized_default = roundf (normalized_default * 16384.f) / 16384.f; - normalized_max = roundf (normalized_max * 16384.f) / 16384.f; + normalized_mins[i] = normalized_min; + normalized_defaults[i] = normalized_default; + normalized_maxs[i] = normalized_max; + last_idx = i; } - plan->axes_location.set (axis_tag, Triple ((double) normalized_min, - (double) normalized_default, - (double) normalized_max)); + else + { + plan->axes_location.set (axis_tag, Triple ((double) normalized_min, + (double) normalized_default, + (double) normalized_max)); + if (normalized_default == -0.f) + normalized_default = 0.f; // Normalize -0 to 0 + if (normalized_default != 0.f) + plan->pinned_at_default = false; - if (normalized_default == -0.f) - normalized_default = 0.f; // Normalize -0 to 0 - if (normalized_default != 0.f) - plan->pinned_at_default = false; - - plan->normalized_coords[old_axis_idx] = roundf (normalized_default * 16384.f); + plan->normalized_coords[i] = roundf (normalized_default * 16384.f); + } } - - old_axis_idx++; - - if (has_avar && old_axis_idx < avar_axis_count) - seg_maps = &StructAfter (*seg_maps); } plan->all_axes_pinned = !axis_not_pinned; + + // TODO: use avar map_coords_16_16() when normalization is changed to 16.16 + // in fonttools + if (has_avar) + { + const OT::avar* avar_table = face->table.avar; + if (avar_table->has_v2_data () && !plan->all_axes_pinned) + { + DEBUG_MSG (SUBSET, nullptr, "Partial-instancing avar2 table is not supported."); + return false; + } + + unsigned coords_len = last_idx + 1; + if (!plan->check_success (avar_table->map_coords_2_14 (normalized_mins.arrayZ, coords_len)) || + !plan->check_success (avar_table->map_coords_2_14 (normalized_defaults.arrayZ, coords_len)) || + !plan->check_success (avar_table->map_coords_2_14 (normalized_maxs.arrayZ, coords_len))) + return false; + + for (const auto& _ : + hb_enumerate (axes)) + { + unsigned i = _.first; + hb_tag_t axis_tag = _.second.get_axis_tag (); + if (plan->user_axes_location.has (axis_tag)) + { + plan->axes_location.set (axis_tag, Triple ((double) normalized_mins[i], + (double) normalized_defaults[i], + (double) normalized_maxs[i])); + float normalized_default = normalized_defaults[i]; + if (normalized_default == -0.f) + normalized_default = 0.f; // Normalize -0 to 0 + if (normalized_default != 0.f) + plan->pinned_at_default = false; + + plan->normalized_coords[i] = roundf (normalized_default * 16384.f); + } + } + } + return true; } void diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index c69f542b7..767c1bf2d 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -677,7 +677,8 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face, return; #ifndef HB_NO_VAR - normalize_axes_location (face, this); + if (!check_success (normalize_axes_location (face, this))) + return; #endif _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, this); diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh index 30e8e639b..2a935b8f1 100644 --- a/src/hb-subset-plan.hh +++ b/src/hb-subset-plan.hh @@ -333,7 +333,7 @@ generate_varstore_inner_maps (const hb_set_t& varidx_set, unsigned subtable_count, hb_vector_t &inner_maps /* OUT */); -HB_INTERNAL void +HB_INTERNAL bool normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan); HB_INTERNAL void diff --git a/test/subset/data/expected/avar2_full_instance/RobotoDelta-Roman-VF-subset.default.all.opsz=70,wght=600,wdth=120,slnt=-6,GRAD=-150,XTSP=50.iup_optimize.ttf b/test/subset/data/expected/avar2_full_instance/RobotoDelta-Roman-VF-subset.default.all.opsz=70,wght=600,wdth=120,slnt=-6,GRAD=-150,XTSP=50.iup_optimize.ttf new file mode 100644 index 0000000000000000000000000000000000000000..4d8cd3fac04745c66b5e723b7626b22055b2aa8e GIT binary patch literal 4436 zcmb_fdu&@*9sbU}*VlI5565nkHno#93DTN|Bu!x|B}v_+84*t7o5U`G)pgP&G;u83 zUE56zDuRZpZ0ZWE(xd?c(GIDIBE~dL;-T@-5D%#m2qB?u66!w)5FmljC<))W_c%=! zyG_xKb#lIQ&hPx*=XY)(094>J&~b7od~^`iFaY7!)9Osus|Fq!~#rCekRwE5tXr-!r>#;dJI|!Bk>#=8sKZ|2W`!11McdFJ*IUgSf{1KDo~h9OLA=LUaLx1>#(SX*2Bs?t@i z^2F_Htu>EU9{ML59Qi-_TXhF_aC_p^i@3PC5L`-86iU zGwQc+S}Gy?dXqBN+fXDjgdZV+q+_@D1@cjz)4$=mNgPz#mY@@dVc0g;Cog0cP(PcQ zIfHuJ{(4fe(IUxToSDg_7;T4>;GUN=VRxyFhbpz(Ck~^F7TagJE}ORQKRI(EtJxlu zIFB?U8F@(|`L+=;kL{){rL&LAt#h+;Il=vN)44f8`s_j~Cv@mTWBp;lD8#JjsBpm* zi;Nx@Cd{}T-EhaOv3}kv&pS7j0Km2j4KPmzU#I5jA zu>(8ea(yRuMy-)yQIC3#5snQ!Hy|3YD;60X7Q3)JF2~(yj9DBTu_rFaJqQl;k3~fg zp^5&F4v7$&CdML`XhL(`vPMKRT4I(pDO#{MZbhPEFEd);*|k;uvi>RTV=i^|9`ySI zp|;l6HodjAxycOFg$}g#c6a#$wSKd?skM!h?zU#r4EX)x`hkHet-MOmLqe}Mzx(rF zJna%6(!F)QQlm`QeZF!-6JwW+-@pBYX{NQ7&W6UFl^u(N;#=qE5}Akm$&Vy2tzMg& zoque8bWy*){PeQC3pc2b%yt)Q5dykH2fOuPd2SRm@$E0rByX`6y>h*ml+~r ze(&|yUiZFop>OKBN86X@m#^Ns`nivNq5Ts#j(zwErsh6YO4cmHOZ=MWrosX(o)v{P zRCu0LSVxcN5rqw6zrrrmyYDD$qSO6L2Q&9~xL;OSpv?V}!Wv54UshNr{-VML@g;>_ zXmOub*hGi>0}8wGkh@G_4?4|1DC|YMnU_^Utn}wS88DU3yeoZXiJ~t@*!44oD-d&~ z6t2WcSB1h==rrC`xEj4iUjG_Q86#@F78Clv6!u|2&+AZ!K0T+_{Rr!w3J1`mDPQq! z^=NOX^_}R|t|(lODXmxG2AmLi8+YNb$op+K4vABWrV)L-Pj(!6-#YORg@b6sZxjw8 z$T!TPY2qDwM&V}k;Do|0tb*+d?!#>^Fc((BSUUyY{}a{o3uUu|DN6| zd4xKgv#m+eQ(0RZY2_l)#3`=aF9L-)$P96Ol;Zh?b$b)*{taTYFAGPn5byg(DNN0? z%xJ0qH2=y-$+a|fDwd)BTTa|x&SncX-hv>uYF^mFVj1yZ=L==Ub~%jGFEZ8{dMuv- z5oUQl$DLez(8v|y`d(#4A>Q|oRxwW>Em9lq6iOc7>V8y)5P+X%W_?E&r9BCN7M1#`~C+Eqwy~Q literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/avar2_full_instance/RobotoDelta-Roman-VF-subset.default.all.opsz=70,wght=600,wdth=120,slnt=-6,GRAD=-150,XTSP=50.ttf b/test/subset/data/expected/avar2_full_instance/RobotoDelta-Roman-VF-subset.default.all.opsz=70,wght=600,wdth=120,slnt=-6,GRAD=-150,XTSP=50.ttf new file mode 100644 index 0000000000000000000000000000000000000000..4d8cd3fac04745c66b5e723b7626b22055b2aa8e GIT binary patch literal 4436 zcmb_fdu&@*9sbU}*VlI5565nkHno#93DTN|Bu!x|B}v_+84*t7o5U`G)pgP&G;u83 zUE56zDuRZpZ0ZWE(xd?c(GIDIBE~dL;-T@-5D%#m2qB?u66!w)5FmljC<))W_c%=! zyG_xKb#lIQ&hPx*=XY)(094>J&~b7od~^`iFaY7!)9Osus|Fq!~#rCekRwE5tXr-!r>#;dJI|!Bk>#=8sKZ|2W`!11McdFJ*IUgSf{1KDo~h9OLA=LUaLx1>#(SX*2Bs?t@i z^2F_Htu>EU9{ML59Qi-_TXhF_aC_p^i@3PC5L`-86iU zGwQc+S}Gy?dXqBN+fXDjgdZV+q+_@D1@cjz)4$=mNgPz#mY@@dVc0g;Cog0cP(PcQ zIfHuJ{(4fe(IUxToSDg_7;T4>;GUN=VRxyFhbpz(Ck~^F7TagJE}ORQKRI(EtJxlu zIFB?U8F@(|`L+=;kL{){rL&LAt#h+;Il=vN)44f8`s_j~Cv@mTWBp;lD8#JjsBpm* zi;Nx@Cd{}T-EhaOv3}kv&pS7j0Km2j4KPmzU#I5jA zu>(8ea(yRuMy-)yQIC3#5snQ!Hy|3YD;60X7Q3)JF2~(yj9DBTu_rFaJqQl;k3~fg zp^5&F4v7$&CdML`XhL(`vPMKRT4I(pDO#{MZbhPEFEd);*|k;uvi>RTV=i^|9`ySI zp|;l6HodjAxycOFg$}g#c6a#$wSKd?skM!h?zU#r4EX)x`hkHet-MOmLqe}Mzx(rF zJna%6(!F)QQlm`QeZF!-6JwW+-@pBYX{NQ7&W6UFl^u(N;#=qE5}Akm$&Vy2tzMg& zoque8bWy*){PeQC3pc2b%yt)Q5dykH2fOuPd2SRm@$E0rByX`6y>h*ml+~r ze(&|yUiZFop>OKBN86X@m#^Ns`nivNq5Ts#j(zwErsh6YO4cmHOZ=MWrosX(o)v{P zRCu0LSVxcN5rqw6zrrrmyYDD$qSO6L2Q&9~xL;OSpv?V}!Wv54UshNr{-VML@g;>_ zXmOub*hGi>0}8wGkh@G_4?4|1DC|YMnU_^Utn}wS88DU3yeoZXiJ~t@*!44oD-d&~ z6t2WcSB1h==rrC`xEj4iUjG_Q86#@F78Clv6!u|2&+AZ!K0T+_{Rr!w3J1`mDPQq! z^=NOX^_}R|t|(lODXmxG2AmLi8+YNb$op+K4vABWrV)L-Pj(!6-#YORg@b6sZxjw8 z$T!TPY2qDwM&V}k;Do|0tb*+d?!#>^Fc((BSUUyY{}a{o3uUu|DN6| zd4xKgv#m+eQ(0RZY2_l)#3`=aF9L-)$P96Ol;Zh?b$b)*{taTYFAGPn5byg(DNN0? z%xJ0qH2=y-$+a|fDwd)BTTa|x&SncX-hv>uYF^mFVj1yZ=L==Ub~%jGFEZ8{dMuv- z5oUQl$DLez(8v|y`d(#4A>Q|oRxwW>Em9lq6iOc7>V8y)5P+X%W_?E&r9BCN7M1#`~C+Eqwy~Q literal 0 HcmV?d00001 diff --git a/test/subset/data/fonts/RobotoDelta-Roman-VF-subset.ttf b/test/subset/data/fonts/RobotoDelta-Roman-VF-subset.ttf new file mode 100644 index 0000000000000000000000000000000000000000..0819d241273513cd45d8a473e650d1c48cac4821 GIT binary patch literal 23776 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/tests/avar2_full_instance.tests b/test/subset/data/tests/avar2_full_instance.tests new file mode 100644 index 000000000..a9036e0d7 --- /dev/null +++ b/test/subset/data/tests/avar2_full_instance.tests @@ -0,0 +1,20 @@ +FONTS: +RobotoDelta-Roman-VF-subset.ttf + +PROFILES: +default.txt + +SUBSETS: +* + +INSTANCES: +opsz=70,wght=600,wdth=120,slnt=-6,GRAD=-150,XTSP=50,XOPQ=200,YOPQ=50,XTRA=300,BDSZ=-0.5,WDSP=500,XOUC=50,YOUC=100,XTUC=600,XTUD=700,XTUR=500,YOPE=140,YTUC=600,STUI=200,STUO=60,XOLC=80,YOLC=60,XTLC=300,YTAS=700,YTDE=-300,YTLC=500,STLI=200,STLO=400,YOLB=200,XOFI=100,YOFI=200,XTFI=600,YTFI=500,BARS=800,VANG=-2,VROT=4,YTTL=40,XTTW=20,YTOS=15 + +IUP_OPTIONS: +Yes +No + +# ignore diffs in PariPos table: +# fonttools does extension demotion while harfbuzz doesn't +OPTIONS: +no_fonttools diff --git a/test/subset/meson.build b/test/subset/meson.build index 77c03cbd0..818ea59ba 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -84,6 +84,7 @@ tests = [ 'empty_region_vardata', 'colrv1_partial_instance', 'instantiate_gvar_padding', + 'avar2_full_instance', ] if get_option('experimental_api') diff --git a/test/subset/subset_test_suite.py b/test/subset/subset_test_suite.py index f656f793d..92d203e03 100644 --- a/test/subset/subset_test_suite.py +++ b/test/subset/subset_test_suite.py @@ -43,7 +43,9 @@ class Test: if not self.instance: return self.instance else: - s = "." + self.instance.replace(":", "-") + # include the first 6 axes to avoid file name too long error + axes = self.instance.replace(":", "-").split(",") + s = "." + ",".join(axes[:6]) if self.iup_optimize: s += ".iup_optimize" return s