Merge pull request #17 from aaronbell/main

Updating requirements document
googlefonts · Dec 7, 2022 · c30a622 · c30a622
2 parents 06ffd5c + 6d243f7
commit c30a622
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 91 deletions.
diff --git a/fonts/ttf/BIZUDMincho-Bold.ttf b/fonts/ttf/BIZUDMincho-Bold.ttf
diff --git a/fonts/ttf/BIZUDMincho-Regular.ttf b/fonts/ttf/BIZUDMincho-Regular.ttf
diff --git a/fonts/ttf/BIZUDPMincho-Bold.ttf b/fonts/ttf/BIZUDPMincho-Bold.ttf
diff --git a/fonts/ttf/BIZUDPMincho-Regular.ttf b/fonts/ttf/BIZUDPMincho-Regular.ttf
diff --git a/requirements.txt b/requirements.txt
@@ -1,100 +1,107 @@
-absl-py==1.0.0
+absl-py==1.3.0
 appdirs==1.4.4
-attrs==21.4.0
-babelfont==2.0.2
-beautifulsoup4==4.10.0
-beziers==0.4.0
+attrs==22.1.0
+axisregistry==0.3.10
+babelfont==3.0.0
+beautifulsoup4==4.11.1
+beziers==0.5.0
 booleanOperations==0.9.0
 Brotli==1.0.9
 browserstack-local==1.2.2
 bump2version==1.0.1
-bumpfontversion==0.3.0
-cattrs==1.10.0
-certifi==2021.10.8
-cffi==1.15.0
+bumpfontversion==0.4.1
+cattrs==22.2.0
+certifi==2022.9.24
+cffi==1.15.1
 cffsubr==0.2.9.post1
-charset-normalizer==2.0.12
-click==8.0.4
-cmarkgfm==0.8.0
-collidoscope==0.4.1
-colorlog==6.6.0
+charset-normalizer==2.1.1
+click==8.1.3
+cmarkgfm==2022.10.27
+collidoscope==0.5.2
+colorlog==6.7.0
 commandlines==0.4.1
 commonmark==0.9.1
-compreffor==0.5.1.post1
-cu2qu==1.6.7.post1
-defcon==0.10.0
+compreffor==0.5.3
+cu2qu==1.6.7.post2
+defcon==0.10.2
 dehinter==4.0.0
 Deprecated==1.2.13
-drawbot-skia==0.4.8
+exceptiongroup==1.0.4
 font-v==2.1.0
-fontbakery==0.8.7
-fontdiffenator==0.9.12
-fontmake==2.4.1
-fontMath==0.9.1
-fontParts==0.10.3
-fontPens==0.2.4
-fonttools==4.30.0
-freetype-py==2.2.0
-fs==2.4.15
-gfdiffbrowsers==0.1.7
-gftools==0.9.0
-gitdb==4.0.9
-GitPython==3.1.27
-glyphsets==0.2.1
-glyphsLib==6.0.0b4
+fontbakery==0.8.10
+fontFeatures==1.7.3
+fontmake==3.5.0
+fontMath==0.9.2
+fontools==0.5.0
+fonttools==4.38.0
+fs==2.4.16
+gflanguages==0.4.3
+gftools==0.9.21
+gitdb==4.0.10
+GitPython==3.1.29
+glyphsets==0.5.4
+glyphsLib==6.1.0
 glyphtools==0.8.0
-hyperglot==0.3.8
-idna==3.3
-Jinja2==3.0.3
-lxml==4.8.0
-MarkupSafe==2.1.0
-numpy==1.22.3
-openstep-plist==0.3.0
-opentype-sanitizer==8.2.1
-opentypespec==1.8.4
-Pillow==9.0.1
-pip-api==0.0.28
-protobuf==3.19.4
-psutil==5.9.0
-pybind11==2.9.1
+hyperglot==0.4.2
+idna==3.4
+Jinja2==3.1.2
+kurbopy==0.8.32
+lxml==4.9.1
+MarkupSafe==2.1.1
+nanoemoji==0.15.1
+ninja==1.11.1
+numpy==1.23.5
+openstep-plist==0.3.0.post1
+opentype-sanitizer==9.0.0
+opentypespec==1.9.1
+orjson==3.8.3
+packaging==21.3
+picosvg==0.20.6
+Pillow==9.3.0
+pip-api==0.0.30
+pngquant-cli==2.17.0.post5
+protobuf==3.20.3
+psutil==5.9.4
 pybrowserstack-screenshots==0.1
-pycairo==1.21.0
-pyclipper==1.3.0.post2
+pyclipper==1.3.0.post4
 pycparser==2.21
-pygit2==1.9.0
-PyGithub==1.55
-Pygments==2.11.2
-PyJWT==2.3.0
+pyfaidx==0.7.1
+pyfnutils==1.3
+pygit2==1.11.1
+PyGithub==1.57
+Pygments==2.13.0
+PyJWT==2.6.0
 PyNaCl==1.5.0
-pyparsing==3.0.7
-python-bidi==0.4.2
+pyparsing==3.0.9
 python-dateutil==2.8.2
-pytz==2021.3
 PyYAML==6.0
-requests==2.27.1
-rich==12.0.0
-rstr==3.1.0
-sh==1.14.2
-simplejson==3.17.6
+regex==2022.10.31
+requests==2.28.1
+resvg-cli==0.22.0.post3
+rich==12.6.0
+rstr==3.2.0
+sh==1.14.3
+simplejson==3.18.0
 six==1.16.0
-skia-pathops==0.7.2
-skia-python==87.4
+skia-pathops==0.7.4
 smmap==5.0.0
-soupsieve==2.3.1
+soupsieve==2.3.2.post1
 sre-yield==1.2
-statmake==0.4.1
-strictyaml==1.6.1
+statmake==0.6.0
+strictyaml==1.6.2
 stringbrewer==0.0.1
-tabulate==0.8.9
+tabulate==0.9.0
 toml==0.10.2
 ttfautohint-py==0.5.1
-ufo2ft==2.25.3
-ufoLib2==0.13.1
+ufo2ft==2.30.0
+ufoLib2==0.14.0
 ufolint==1.2.0
-uharfbuzz==0.21.0
-unicodedata2==14.0.0
-Unidecode==1.3.4
-urllib3==1.26.8
-vharfbuzz==0.1.1
+uharfbuzz==0.32.0
+unicodedata2==15.0.0
+Unidecode==1.3.6
+urllib3==1.26.13
+vharfbuzz==0.1.4
 vttLib==0.11.0
-wrapt==1.14.0
+wrapt==1.14.1
+zopfli==0.2.2
+zstandard==0.19.0
diff --git a/sources/build.py b/sources/build.py
@@ -163,25 +163,10 @@
     newDSIG.signatureRecords = []
     finalVersion.tables["DSIG"] = newDSIG
 
-    # It appears that fonttools *still* is not calculating the xAvgCharWidth correctly. I've reimplemented this fix as a result 
-
-    width_sum = 0
-    count = 0
-    for glyph_id in finalVersion['glyf'].glyphs:  # At least .notdef must be present.
-        width = finalVersion['hmtx'].metrics[glyph_id][0]
-        # The OpenType spec doesn't exclude negative widths, but only positive
-        # widths seems to be the assumption in the wild?
-        if width > 0:
-            count += 1
-            width_sum += width
-
-    avgCharWidth = int(round(width_sum / count))
-    finalVersion["OS/2"].xAvgCharWidth = avgCharWidth
-
     finalVersion["OS/2"].fsType = 0
 
     finalVersion.save(EXPORT / str(outputTTF).replace("BIZ-","BIZ").replace("Heavy","Bold"))
 
 shutil.rmtree("temp")
 shutil.rmtree("master_ufo")
-shutil.rmtree("instance_ufo")
+#shutil.rmtree("instance_ufo")