Assign maxp data when interjecting TTF with skrifa

Author: laurmaedje

src/cff2.rs

@@ -7,7 +7,7 @@ use std::borrow::Cow;
 pub fn subset(ctx: &mut Context) -> crate::Result<()> {
     let mut maxp_data = MaxpData::default();
 
-    let result = glyf::subset_with(ctx, |old_gid, ctx| {
+    glyf::subset_with(ctx, |old_gid, ctx| {
         let data = match &ctx.interjector {
             // We reject CFF2 fonts earlier if `variable-fonts` feature is not enabled.
             Interjector::Dummy(_) => unreachable!(),
@@ -18,8 +18,8 @@ pub fn subset(ctx: &mut Context) -> crate::Result<()> {
         };
 
         Ok(data)
-    });
+    })?;
 
     ctx.custom_maxp_data = Some(maxp_data);
-    result
+    Ok(())
 }

src/glyf.rs

@@ -47,7 +47,9 @@ pub fn closure(face: &Face, glyph_remapper: &mut GlyphRemapper) -> Result<()> {
 
 pub fn subset(ctx: &mut Context) -> Result<()> {
     let table = Table::new(&ctx.face).ok_or(MalformedFont)?;
-    let mut _maxp = MaxpData::default();
+
+    #[allow(unused_mut)]
+    let mut maxp_data = MaxpData::default();
 
     subset_with(ctx, |old_gid, ctx| {
         let data = match &ctx.interjector {
@@ -56,12 +58,18 @@ pub fn subset(ctx: &mut Context) -> Result<()> {
             }
             #[cfg(feature = "variable-fonts")]
             Interjector::Skrifa(s) => {
-                Cow::Owned(s.glyph_data(&mut _maxp, old_gid).ok_or(MalformedFont)?)
+                Cow::Owned(s.glyph_data(&mut maxp_data, old_gid).ok_or(MalformedFont)?)
             }
         };
 
         Ok(data)
-    })
+    })?;
+
+    if ctx.interjector.is_skrifa() {
+        ctx.custom_maxp_data = Some(maxp_data);
+    }
+
+    Ok(())
 }
 
 pub(crate) fn subset_with<'a>(

tests/ttx/NotoSans-Regular_var_1.ttx

@@ -23,7 +23,7 @@
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="1.0"/>
     <fontRevision value="2.013"/>
-    <checkSumAdjustment value="0xf8bea5c9"/>
+    <checkSumAdjustment value="0xf902a8a3"/>
     <magicNumber value="0x5f0f3cf5"/>
     <flags value="00000000 00000011"/>
     <unitsPerEm value="1000"/>
@@ -64,18 +64,18 @@
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="0x10000"/>
     <numGlyphs value="14"/>
-    <maxPoints value="273"/>
-    <maxContours value="24"/>
-    <maxCompositePoints value="143"/>
-    <maxCompositeContours value="8"/>
+    <maxPoints value="51"/>
+    <maxContours value="2"/>
+    <maxCompositePoints value="0"/>
+    <maxCompositeContours value="0"/>
     <maxZones value="1"/>
     <maxTwilightPoints value="0"/>
     <maxStorage value="0"/>
     <maxFunctionDefs value="0"/>
     <maxInstructionDefs value="0"/>
     <maxStackElements value="0"/>
     <maxSizeOfInstructions value="0"/>
-    <maxComponentElements value="4"/>
+    <maxComponentElements value="0"/>
     <maxComponentDepth value="1"/>
   </maxp>
 

tests/ttx/NotoSans-Regular_var_2.ttx

@@ -23,7 +23,7 @@
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="1.0"/>
     <fontRevision value="2.013"/>
-    <checkSumAdjustment value="0xe1c0756b"/>
+    <checkSumAdjustment value="0xe2047845"/>
     <magicNumber value="0x5f0f3cf5"/>
     <flags value="00000000 00000011"/>
     <unitsPerEm value="1000"/>
@@ -64,18 +64,18 @@
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="0x10000"/>
     <numGlyphs value="14"/>
-    <maxPoints value="273"/>
-    <maxContours value="24"/>
-    <maxCompositePoints value="143"/>
-    <maxCompositeContours value="8"/>
+    <maxPoints value="51"/>
+    <maxContours value="2"/>
+    <maxCompositePoints value="0"/>
+    <maxCompositeContours value="0"/>
     <maxZones value="1"/>
     <maxTwilightPoints value="0"/>
     <maxStorage value="0"/>
     <maxFunctionDefs value="0"/>
     <maxInstructionDefs value="0"/>
     <maxStackElements value="0"/>
     <maxSizeOfInstructions value="0"/>
-    <maxComponentElements value="4"/>
+    <maxComponentElements value="0"/>
     <maxComponentDepth value="1"/>
   </maxp>
 

tests/ttx/NotoSans-Regular_var_3.ttx

@@ -23,7 +23,7 @@
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="1.0"/>
     <fontRevision value="2.013"/>
-    <checkSumAdjustment value="0xec15e09b"/>
+    <checkSumAdjustment value="0xec59e375"/>
     <magicNumber value="0x5f0f3cf5"/>
     <flags value="00000000 00000011"/>
     <unitsPerEm value="1000"/>
@@ -64,18 +64,18 @@
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="0x10000"/>
     <numGlyphs value="14"/>
-    <maxPoints value="273"/>
-    <maxContours value="24"/>
-    <maxCompositePoints value="143"/>
-    <maxCompositeContours value="8"/>
+    <maxPoints value="51"/>
+    <maxContours value="2"/>
+    <maxCompositePoints value="0"/>
+    <maxCompositeContours value="0"/>
     <maxZones value="1"/>
     <maxTwilightPoints value="0"/>
     <maxStorage value="0"/>
     <maxFunctionDefs value="0"/>
     <maxInstructionDefs value="0"/>
     <maxStackElements value="0"/>
     <maxSizeOfInstructions value="0"/>
-    <maxComponentElements value="4"/>
+    <maxComponentElements value="0"/>
     <maxComponentDepth value="1"/>
   </maxp>