Merge pull request #107 from jordanwilliams/fix-WONK-axis-description-typo
Fix a typo in the WONK axis description
diff --git a/Lib/axisregistry/__init__.py b/Lib/axisregistry/__init__.py
index 7d2ccf6..e900b87 100644
--- a/Lib/axisregistry/__init__.py
+++ b/Lib/axisregistry/__init__.py
@@ -338,9 +338,13 @@
stat_nameids = []
if "STAT" in ttFont:
if ttFont["STAT"].table.AxisValueCount > 0:
- stat_nameids = [
+ stat_nameids.extend(
av.ValueNameID for av in ttFont["STAT"].table.AxisValueArray.AxisValue
- ]
+ )
+ if ttFont["STAT"].table.DesignAxisCount > 0:
+ stat_nameids.extend(
+ av.AxisNameID for av in ttFont["STAT"].table.DesignAxisRecord.Axis
+ )
# rm old fvar subfamily and ps name records
for inst in fvar.instances:
diff --git a/setup.py b/setup.py
index 17139c1..e9d3b9b 100644
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,9 @@
"Programming Language :: Python :: 3",
],
python_requires=">=3.7",
- setup_requires=["setuptools_scm>=4,<6.1"],
- install_requires=["protobuf>=3.19.4", "fonttools"],
+ setup_requires=[
+ "setuptools>=61.2",
+ "setuptools_scm[toml]>=6.2",
+ ],
+ install_requires=["protobuf>=3.19.4, <4", "fonttools"],
)
