From 96ed20725c99275f286a9a9cf461548731b6828c Mon Sep 17 00:00:00 2001
From: Qunxin Liu <qxliu@google.com>
Date: Tue, 4 Apr 2023 10:33:58 -0700
Subject: [PATCH] [instancer] update bound metrics for CFF2 instancing

---
 src/hb-ot-head-table.hh                       |  20 +++-
 src/hb-ot-var-hvar-table.hh                   |   3 +
 src/hb-subset-plan.cc                         |  88 ++++++++++++++++++
 test/subset/data/Makefile.am                  |   1 +
 test/subset/data/Makefile.sources             |   1 +
 ....retain-all-codepoint.wght=650,CNTR=50.otf | Bin 41760 -> 41760 bytes
 ....default.retain-all-codepoint.wght=800.otf | Bin 0 -> 1508 bytes
 ...ain-gids.retain-all-codepoint.wght=800.otf | Bin 0 -> 1508 bytes
 test/subset/data/fonts/Cantarell-VF-ABC.otf   | Bin 0 -> 2508 bytes
 .../instantiate_cff2_update_metrics.tests     |  15 +++
 test/subset/meson.build                       |   1 +
 11 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 test/subset/data/expected/instantiate_cff2_update_metrics/Cantarell-VF-ABC.default.retain-all-codepoint.wght=800.otf
 create mode 100644 test/subset/data/expected/instantiate_cff2_update_metrics/Cantarell-VF-ABC.retain-gids.retain-all-codepoint.wght=800.otf
 create mode 100644 test/subset/data/fonts/Cantarell-VF-ABC.otf
 create mode 100644 test/subset/data/tests/instantiate_cff2_update_metrics.tests

diff --git a/src/hb-ot-head-table.hh b/src/hb-ot-head-table.hh
index 798e82da6..770cf52d1 100644
--- a/src/hb-ot-head-table.hh
+++ b/src/hb-ot-head-table.hh
@@ -63,7 +63,25 @@ struct head
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    return_trace (serialize (c->serializer));
+    head *out = c->serializer->embed (this);
+    if (unlikely (!out)) return_trace (false);
+
+    if (c->plan->normalized_coords)
+    {
+      if (unlikely (!c->serializer->check_assign (out->xMin, c->plan->head_maxp_info.xMin,
+                                                  HB_SERIALIZE_ERROR_INT_OVERFLOW)))
+        return_trace (false);
+      if (unlikely (!c->serializer->check_assign (out->xMax, c->plan->head_maxp_info.xMax,
+                                                  HB_SERIALIZE_ERROR_INT_OVERFLOW)))
+        return_trace (false);
+      if (unlikely (!c->serializer->check_assign (out->yMin, c->plan->head_maxp_info.yMin,
+                                                  HB_SERIALIZE_ERROR_INT_OVERFLOW)))
+        return_trace (false);
+      if (unlikely (!c->serializer->check_assign (out->yMax, c->plan->head_maxp_info.yMax,
+                                                  HB_SERIALIZE_ERROR_INT_OVERFLOW)))
+        return_trace (false);
+    }
+    return_trace (true);
   }
 
   enum mac_style_flag_t {
diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh
index 53355c507..00a8e1f0b 100644
--- a/src/hb-ot-var-hvar-table.hh
+++ b/src/hb-ot-var-hvar-table.hh
@@ -265,6 +265,9 @@ struct HVARVVAR
 		  rsbMap.sanitize (c, this));
   }
 
+  const VariationStore& get_var_store () const
+  { return this+varStore; }
+
   void listup_index_maps (hb_vector_t<const DeltaSetIndexMap *> &index_maps) const
   {
     index_maps.push (&(this+advMap));
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 76e127bd7..a30fa9d94 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -36,6 +36,7 @@
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-cff1-table.hh"
+#include "hb-ot-cff2-table.hh"
 #include "OT/Color/COLR/COLR.hh"
 #include "OT/Color/COLR/colrv1-closure.hh"
 #include "OT/Color/CPAL/CPAL.hh"
@@ -854,6 +855,89 @@ _normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan)
   }
   plan->all_axes_pinned = !axis_not_pinned;
 }
+
+static void
+_update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan)
+{
+  if (!plan->normalized_coords) return;
+  OT::cff2::accelerator_t cff2 (plan->source);
+  if (!cff2.is_valid ()) return;
+
+  hb_font_t *font = nullptr;
+  if (unlikely (!plan->check_success (font = _get_hb_font_with_variations (plan))))
+  {
+    hb_font_destroy (font);
+    return;
+  }
+
+  hb_glyph_extents_t extents = {0x7FFF, -0x7FFF};
+  OT::hmtx_accelerator_t _hmtx (plan->source);
+  float *hvar_store_cache = nullptr;
+  if (_hmtx.has_data () && _hmtx.var_table.get_length ())
+    hvar_store_cache = _hmtx.var_table->get_var_store ().create_cache ();
+  
+  OT::vmtx_accelerator_t _vmtx (plan->source);
+  float *vvar_store_cache = nullptr;
+  if (_vmtx.has_data () && _vmtx.var_table.get_length ())
+    vvar_store_cache = _vmtx.var_table->get_var_store ().create_cache ();
+
+  for (auto p : *plan->glyph_map)
+  {
+    hb_codepoint_t old_gid = p.first;
+    hb_codepoint_t new_gid = p.second;
+    if (!cff2.get_extents (font, old_gid, &extents)) continue;
+    bool has_bounds_info = true;
+    if (extents.x_bearing == 0 && extents.width == 0 &&
+        extents.height == 0 && extents.y_bearing == 0)
+      has_bounds_info = false;
+
+    if (has_bounds_info)
+    {
+      plan->head_maxp_info.xMin = hb_min (plan->head_maxp_info.xMin, extents.x_bearing);
+      plan->head_maxp_info.xMax = hb_max (plan->head_maxp_info.xMax, extents.x_bearing + extents.width);
+      plan->head_maxp_info.yMax = hb_max (plan->head_maxp_info.yMax, extents.y_bearing);
+      plan->head_maxp_info.yMin = hb_min (plan->head_maxp_info.yMin, extents.y_bearing + extents.height);
+    }
+
+    if (_hmtx.has_data ())
+    {
+      int hori_aw = _hmtx.get_advance_without_var_unscaled (old_gid);
+      if (_hmtx.var_table.get_length ())
+        hori_aw += (int) roundf (_hmtx.var_table->get_advance_delta_unscaled (old_gid, font->coords, font->num_coords,
+                                                                              hvar_store_cache));
+      int lsb = extents.x_bearing;
+      if (!has_bounds_info)
+      {
+        if (!_hmtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb))
+          continue;
+      }
+      plan->hmtx_map.set (new_gid, hb_pair ((unsigned) hori_aw, lsb));
+      plan->bounds_width_map.set (new_gid, extents.width);
+    }
+
+    if (_vmtx.has_data ())
+    {
+      int vert_aw = _vmtx.get_advance_without_var_unscaled (old_gid);
+      if (_vmtx.var_table.get_length ())
+        vert_aw += (int) roundf (_vmtx.var_table->get_advance_delta_unscaled (old_gid, font->coords, font->num_coords,
+                                                                              vvar_store_cache));
+
+      int tsb = extents.y_bearing;
+      if (!has_bounds_info)
+      {
+        if (!_vmtx.get_leading_bearing_without_var_unscaled (old_gid, &tsb))
+          continue;
+      }
+      plan->vmtx_map.set (new_gid, hb_pair ((unsigned) vert_aw, tsb));
+      plan->bounds_height_map.set (new_gid, extents.height);
+    }
+  }
+  hb_font_destroy (font);
+  if (hvar_store_cache)
+    _hmtx.var_table->get_var_store ().destroy_cache (hvar_store_cache);
+  if (vvar_store_cache)
+    _vmtx.var_table->get_var_store ().destroy_cache (vvar_store_cache);
+}
 #endif
 
 hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
@@ -942,6 +1026,10 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
   if (unlikely (in_error ()))
     return;
 
+#ifndef HB_NO_VAR
+  _update_instance_metrics_map_from_cff2 (this);
+#endif
+
   if (attach_accelerator_data)
   {
     hb_multimap_t gid_to_unicodes;
diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am
index fe17d701f..db2bf7f44 100644
--- a/test/subset/data/Makefile.am
+++ b/test/subset/data/Makefile.am
@@ -70,6 +70,7 @@ EXTRA_DIST += \
 	expected/apply_cvar_delta \
 	expected/collect_name_ids \
 	expected/instantiate_colrv1 \
+	expected/instantiate_cff2_update_metrics \
 	fonts \
 	profiles \
 	$(NULL)
diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources
index 607955d67..d0662d928 100644
--- a/test/subset/data/Makefile.sources
+++ b/test/subset/data/Makefile.sources
@@ -61,6 +61,7 @@ TESTS = \
 	tests/apply_cvar_delta.tests \
 	tests/collect_name_ids.tests \
 	tests/instantiate_colrv1.tests \
+	tests/instantiate_cff2_update_metrics.tests \
 	$(NULL)
 
 # TODO: re-enable once colrv1 subsetting is stabilized.
diff --git a/test/subset/data/expected/instantiate_cff2/AdobeVFPrototype.default.retain-all-codepoint.wght=650,CNTR=50.otf b/test/subset/data/expected/instantiate_cff2/AdobeVFPrototype.default.retain-all-codepoint.wght=650,CNTR=50.otf
index c76dabb5924f2c1047ce61b911eee1809da1f764..a870015b323c9dad8eea2d3475bf5fd0741d9459 100644
GIT binary patch
delta 1156
zcmZvcOGs2<6vzMH`3B1=AL!`J_)49z867Fh3NbB($p=Oam<vS{BWdV?6$1(_E>=cF
z;e>5$CG>z?NkOy;v%qB(EeeG;Zi2QIsnzZOT^|h5z>hQc+;hG;_y0e4rsid8UXqsr
zkrTs!@&Pyyj}H!P8PPBK{Tm6!FC<2?i%SmQy?3_7HEYN0m}?x0cTzvUoQzUwKi=FN
z?aylX4z0hKf=~C4&#lE*N7$R@8rNgbqUwpuTI3HNMNB<LSgPTXT-53_sF(Nf;WNT&
z2pyzUJ>|V(l&ETCvp&q&tP<G9`U=ucc9RJ4lQ7vq_7jsUa_ZU3Ga}|3vQNE0yQR-#
zr%b^uV+hJc9`>5Ci$uvIRA`N$vd9hlxy&%vhM*pWR~Aqtv#jrD&cp|dc?ij64!VF+
znS@)v<GFW`!JJ!a;89&TZH8vd<p8bXffZIs^hgE*(v5tz!p07iNgB#joKNCIo(wWy
zM<Vuwv@<p$U*F;YgJchDdr=@wte=Nh&2i9^RHd7J>GrD5vR9=HTP54J)m!ALPAca{
zAEQyA3X9g7{FEr@NR`LKa_wbPB<YB7xb5<lvY&!ayeMQ-p(FnX=8~vUZ5+VZl3;BD
zA?Ajp6-|6%uOoR9z04m{SCG&C5Up(>HKd*LH;QGX{}1{ar#5yND^hT*Fm_m!(}HsB
z+OWddkV-N4z+4+UQZaU%<GEK+U^&to`Ts%ZBH-9TD~uf*&<gK5O4Zp*66U=PD~uhf
zm_;+!#*S2Iha5vDZLw@~7?&zQUp@LE7p{*DTqNV==Hk#h+VYd~8i}hN>655r93h?S
z7)x4Y09jnDux>&aA5lbd3~HKh!L$=|B$H<o6}1r1*U{{nMZIdKx6KIQwjJXxxT#33
z{N^xADA%RfB~?^unAa=h;M(hGYK_lQ&$q(Ehe+5nX0gmpY|?{DK8T;aep>B!{v+H7
RVlN~*v8?>h{-l>r{sjQf!*>7x

delta 1156
zcmZvcK}b|l6o&tM@1$swIZ4b|4d&Q5qcbvDNmN)kI!1_&;DCr_TE-xRBnG<iL6{V{
zm?#KcgixDmQDKYPC4oVUY7yloT0|v63qhg8eEsK*#w;B8IPaZ%&b{ZJ|Gb%=)6;W0
zeZ`;GJ_;xgfZ9~5uO~OTzQ*TeQl7dzG;9+7FSqXW#{s*=ZgCAjaV7h==6ICK+4+6^
zWq09;6&SN10rOL>vl;uUk-0gp0W&evpdPxcMIPuwLY+fU7r?8QaL9Bau0LQ8o+GH*
zxYkDh3lwWN_Ng$osapEO^fy5>K19xt@CF{*011+s4WHyCB$s;}lYPXhd#Ja}DfsnW
zE({@}hY{6tv|S`d9wBOWBccY$ReN4f(w9WUjI-FU<Tc})=@WaCG3)eove3`8_fcqO
zQK)YqUyslRP^{{3(J8tPJ{Hi)cq^#VNUAkd>yy0Y4^-(Rs8)YTFAH<wfbO6_#GCK3
zpXgFP2jMl>xptP6Gp~`hit!KNSI-btG34nu<9-8rl@uUf+3fNg_*4giSVa%56i|aj
zYoq;{_LZq+9<*eyI6(`%Q5pfg%*1Z&Ro|Q>kJJ9Q^rg|HPP0IfWe^8RHGO0HC=$Az
z1xU-&=%>G4jX3#UN*g1`Nh{kQ)0VV;3(OS#B8Nzk1vkscF^CF27ddimN+B|2<7PMI
zUF66{<mlzT&G1^%`mHcK=%*Zx6e7naA(T)KA2BLq|I+&@!KM@<M>aBO@=iIj5jk`P
z2ib-N*-VDY(NzYnkB4!PM9cq!Bib$5KiSU1q>eO^8Zu7KlM6&<sZl35Xv{a2)cPX=
z#4WJh0V3Az>@R0TEmWE@BwUXXS0y~81YS(oE&Ob@t9LByJ*W2*0;ZI=*vU4I!eer2
zqnXdqiKWgug0Ly#hL`N8nuA5;6U)$mq)u^2WuULY@BByPqnzWX8*cwm-kJ5hvdMq3
CVc%K+

diff --git a/test/subset/data/expected/instantiate_cff2_update_metrics/Cantarell-VF-ABC.default.retain-all-codepoint.wght=800.otf b/test/subset/data/expected/instantiate_cff2_update_metrics/Cantarell-VF-ABC.default.retain-all-codepoint.wght=800.otf
new file mode 100644
index 0000000000000000000000000000000000000000..def60cff6c7b881a754d7cb783a64a8a7d5dc16f
GIT binary patch
literal 1508
zcmZuxZA=?w9RJ;2?*>@h)&g0e(o?Z+I!5gl!(dTqJ4y%)T+2jV+&ZYOgF<b~#&j+t
z^2xamM$xz!S$s=B__i3A37Vj8A6!gKNZ3o_k{OLL`{W1QQ*xO4yK9YeaF^$Ke*c%>
z|LvY!PbAWVN*srR-avc1FZbc>Gl2X7Ahm>oJKK>!8S%#eHivq9!oh6U81W)keJI@L
zKev4D2JQWnH}-^^eEqS^De{Aq_lF~Gkt1&meM0+j$`1@Aqbb<&Cgm%Xw<TiHLG`1P
zuhZX7`QZc=+DX$UZKK?fNM^^&zr$O^zj3WgM#odI^%CM|E^Q>5jBVQ6IS44%8ADEu
zX0nB8_{guKT?goEqqGR0{6%3&eitG6DDHzqYXw|<rC@tkgdNfgC=|?{k5W7e@0hVx
zdB|5T7w%_HMrGU?E8?w=wo(ocJRF9Z!!aDqj^Iwq>DFu#J<BZbDr<K^J{(VE%@QG7
z8c3?5TRe%Hdn^P-lB_z{Q7$f%Vlqs95f?kDD#=ysQm2oNuW1ih{k9bfg*i*+pr}Rn
zYrAreL;Ke5_zQ~ihpD-6eX`L!uPu-7V81uz8F`MP#%#sMCO5M}mFd5hU!m%1@s!f=
zNglH(wKP%MtQ;jC+Wc)1Jcc#|<X<_@MddQC>X4>QyL3Z7%R`4kJ}U1buCX_mhi5%E
z^N}Q}!i75OB)5aIjf(B>|9Se5xL0`d?!(gLQlBzeBf2%wwFLEPP4xW@RfIKTVyRO#
zp4a-8XRF1$78hRCIH8>oF5wj$vhRsn;d0E2M|PhV&BAX~iVo*j^ED!;iGV2konC8w
z3&w+P=a<Go&ADJ~5WzJ+d^YstQ_1w>Zs&|qop1R`yKrVS8XF!8zu*?NDfP<qHy0Ob
zZ~DGB9<4WC)h5K|e4}WTJ{KKIzJ8+m(l67wId@E~S6>?Fe|dkM;cmSq>V$LtN8$MP
z;>3$*+_S=^<~lmxZm%;khSz8?MvS=d7<Y@fdtxeoY)b5z`gBS&j-FamfBL{ad%4gn
zg#Qj}O65qKH^5d-X$F@{Sb_uROIYS@I$OdDnsKazZM<!JOISrM{3WbW&+lT!<ma@*
zx?#jB5wH{E$TDY?K7Nd17=w5MF+7Jj|0Y=kXc^%drB963VKiblQ5<8$rgjgdG%{q2
z(o=^QTd<Y;)>XLrZQTESTY0biToJUc!n-}^|0`HoV}P}!aD;XJ+lS7-gBK5BJ1dN^
zvl!2nJe@zGG`R<9A7IxyD;ndOpw8@3$3|-^Sw_#G1x<Y8%#pQbae$r2IfGFo$=_me
b;`9h%7kbdmSvN82%6UFZPjki@Yy$oPlIKLr

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/instantiate_cff2_update_metrics/Cantarell-VF-ABC.retain-gids.retain-all-codepoint.wght=800.otf b/test/subset/data/expected/instantiate_cff2_update_metrics/Cantarell-VF-ABC.retain-gids.retain-all-codepoint.wght=800.otf
new file mode 100644
index 0000000000000000000000000000000000000000..def60cff6c7b881a754d7cb783a64a8a7d5dc16f
GIT binary patch
literal 1508
zcmZuxZA=?w9RJ;2?*>@h)&g0e(o?Z+I!5gl!(dTqJ4y%)T+2jV+&ZYOgF<b~#&j+t
z^2xamM$xz!S$s=B__i3A37Vj8A6!gKNZ3o_k{OLL`{W1QQ*xO4yK9YeaF^$Ke*c%>
z|LvY!PbAWVN*srR-avc1FZbc>Gl2X7Ahm>oJKK>!8S%#eHivq9!oh6U81W)keJI@L
zKev4D2JQWnH}-^^eEqS^De{Aq_lF~Gkt1&meM0+j$`1@Aqbb<&Cgm%Xw<TiHLG`1P
zuhZX7`QZc=+DX$UZKK?fNM^^&zr$O^zj3WgM#odI^%CM|E^Q>5jBVQ6IS44%8ADEu
zX0nB8_{guKT?goEqqGR0{6%3&eitG6DDHzqYXw|<rC@tkgdNfgC=|?{k5W7e@0hVx
zdB|5T7w%_HMrGU?E8?w=wo(ocJRF9Z!!aDqj^Iwq>DFu#J<BZbDr<K^J{(VE%@QG7
z8c3?5TRe%Hdn^P-lB_z{Q7$f%Vlqs95f?kDD#=ysQm2oNuW1ih{k9bfg*i*+pr}Rn
zYrAreL;Ke5_zQ~ihpD-6eX`L!uPu-7V81uz8F`MP#%#sMCO5M}mFd5hU!m%1@s!f=
zNglH(wKP%MtQ;jC+Wc)1Jcc#|<X<_@MddQC>X4>QyL3Z7%R`4kJ}U1buCX_mhi5%E
z^N}Q}!i75OB)5aIjf(B>|9Se5xL0`d?!(gLQlBzeBf2%wwFLEPP4xW@RfIKTVyRO#
zp4a-8XRF1$78hRCIH8>oF5wj$vhRsn;d0E2M|PhV&BAX~iVo*j^ED!;iGV2konC8w
z3&w+P=a<Go&ADJ~5WzJ+d^YstQ_1w>Zs&|qop1R`yKrVS8XF!8zu*?NDfP<qHy0Ob
zZ~DGB9<4WC)h5K|e4}WTJ{KKIzJ8+m(l67wId@E~S6>?Fe|dkM;cmSq>V$LtN8$MP
z;>3$*+_S=^<~lmxZm%;khSz8?MvS=d7<Y@fdtxeoY)b5z`gBS&j-FamfBL{ad%4gn
zg#Qj}O65qKH^5d-X$F@{Sb_uROIYS@I$OdDnsKazZM<!JOISrM{3WbW&+lT!<ma@*
zx?#jB5wH{E$TDY?K7Nd17=w5MF+7Jj|0Y=kXc^%drB963VKiblQ5<8$rgjgdG%{q2
z(o=^QTd<Y;)>XLrZQTESTY0biToJUc!n-}^|0`HoV}P}!aD;XJ+lS7-gBK5BJ1dN^
zvl!2nJe@zGG`R<9A7IxyD;ndOpw8@3$3|-^Sw_#G1x<Y8%#pQbae$r2IfGFo$=_me
b;`9h%7kbdmSvN82%6UFZPjki@Yy$oPlIKLr

literal 0
HcmV?d00001

diff --git a/test/subset/data/fonts/Cantarell-VF-ABC.otf b/test/subset/data/fonts/Cantarell-VF-ABC.otf
new file mode 100644
index 0000000000000000000000000000000000000000..e9991ef3e4655412a2dc624c11718ede5a371496
GIT binary patch
literal 2508
zcmZ`(3s6*L6h8OvF6fQ&3i!wr)<;MssDM_YjtD}di<qpKY1;B|7n6suEUSsO3dpj%
zyw_AD6-Fw0SUE9fHd5APYL0JvOv#utnKO+}Nf+mm+xOqSriuM`?tjjAUjI4gKli2?
zjcGKPBhr$Xn4BCFwZYy)6tIm*6O)oOCz%Rq01?+sM3Yh$q@^cW4JE*Fz+oxri)J6_
zJ8%v70C41U83_yLEg$58?>OL>Qi0E&I5wV$KMMR}TKdG8j8nx8(3b<hoNi1oZV;?q
z;48o@O*T`}Um+vjMLZ*LSXQ2?kb-C{{6*lnmC#qW<iej{4{WgHn6d*pYa)S@fTvm@
z2yEf<;ok&2&XQ-f4>ZwnV3v=VXR;TPb^%y!B({KjQ(jK&%w=IH-hdc}!h&L}Zx_Wt
zZ-rh@1Y0f8O^V@*D3G_&GQNVQ652%qjl{zxB^!+B5UhxNKDJ{qJ==9%)J50cIlqX(
zNu=+bMY9;IVH@msva=qr;IFypL*H~+x7+(J=|-s$@0x1W93m(J#j_lOSDUQ)^oU||
zZ#Eq9u<@^8g>cIGtfT&yWy>QTllysphM_7BMRj`EXz?(8qEcsq&*$q>uv%|weYGd$
z$cjPJdq|_X3Oo9$yF7}~pZe_6Z@2qMH%dDXFaW3d7mFq;XNQuG29%mDR?0@WIwYWH
zCP<3eFd2Nf33$;vrsq&2e+X2k+A=#*Zel`l=Gp@An&Lu*a>dpnhIzZi%<dIVc!QK3
zH%L6YCAMbaL5-{%u(>_J$N6*|yHkH`HZ!4k?<}pBcz?$xD;>og(g?hvsy&OMMAAeG
zk|IMn3H=U)m6m@7HK7vz5MK@agP(G1D25x&g6PzVfzF=`7`75-Cm4}*0wwalU|w!&
zF4FgU;&w3|cbV@5(JQyep)<^r^_eiYJnOX*N}!=M26H&m9~u2dw^g2J9an1OISuPN
z>$s}Z-oxuOddS&&m|EF++JWE?(hZg8D42d$c^)%*O64{53~f_+EwZqwybgU_rt$%h
zPxJH0H;AHDo>df~^1SjjD(7N8{*8|r8GwrYa-DK_bI49sDk2m5GMfr$HLATs4U|h}
zvOsUdo=f?(m~#G=CBi2kIupEe;J2EhXdyT=m4Ii`44@(^hDQM`_4weUDHeMy_4n1^
z=X=*S9=ACguaV*(;CKI-|IMKPIf=-nkk%rvJGJR?*OO>6J&O!kojIWW{q*?t6~T8E
z^jWA{kBmw{Es(Jq^%SXe%8Ka4xSxr5%s9iU^db|Lo6&;;%7cHj;$wzI3eBf9N~JmA
zvmVgTm9S(zE~Y0i^As`)Q<M}mjuGQvwvQZ+jd1TA_W%2WnT7J*fpQ!tjHDUNH=F(a
zv=C@?fsw)_Axdy~du?86x%Yjq3(MK)a(Om0&gE(x79f{;U6rmn&#=I--I*(b2L71#
zwR@OwddZ*eVGki<2!ah~e@z`tKsB={8Fi&&VpgCA8&yy}y-oY+GwvhqQ$C!J<m35N
z{&{|>Tf8+_u5wHe<RN|QEf+cs9&w0ty*%G72Dr{vm@_VUM4f!S<vQ^0r-X)%GPgMN
z^4#B_6!twKbW9X}?XW@M5jA6l(E``d+uKpr439BFgphjmapC3tuL5nV%Z9tO>Ti*e
z(p#cU$~@Z}*J;SO<h9j^r44#PCsVhqgW7Sf_xQO*Kl~-fEc&rV<Ua3iS!cNBnJn0k
zZnrN#j$oy>tntFt<lkZIIwLimvh9{i&t#nVY5d}2JDux17o#&yG>E~!{+#=s^j7z(
z?hc#b@|)Iz*6(Gl;mS9$hHH&t$S30jsdCkOESb39E=VELz}WBPM=N$X_LMg}nw<6Z
z)my5zu5A><Lq3*mRj<P?<b1M}ci7;`^oW7Ke3?Eaerc|(=~&Zj+t_B?x2D6|Vr{Z^
zF^7ZljNU_%uzG)wJoLjQHDW-|;q2-2b1f5d_bhEGTfepBgSD-jYV0+Q`*!SX62qk+
zSJd_`g(&NbwtYuWzOl!#W!v^z&(4NAaYWD5qjIF%UBAUy*<h^|!({XOE0Kz*i4|gm
zDMEO(uq1V3MrFOj>)2XVTkfqBACsrayd+3-q!~B<km8T5YcG4d#k|+_j%jaRM^0;I
zt+Poywz0IU+EZCux4veo@Iqp9ipx{}YEwg%v$mQActsv7M|d~aZ*X~PL^;1#?{>OH
zN1QO^<mnx6eOujF+w87$x+*u+iQ#gNG)mS>CYQ6K$zA<geXS^lKP|L<v#xFVc@)%6
F^be8YIwSx9

literal 0
HcmV?d00001

diff --git a/test/subset/data/tests/instantiate_cff2_update_metrics.tests b/test/subset/data/tests/instantiate_cff2_update_metrics.tests
new file mode 100644
index 000000000..459168e27
--- /dev/null
+++ b/test/subset/data/tests/instantiate_cff2_update_metrics.tests
@@ -0,0 +1,15 @@
+FONTS:
+Cantarell-VF-ABC.otf
+
+PROFILES:
+default.txt
+retain-gids.txt
+
+SUBSETS:
+*
+
+INSTANCES:
+wght=800
+
+OPTIONS:
+no_fonttools
diff --git a/test/subset/meson.build b/test/subset/meson.build
index 072898e1b..5c96982f9 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -63,6 +63,7 @@ tests = [
   'apply_cvar_delta',
   'collect_name_ids',
   'instantiate_colrv1',
+  'instantiate_cff2_update_metrics',
 ]
 
 repack_tests = [