Merge pull request #3235 from fonttools/varlib-sparse-vhmtx

varLib: use sentinel to mark glyph metrics as sparse

Lib/fontTools/varLib/__init__.py

@@ -563,9 +563,17 @@ def _get_advance_metrics(
 ):
     vhAdvanceDeltasAndSupports = {}
     vOrigDeltasAndSupports = {}
+    # HACK: we treat width 65535 as a sentinel value to signal that a glyph
+    # from a non-default master should not participate in computing {H,V}VAR,
+    # as if it were missing. Allows to variate other glyph-related data independently
+    # from glyph metrics
+    sparse_advance = 0xFFFF
     for glyph in glyphOrder:
         vhAdvances = [
-            metrics[glyph][0] if glyph in metrics else None for metrics in advMetricses
+            metrics[glyph][0]
+            if glyph in metrics and metrics[glyph][0] != sparse_advance
+            else None
+            for metrics in advMetricses
         ]
         vhAdvanceDeltasAndSupports[glyph] = masterModel.getDeltasAndSupports(
             vhAdvances, round=round

Tests/varLib/data/master_sparse_cff2_empty/SparseCFF-Bold.ttx

@@ -294,7 +294,7 @@
   </GSUB>
 
   <hmtx>
-    <mtx name=".notdef" width="500" lsb="50"/>
+    <mtx name=".notdef" width="800" lsb="200"/>
     <mtx name="a" width="600" lsb="9"/>
     <mtx name="e" width="600" lsb="9"/>
   </hmtx>

Tests/varLib/data/master_sparse_cff2_empty/SparseCFF-Medium.ttx

@@ -93,7 +93,7 @@
   </CFF>
 
   <hmtx>
-    <mtx name=".notdef" width="500" lsb="0"/>
+    <mtx name=".notdef" width="65535" lsb="0"/>
     <mtx name="e" width="600" lsb="40"/>
   </hmtx>
 

Tests/varLib/data/test_results/SparseCFF2-VF.ttx

@@ -116,4 +116,56 @@
     </Axis>
   </fvar>
 
+  <hmtx>
+    <mtx name=".notdef" width="500" lsb="50"/>
+    <mtx name="a" width="600" lsb="9"/>
+    <mtx name="e" width="600" lsb="40"/>
+  </hmtx>
+
+  <HVAR>
+    <Version value="0x00010000"/>
+    <VarStore Format="1">
+      <Format value="1"/>
+      <VarRegionList>
+        <!-- RegionAxisCount=1 -->
+        <!-- RegionCount=3 -->
+        <Region index="0">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
+        <Region index="1">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="0.36365"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
+        <Region index="2">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.36365"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
+      </VarRegionList>
+      <!-- VarDataCount=1 -->
+      <VarData index="0">
+        <!-- ItemCount=2 -->
+        <NumShorts value="1"/>
+        <!-- VarRegionCount=1 -->
+        <VarRegionIndex index="0" value="0"/>
+        <Item index="0" value="[0]"/>
+        <Item index="1" value="[300]"/>
+      </VarData>
+    </VarStore>
+    <AdvWidthMap>
+      <Map glyph=".notdef" outer="0" inner="1"/>
+      <Map glyph="a" outer="0" inner="0"/>
+      <Map glyph="e" outer="0" inner="0"/>
+    </AdvWidthMap>
+  </HVAR>
+
 </ttFont>

Tests/varLib/varLib_test.py

@@ -1004,7 +1004,7 @@ Expected to see .ScriptCount==1, instead saw 0""",
         self._run_varlib_build_test(
             designspace_name="SparseCFF2",
             font_name="SparseCFF2",
-            tables=["GlyphOrder", "CFF2", "fvar"],
+            tables=["GlyphOrder", "CFF2", "fvar", "hmtx", "HVAR"],
             expected_ttx_name="SparseCFF2-VF",
             save_before_dump=True,
         )