Update encoder to diff CFF if present.

Author: garretrieger

MODULE.bazel

@@ -72,10 +72,10 @@ http_archive(
 # Fontations
 http_archive(
     name = "fontations",
-    urls = ["https://github.com/googlefonts/fontations/archive/13fefb967cd4ee176bf0730b2bea8cd3ade7646d.zip"],
-    strip_prefix = "fontations-13fefb967cd4ee176bf0730b2bea8cd3ade7646d",
+    urls = ["https://github.com/googlefonts/fontations/archive/94b307c0cafd7c01303512561adea12caf0b8448.zip"],
+    strip_prefix = "fontations-94b307c0cafd7c01303512561adea12caf0b8448",
     build_file = "//third_party:fontations.BUILD",
-    integrity = "sha256-AalVpu9w4cZwq8cbbk+I8XPVch3d3nxCGHq5YBTa3dY=",
+    integrity = "sha256-wahAEZhicU9APfEV/eNmdzTxMDO1JV1KGZzCMw9wers=",
 )
 
 

fontations/Cargo.lock

@@ -314,7 +314,7 @@ Status Encoder::EnsureGlyphKeyedPatchesPopulated(
   }
 
   GlyphKeyedDiff differ(instance, compat_id,
-                        {FontHelper::kGlyf, FontHelper::kGvar});
+                        {FontHelper::kGlyf, FontHelper::kGvar, FontHelper::kCFF});
 
   for (uint32_t index : reachable_segments) {
     auto e = glyph_data_patches_.find(index);

ift/encoder/encoder.cc

@@ -211,7 +211,7 @@ class Encoder {
 
   static ift::TableKeyedDiff* MixedModeTableKeyedDiff(
       common::CompatId base_compat_id) {
-    return new TableKeyedDiff(base_compat_id, {"IFTX", "glyf", "loca", "gvar"});
+    return new TableKeyedDiff(base_compat_id, {"IFTX", "glyf", "loca", "gvar", "CFF "});
   }
 
   static ift::TableKeyedDiff* ReplaceIftMapTableKeyedDiff(
@@ -220,7 +220,7 @@ class Encoder {
     // gvar and "IFT " are overwritten to be compatible with the new design
     // space. Glyph segment patches for all prev loaded glyphs will be
     // downloaded to repopulate variation data for any already loaded glyphs.
-    return new TableKeyedDiff(base_compat_id, {"glyf", "loca"},
+    return new TableKeyedDiff(base_compat_id, {"glyf", "loca", "CFF "},
                               {"IFTX", "gvar"});
   }
 

ift/encoder/encoder.h

@@ -43,7 +43,6 @@ rust_library(
       ":klippa",
       "@fontations_deps//:data-encoding",
       "@fontations_deps//:data-encoding-macro",
-      "@fontations_deps//:uri-template-system",
     ],
 )