From f1ac36ba7f0950c67c3f362a8fca75013bce541a Mon Sep 17 00:00:00 2001
From: Qunxin Liu <qxliu@google.com>
Date: Wed, 15 Nov 2023 11:38:41 -0800
Subject: [PATCH] [instancer] update hhea vertical metrics with OS/2 ones

---
 src/hb-ot-hmtx-table.hh                       |  23 ++++++++++++++++++
 ....SPED=25,YEXT=520,wght=100-400,slnt=18.ttf | Bin 0 -> 2184 bytes
 .../subset/data/fonts/playwrite_mm.subset.ttf | Bin 0 -> 6260 bytes
 test/subset/data/tests/sync_vmetrics.tests    |  11 +++++++++
 test/subset/meson.build                       |   3 ++-
 5 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 test/subset/data/expected/sync_vmetrics/playwrite_mm.subset.default.retain-all-codepoint.SPED=25,YEXT=520,wght=100-400,slnt=18.ttf
 create mode 100644 test/subset/data/fonts/playwrite_mm.subset.ttf
 create mode 100644 test/subset/data/tests/sync_vmetrics.tests

diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh
index 89640b43f..f225d6b6f 100644
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
@@ -145,6 +145,29 @@ struct hmtxvmtx
         table->minTrailingBearing = min_rsb;
         table->maxExtent = max_extent;
       }
+
+      if (T::is_horizontal)
+      {
+        const auto &OS2 = *c->plan->source->table.OS2;
+        if (OS2.has_data () &&
+            table->ascender == OS2.sTypoAscender &&
+            table->descender == OS2.sTypoDescender &&
+            table->lineGap == OS2.sTypoLineGap)
+        {
+          table->ascender = static_cast<int> (roundf (OS2.sTypoAscender +
+                                                      MVAR.get_var (HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER,
+                                                                    c->plan->normalized_coords.arrayZ,
+                                                                    c->plan->normalized_coords.length)));
+          table->descender = static_cast<int> (roundf (OS2.sTypoDescender +
+                                                       MVAR.get_var (HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER,
+                                                                     c->plan->normalized_coords.arrayZ,
+                                                                     c->plan->normalized_coords.length)));
+          table->lineGap = static_cast<int> (roundf (OS2.sTypoLineGap +
+                                                     MVAR.get_var (HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP,
+                                                                   c->plan->normalized_coords.arrayZ,
+                                                                   c->plan->normalized_coords.length)));
+        }
+      }
     }
 #endif
 
diff --git a/test/subset/data/expected/sync_vmetrics/playwrite_mm.subset.default.retain-all-codepoint.SPED=25,YEXT=520,wght=100-400,slnt=18.ttf b/test/subset/data/expected/sync_vmetrics/playwrite_mm.subset.default.retain-all-codepoint.SPED=25,YEXT=520,wght=100-400,slnt=18.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5311eb0eba0f0de1da6283d5ddb84cb4435ab3b7
GIT binary patch
literal 2184
zcmb7FTTB#J82)EwcXoDmxi5<dEDI|OD6q?Ip{RwGiw00By8>RK-2yHUZo*QbwrPbn
zX-#8%=_S<{8z0)lCibDJN&8^ahc-U6TGYmBE2Lm3-l%}w*?wns8!`2z=VZ?LzyJRK
zbLI?jL==HVMd91a$}1=W6mf;%8n@T%c9r?6`+#eJP1{|2wq0DlI0-xtoVKIRSzBy!
zmJ;!ofVb>+*>Vi)n__^MfnRpHo$k|Td}o2pz<G@wo^I09hrn)z55MZ^8MxYd8vZT-
zZ}7Gc9DZ$zUPm(L!8_@NJh8IoO(Nj{@UE6-Pg6?8wl>(m3w=im81iSTUm&~2>{~i~
z{UHV1LEtpt@b<1o56#gr;CNuU!_(hQ5;=gofz6$sj^>=t>kEj)E$~^{-PP;!e@Quz
zpJH-6M0VK!fDCrhDPfm?SjeV*LK~eW);GPP0aGB31ck@=GR0$ZWfj$K#6v%c{QjUW
zldC8n+H5fN>|p#z=$~PEJZCVAa3!JvlyubF;-e-|c$BP((=xB>^DEQHy3IfAe@_?{
zCb;rve5sVkGFdTsCC|uqkFS$L6|J=yv&sTBuy}0nEGD8*Z+oYYlZo3~-r(kR#Jg(B
z%Q(GK84o>Hi6Ph(18Oz{t1wvwrAj}Xe!u^cf&-m^<ZVZN;i0fCvm^);(4$e?UgnEN
ztInN7E%${{l@3ru2Lgk6BXpa^dO8q=W0~U=E30172lg{A_7Y4|;jK228YP|J8~hVg
z#dhk!3CiIzo;p*gK%5}c?FMm)oKza<vwB=P;ffA7BP>H|Mnr}KS(s2a8|L7;pFS#K
zGKmVoiqkF6uH5-+HN===jW%lL?v0P#i_A?;$eElW?)Y&bDq(DPP?)*BK4MU-jT#@1
z)lg*Q`60!=6ZUWA-@P|B!7WbD^E|&aJH4>D=vT|K92ylJrb#o3k4A3Zym@P6>~2J|
z|M4GJFJHcVV{AgtTyr5aLlNA<gQ=OhCI9Nm+}{r$P0h@&9AB52nQ79_-2ZcAY;tlk
zCMG6~e=z#{ufxN`fvDYx>PU&#)8gXd-1OAclV#Bmmyj60E=ty@g{7&b(72Qgo6VMy
zz9~C1Aw*DXqhm}-rZ71cQDu%3!%ZnM;_CA1pmlX|es1RB#GR4fu3fou<@(5!Xvwo@
z+3a?^Epub)rlbUePFh^xh6t|-C*U!E9Vfs@u|%3=YXRqQ<mMQoql}^@*_tXO38EO4
zB*f~p8vX;dq?M(uoFvN<7rC1Kv#5K*eQgQV>xEfS)JV%(og~Rz(dze-hU?;wuoJrv
z%b>78ag;`RM7hZbkc$AuXhSHk(U=76f+aOK=S4n0FN?QW3Ie3nYO!=gsksuh;fAX{
z-?rz7li#=_-;`b7J5>JNR}CNcmYBEh$sd-#DIfA~wI3?~F-*7>mR{{BZrg2_RJ?Ih
zNyd)eh9Z+C!`;6#eQRozC9SH>X)8`-r{rw#+#@4(auy=LsA4(A7)6a}O+^~Xp{i(u
ziD$VKI2?>0%5&d3TPssHR2&{Wy)W-TWvnR5l1`2-uF9xA)ql{LoLsWMFtgrOvq93K
zeks524MSGlvFf@nK7GGsb6l=f8!D<ay2Opqg^llga_*(F_MK_#GKy0rUJ~`%7it6F
zhmKCLFI<J&fG%+1L7GGFZU<=|cgjyeTEItlGDxe|=%{Hu`GS0rvZx|J<Bri&QIM8#
ztJ;IK4!4#Zr1hYPT+~g?m`zlNwFll>sgXR?jxVm9`hlCNlX}7JQg#<49#B52hoqIf
z)B?Ij;SSJIcxY8@GRX~z9n*!qOYzKXyPy+@^si4dWg~N@X<tKahP|6M|4+}g$jM86
zN;W;uu{A4MnUz@PHJLFwkXtD-?4|*wjzDc@{7>w7a?uf1Q#1De*2{Q3ux*395gjn&
zj_bo7sJ$0B4YUul8{I4-8>Uz3RSWc9K?fRP-2tu}(b+q31ADPEAMDN8o)a~l=pVKe
Buyp_c

literal 0
HcmV?d00001

diff --git a/test/subset/data/fonts/playwrite_mm.subset.ttf b/test/subset/data/fonts/playwrite_mm.subset.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e939c859425e482a22e601d4ba1a7cf9fc85dc63
GIT binary patch
literal 6260
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

literal 0
HcmV?d00001

diff --git a/test/subset/data/tests/sync_vmetrics.tests b/test/subset/data/tests/sync_vmetrics.tests
new file mode 100644
index 000000000..8ad194306
--- /dev/null
+++ b/test/subset/data/tests/sync_vmetrics.tests
@@ -0,0 +1,11 @@
+FONTS:
+playwrite_mm.subset.ttf
+
+PROFILES:
+default.txt
+
+SUBSETS:
+*
+
+INSTANCES:
+SPED=25,YEXT=520,wght=100:400,slnt=18
diff --git a/test/subset/meson.build b/test/subset/meson.build
index 38a137360..4a850ba41 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -79,7 +79,8 @@ if get_option('experimental_api')
     'gdef_partial_instance',
     'value_format_partial_instance',
     'feature_variation_instance_collect_lookups',
-    'iftb_requirements'
+    'iftb_requirements',
+    'sync_vmetrics',
     ]
 endif