From d590feba999c99ab74da400fdc8d148dc63a3433 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 2 Apr 2024 11:42:42 -0600
Subject: [PATCH] [avar] Add test for ttGlyphSet support

---
 Tests/ttLib/tables/_a_v_a_r_test.py           |  28 +++++++++++++++++-
 .../tables/data/Amstelvar-avar2.subset.ttf    | Bin 0 -> 9348 bytes
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 Tests/ttLib/tables/data/Amstelvar-avar2.subset.ttf

diff --git a/Tests/ttLib/tables/_a_v_a_r_test.py b/Tests/ttLib/tables/_a_v_a_r_test.py
index dbe07b3a5..2c41bdf64 100644
--- a/Tests/ttLib/tables/_a_v_a_r_test.py
+++ b/Tests/ttLib/tables/_a_v_a_r_test.py
@@ -2,6 +2,7 @@ from fontTools.misc.testTools import parseXML
 from fontTools.misc.textTools import deHexStr
 from fontTools.misc.xmlWriter import XMLWriter
 from fontTools.misc.fixedTools import floatToFixed as fl2fi
+from fontTools.pens.statisticsPen import StatisticsPen
 from fontTools.ttLib import TTFont, TTLibError
 import fontTools.ttLib.tables.otTables as otTables
 from fontTools.ttLib.tables._a_v_a_r import table__a_v_a_r
@@ -9,9 +10,12 @@ from fontTools.ttLib.tables._f_v_a_r import table__f_v_a_r, Axis
 import fontTools.varLib.models as models
 import fontTools.varLib.varStore as varStore
 from io import BytesIO
+import os
 import unittest
 
 
+DATA_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "data")
+
 TEST_DATA = deHexStr(
     "00 01 00 00 00 00 00 02 "
     "00 04 C0 00 C0 00 00 00 00 00 13 33 33 33 40 00 40 00 "
@@ -100,7 +104,7 @@ class AxisVariationTableTest(unittest.TestCase):
 
 
 class Avar2Test(unittest.TestCase):
-    def test(self):
+    def test_roundtrip(self):
         axisTags = ["wght", "wdth"]
         fvar = table__f_v_a_r()
         for tag in axisTags:
@@ -173,6 +177,28 @@ class Avar2Test(unittest.TestCase):
         assert avar.table.VarStore.VarRegionList.RegionAxisCount == 2
         assert avar.table.VarStore.VarRegionList.RegionCount == 1
 
+    def test_ttGlyphSet(self):
+        ttf = os.path.join(DATA_DIR, "Amstelvar-avar2.subset.ttf")
+        font = TTFont(ttf)
+
+        regular = font.getGlyphSet()
+        black = font.getGlyphSet(location={"wght": 900})
+        expanded = font.getGlyphSet(location={"wdth": 125})
+
+        regularStats = StatisticsPen()
+        blackStats = StatisticsPen()
+        expandedStats = StatisticsPen()
+
+        for glyph in "Test":
+            regular[glyph].draw(regularStats)
+            black[glyph].draw(blackStats)
+            expanded[glyph].draw(expandedStats)
+
+        assert abs(regularStats.area) < abs(blackStats.area)
+        assert abs(expandedStats.area) < abs(blackStats.area)
+
+        assert regularStats.meanX < expandedStats.meanX
+
 
 if __name__ == "__main__":
     import sys
diff --git a/Tests/ttLib/tables/data/Amstelvar-avar2.subset.ttf b/Tests/ttLib/tables/data/Amstelvar-avar2.subset.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..13610487134ff7da81b53058cac37294efb23608
GIT binary patch
literal 9348
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

literal 0
HcmV?d00001