Merge pull request #38 from moyogo/extract-uvs

Extract Unicode Variation Sequences

Author: benkiel

Lib/extractor/formats/opentype.py

@@ -41,6 +41,7 @@ def extractFontFromOpenType(
         extractOpenTypeInfo(source, destination)
     if doGlyphs:
         extractOpenTypeGlyphs(source, destination)
+        extractUnicodeVariationSequences(source, destination)
     if doGlyphOrder:
         extractGlyphOrder(source, destination)
     if doKerning:
@@ -61,6 +62,33 @@ def extractGlyphOrder(source, destination):
         destination.lib["public.glyphOrder"] = glyphOrder
 
 
+# ---------------------------
+# Unicode Variation Sequences
+# ---------------------------
+
+
+def extractUnicodeVariationSequences(source, destination):
+    """
+    Extract the Unicode Variation Sequences
+    """
+    cmap = source.get("cmap")
+    mapping = cmap.getBestCmap()
+    for subtable in cmap.tables:
+        if subtable.format == 14:
+            destination.lib["public.unicodeVariationSequences"] = {
+                "%04X" % variationSelector: {
+                    "%04X" % charValue: glyphName if glyphName else mapping.get(charValue)
+                    for (charValue, glyphName) in uvsList
+                }
+                for variationSelector, uvsList in subtable.uvsDict.items()
+            }
+
+
+# ------------
+# Instructions
+# ------------
+
+
 def extractInstructions(source, destination):
     if "glyf" not in source:
         return
@@ -500,7 +528,6 @@ def extractOpenTypeGlyphs(source, destination):
     # grab the cmap
     vmtx = source.get("vmtx")
     vorg = source.get("VORG")
-    cmap = source.getBestCmap()
     is_ttf = "glyf" in source
     reversedMapping = source.get("cmap").buildReversed()
     # grab the glyphs

dev-requirements.txt

@@ -0,0 +1,2 @@
+pytest
+ufo2ft

requirements.txt

@@ -1 +1,3 @@
-fonttools
+fonttools
+defcon
+ufoLib2

tests/conftest.py

@@ -0,0 +1,20 @@
+import pytest
+
+
+@pytest.fixture(scope="session", params=["defcon", "ufoLib2"])
+def ufo_module(request):
+    return pytest.importorskip(request.param)
+
+
+@pytest.fixture(scope="session")
+def FontClass(ufo_module):
+    if hasattr(ufo_module.Font, "open"):
+
+        def ctor(path=None):
+            if path is None:
+                return ufo_module.Font()
+            else:
+                return ufo_module.Font.open(path)
+
+        return ctor
+    return ufo_module.Font

tests/data/UVSTest.ttf

@@ -1,13 +1,32 @@
 import extractor
-import unittest
+import os
+import pytest
 
 
-class ExtractUfoTest(unittest.TestCase):
+def getpath(filename):
+    dirname = os.path.dirname(__file__)
+    return os.path.join(dirname, "data", filename)
 
-    # TODO: replace this with real test cases
-    def test_extractUFO_dummy_test(self):
-        self.assertTrue(True)
+
+class ExtractUfoTest:
+
+    def test_extract_cmap_with_UVS(self, FontClass):
+        ufo = FontClass()
+        extractor.extractUFO(getpath("UVSTest.ttf"), ufo)
+
+        assert {glyph.name: set(glyph.unicodes) for glyph in ufo if glyph.unicodes} == {
+            "zero": {0x030},
+            "Anegativesquared": {0x1F170},
+        }
+
+        assert ufo.lib.get("public.unicodeVariationSequences") == {
+            "FE00": {"0030": "zero.slash"},
+            "FE0E": {"1F170": "Anegativesquared.text"},
+            "FE0F": {"1F170": "Anegativesquared"},
+        }
 
 
 if __name__ == "__main__":
-    unittest.main()
+    import sys
+
+    sys.exit(pytest.main(sys.argv))

tests/extractor_test.py

@@ -4,6 +4,7 @@ envlist = py36, py38
 [testenv]
 deps =
     pytest
-    -rrequirements.txt
+    -r requirements.txt
+    -r dev-requirements.txt
 commands =
     pytest {posargs}