From dd7311ab76f0a79c19d2dcb1aaa2f29c1a2e335d Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Tue, 18 Jun 2024 13:09:04 +0100 Subject: [PATCH 1/5] Fix MVAR/HVAR error with new paintcompiler --- requirements.txt | 2 +- scriptsLib/colrv1.py | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index d453ec2a8..d4a8a5d02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -72,7 +72,7 @@ opentype-sanitizer==9.1.0 opentypespec==1.9.1 orjson==3.10.0 packaging==23.1 -paintcompiler==0.3.2 +paintcompiler==0.3.4 parso==0.8.4 pexpect==4.9.0 picosvg==0.22.0 diff --git a/scriptsLib/colrv1.py b/scriptsLib/colrv1.py index 1d24d0141..722f9b827 100644 --- a/scriptsLib/colrv1.py +++ b/scriptsLib/colrv1.py @@ -1130,13 +1130,3 @@ def pixelPositions(f, gName): layer1_pixel, # Background layer2_pixel, # Foreground ) - - -# We have a problem; we have added six new axes to the font at this point, -# and while the gvar table can cope with that because it gets rebuilt when -# the font is saved, the HVAR table is not fully decompiled by fontTools, -# so it still refers to four axes, which makes it invalid when you try -# to save the font. Thankfully, HVAR isn't very necessary anyway, so we -# just get rid of it. -del font["HVAR"] -del font["MVAR"] From ecca2518d7b0fb9447815e51f544f58e1a5b781d Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Tue, 18 Jun 2024 13:09:18 +0100 Subject: [PATCH 2/5] Skip long outline checks --- fontbakery.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fontbakery.toml b/fontbakery.toml index ea7568649..2665844fd 100644 --- a/fontbakery.toml +++ b/fontbakery.toml @@ -1,3 +1,7 @@ exclude_checks = [ - "com.google.fonts/check/interpolation_issues" + "com.google.fonts/check/interpolation_issues", + "com.google.fonts/check/outline_direction", + "com.google.fonts/check/outline_colinear_vectors", + "com.google.fonts/check/outline_jaggy_segments", + "com.google.fonts/check/outline_semi_vertical" ] From b78eca8a4e0108cb67a18ea1af888e74eec731cd Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Tue, 18 Jun 2024 13:13:47 +0100 Subject: [PATCH 3/5] Correct vendor ID --- sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist index d737145da..91455ff99 100644 --- a/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist index ea9723864..734ff0e0b 100644 --- a/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist index 4b04a16f0..f587c3492 100644 --- a/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WinAscent diff --git a/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist index 24d1a95f6..b62c838e9 100644 --- a/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WinAscent diff --git a/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist index 0d769ad3f..b9e546e4c 100644 --- a/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist index bc159bf58..ad5837667 100644 --- a/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist index c2eb79282..e3b062142 100644 --- a/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist index 47fa6b820..317f4a149 100644 --- a/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist index 00911953b..1de4be0cf 100644 --- a/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist index 9e10977fd..877d01e96 100644 --- a/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist index b2aef28f8..8435769e1 100644 --- a/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist index a7d9eb517..982917b4a 100644 --- a/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - petr + robo openTypeOS2WeightClass 400 openTypeOS2WidthClass From 114c18d0d4747fe440c76c0a025b3ac3abb65d7d Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Tue, 18 Jun 2024 16:17:51 +0100 Subject: [PATCH 4/5] Fix vendor ID again --- sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist | 2 +- sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist index 91455ff99..3f0965cb1 100644 --- a/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Double-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist index 734ff0e0b..000d3a11f 100644 --- a/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Double.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist index f587c3492..71ae82edd 100644 --- a/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Single-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WinAscent diff --git a/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist b/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist index b62c838e9..fc5b71ab0 100644 --- a/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Grid_Single.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WinAscent diff --git a/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist index b9e546e4c..988e3c5b5 100644 --- a/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Double-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist index ad5837667..51663a85a 100644 --- a/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Double.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist index e3b062142..5c902c09a 100644 --- a/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Single-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist b/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist index 317f4a149..f0b9b574e 100644 --- a/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Mono_Single.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist index 1de4be0cf..f87138749 100644 --- a/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Double-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist index 877d01e96..1ba64ccbf 100644 --- a/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Double.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist index 8435769e1..f5e13073b 100644 --- a/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Single-Italic.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass diff --git a/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist b/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist index 982917b4a..6e31e9dab 100644 --- a/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist +++ b/sources/ufo/Bitcount_Prop_Single.ufo/fontinfo.plist @@ -110,7 +110,7 @@ 62 openTypeOS2VendorID - robo + TPTR openTypeOS2WeightClass 400 openTypeOS2WidthClass From b56a07d961de415a5dd88676af6a87e20bfa3982 Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Tue, 18 Jun 2024 17:20:31 +0100 Subject: [PATCH 5/5] Remove italic axes from GF build --- scriptsLib/make.py | 2 ++ sources/stat-color.yaml | 2 -- sources/stat.yaml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scriptsLib/make.py b/scriptsLib/make.py index bf7b90de0..f2a160655 100644 --- a/scriptsLib/make.py +++ b/scriptsLib/make.py @@ -236,6 +236,8 @@ def makeDesignSpaceFile(dsName, dsParams, googlefonts=False): googlefonts ): # For GF builds, only add default wght/slnt instances continue + if slnt != slnt_DEF and googlefonts: + continue template.instances.append( InstanceDescriptor( diff --git a/sources/stat-color.yaml b/sources/stat-color.yaml index e084a8fd3..8bfa51915 100644 --- a/sources/stat-color.yaml +++ b/sources/stat-color.yaml @@ -38,8 +38,6 @@ values: - name: Default value: 0.0 - - name: Slanted - value: -8.0 - name: Cursive tag: CRSV values: diff --git a/sources/stat.yaml b/sources/stat.yaml index dbcef3a6a..aea206fc8 100644 --- a/sources/stat.yaml +++ b/sources/stat.yaml @@ -38,8 +38,6 @@ values: - name: Default value: 0.0 - - name: Slanted - value: -8.0 - name: Cursive tag: CRSV values: