Fix customBinaryData formatting with regEx

googlefonts · Jan 23, 2025 · a7fbd45 · a7fbd45
1 parent 834dfe7
commit a7fbd45
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/fontra_glyphs/backend.py b/src/fontra_glyphs/backend.py
@@ -41,6 +41,7 @@
 
 from .utils import (
     convertMatchesToTuples,
+    fixCustomBinaryDataFormatting,
     getAssociatedMasterId,
     getLocationFromSources,
     matchTreeFont,
@@ -412,7 +413,7 @@ async def putGlyph(
     def _writeRawGlyph(self, glyphName, f):
         # 5. write whole file with openstep_plist
         result = convertMatchesToTuples(self.rawFontData, matchTreeFont)
-        self.gsFilePath.write_text(
+        out = (
             openstep_plist.dumps(
                 result,
                 unicode_escape=False,
@@ -425,6 +426,9 @@ def _writeRawGlyph(self, glyphName, f):
             + "\n"
         )
 
+        out = fixCustomBinaryDataFormatting(out)
+        self.gsFilePath.write_text(out)
+
     async def aclose(self) -> None:
         pass
 

diff --git a/src/fontra_glyphs/utils.py b/src/fontra_glyphs/utils.py
@@ -1,3 +1,4 @@
+import re
 from collections import OrderedDict
 
 
@@ -94,3 +95,11 @@ def convertMatchesToTuples(obj, matchTree, path=()):
 
 matchTreeFont = patternsToMatchTree(patterns)
 matchTreeGlyph = matchTreeFont["glyphs"][None]
+
+
+def fixCustomBinaryDataFormatting(content):
+    return re.sub(
+        r"customBinaryData = <\s*([0-9a-fA-F\s]+)\s*>;",
+        lambda m: f"customBinaryData = <{m.group(1).replace(' ', '')}>;",
+        content,
+    )
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -7,6 +7,7 @@
 
 from fontra_glyphs.utils import (
     convertMatchesToTuples,
+    fixCustomBinaryDataFormatting,
     getAssociatedMasterId,
     getLocationFromSources,
     matchTreeFont,
@@ -101,7 +102,7 @@ def test_getAssociatedMasterId(testGSFontWW, gsLocation, expected):
     assert getAssociatedMasterId(testGSFontWW, gsLocation) == expected
 
 
-@pytest.mark.parametrize("path", [glyphs2Path, glyphs3Path])
+@pytest.mark.parametrize("path", [glyphs3Path])
 def test_roundtrip_glyphs_file_dumps(path):
     root = openstep_plist.loads(path.read_text(), use_numbers=True)
     result = convertMatchesToTuples(root, matchTreeFont)
@@ -119,5 +120,7 @@ def test_roundtrip_glyphs_file_dumps(path):
         + "\n"
     )
 
+    out = fixCustomBinaryDataFormatting(out)
+
     for root_line, out_line in zip(path.read_text().splitlines(), out.splitlines()):
         assert root_line == out_line