Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correcting STAT table #537

Closed
wants to merge 1 commit into from
Closed

Correcting STAT table #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import fontTools.ttLib
import fontTools.ttLib.tables._g_l_y_f as _g_l_y_f
import psautohint.__main__
import statmake.classes
import statmake.lib
from gftools.stat import gen_stat_tables_from_config
import yaml
import ufo2ft
import ufoLib2
import vttLib
Expand Down Expand Up @@ -235,11 +235,6 @@ def compile_variable_and_save(
print(f"[{familyName} {styleName}] Compiling")
varFont = ufo2ft.compileVariableTTF(designspace, inplace=True)

print(f"[{familyName} {styleName}] Adding STAT table")
styleSpace = statmake.classes.Stylespace.from_file(INPUT_DIR / "STAT.plist")
statmake.lib.apply_stylespace_to_variable_font(styleSpace, varFont, {})


print(f"[{familyName} {styleName}] Merging VTT")

if "Italic" in styleName:
Expand Down Expand Up @@ -575,6 +570,15 @@ def ttfautohint(path: str) -> None:
process.get()
del processes, pool

# Step 1.5: Adding STAT tables in one go
print ("[Cascadia Variable fonts] Fixing STAT tables")
fontSTAT = [fontTools.ttLib.TTFont(f) for f in list(OUTPUT_TTF_DIR.glob("*.ttf"))]
config = yaml.load(open(INPUT_DIR/"stat.yaml"), Loader=yaml.SafeLoader)
gen_stat_tables_from_config(config, fontSTAT)

for font in fontSTAT:
font.save(font.reader.file.name)

# Stage 2: Autohint and maybe compress all the static things.
if args.static_fonts is True:
otfs = list(OUTPUT_STATIC_OTF_DIR.glob("*.otf"))
Expand Down
19 changes: 0 additions & 19 deletions sources/CascadiaCode-Bold.ufo/lib.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,6 @@
<key>Tag</key>
<string>wght</string>
</dict>
<dict>
<key>Name</key>
<string>Italic</string>
<key>Tag</key>
<string>ital</string>
</dict>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
<array>
<string>/vav-hb</string>
<string>/paseq-hb</string>
<string>/geresh-hb</string>
<string>/three-persian</string>
<string>/two-ar</string>
<string>/gafInvertedstroke-ar/gafInvertedstroke-ar.fina/gafInvertedstroke-ar.medi/gafInvertedstroke-ar.init</string>
<string>/kasratan-ar</string>
<string>/alef-hb/alefpatah-hb/alefqamats-hb/alefdagesh-hb/bet-hb/betdagesh-hb/gimel-hb/gimeldagesh-hb/dalet-hb/daletdagesh-hb/he-hb/hedagesh-hb/vav-hb/vavdagesh-hb/vavholam-hb/zayin-hb/zayindagesh-hb/het-hb/tet-hb/tetdagesh-hb/yod-hb/yoddagesh-hb/finalkaf-hb/finalkafdagesh-hb/kaf-hb/kafdagesh-hb/lamed-hb/lameddagesh-hb/finalmem-hb/mem-hb/memdagesh-hb/finalnun-hb/nun-hb/nundagesh-hb/samekh-hb/samekhdagesh-hb/ayin-hb/finalpe-hb/finalpedagesh-hb/pe-hb/pedagesh-hb/finaltsadi-hb/tsadi-hb/tsadidagesh-hb/qof-hb/qofdagesh-hb/resh-hb/reshdagesh-hb/shin-hb/shinshindot-hb/shinsindot-hb/shindageshshindot-hb/shindageshsindot-hb/shindagesh-hb/tav-hb/tavdagesh-hb

</string>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
<false/>
Expand Down
15 changes: 0 additions & 15 deletions sources/CascadiaCode-BoldItalic.ufo/lib.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,6 @@
<key>Tag</key>
<string>wght</string>
</dict>
<dict>
<key>Name</key>
<string>Italic</string>
<key>Tag</key>
<string>ital</string>
</dict>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
<array>
<string>/b.alt</string>
<string>/De-cy/Ka-cy/El-cy/De-cy.loclBGR/be-cy/ve-cy/ge-cy/gheupturn-cy/ze-cy/el-cy/en-cy/ef-cy/che-cy/tse-cy/sha-cy/shcha-cy/softsign-cy/hardsign-cy/yeru-cy/lje-cy/nje-cy/e-cy/ereversed-cy/iu-cy/ia-cy/dje-cy/ghestroke-cy/endescender-cy/chedescender-cy/shha-cy/shha-cy.alt/ka-cy.loclBGR.alt/iu-cy.loclBGR.alt/zhe-cy.loclBGR/ze-cy.loclBGR/ka-cy.loclBGR/ve-cy.salt/ze-cy.salt/che-cy.salt/chedescender-cy.salt</string>
<string>u/tse-cy</string>
<string>all/space of/space the/space limes
all/space of/space the/space limes
all/space of/space the/space limes</string>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
<false/>
Expand Down
19 changes: 0 additions & 19 deletions sources/CascadiaCode-ExtraLight.ufo/lib.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,6 @@
<key>Tag</key>
<string>wght</string>
</dict>
<dict>
<key>Name</key>
<string>Italic</string>
<key>Tag</key>
<string>ital</string>
</dict>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
<array>
<string>/vav-hb</string>
<string>/paseq-hb</string>
<string>/geresh-hb</string>
<string>/three-persian</string>
<string>/two-ar</string>
<string>/gafInvertedstroke-ar/gafInvertedstroke-ar.fina/gafInvertedstroke-ar.medi/gafInvertedstroke-ar.init</string>
<string>/kasratan-ar</string>
<string>/alef-hb/alefpatah-hb/alefqamats-hb/alefdagesh-hb/bet-hb/betdagesh-hb/gimel-hb/gimeldagesh-hb/dalet-hb/daletdagesh-hb/he-hb/hedagesh-hb/vav-hb/vavdagesh-hb/vavholam-hb/zayin-hb/zayindagesh-hb/het-hb/tet-hb/tetdagesh-hb/yod-hb/yoddagesh-hb/finalkaf-hb/finalkafdagesh-hb/kaf-hb/kafdagesh-hb/lamed-hb/lameddagesh-hb/finalmem-hb/mem-hb/memdagesh-hb/finalnun-hb/nun-hb/nundagesh-hb/samekh-hb/samekhdagesh-hb/ayin-hb/finalpe-hb/finalpedagesh-hb/pe-hb/pedagesh-hb/finaltsadi-hb/tsadi-hb/tsadidagesh-hb/qof-hb/qofdagesh-hb/resh-hb/reshdagesh-hb/shin-hb/shinshindot-hb/shinsindot-hb/shindageshshindot-hb/shindageshsindot-hb/shindagesh-hb/tav-hb/tavdagesh-hb

</string>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
<false/>
Expand Down
15 changes: 0 additions & 15 deletions sources/CascadiaCode-ExtraLightItalic.ufo/lib.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,6 @@
<key>Tag</key>
<string>wght</string>
</dict>
<dict>
<key>Name</key>
<string>Italic</string>
<key>Tag</key>
<string>ital</string>
</dict>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
<array>
<string>/b.alt</string>
<string>/De-cy/Ka-cy/El-cy/De-cy.loclBGR/be-cy/ve-cy/ge-cy/gheupturn-cy/ze-cy/el-cy/en-cy/ef-cy/che-cy/tse-cy/sha-cy/shcha-cy/softsign-cy/hardsign-cy/yeru-cy/lje-cy/nje-cy/e-cy/ereversed-cy/iu-cy/ia-cy/dje-cy/ghestroke-cy/endescender-cy/chedescender-cy/shha-cy/shha-cy.alt/ka-cy.loclBGR.alt/iu-cy.loclBGR.alt/zhe-cy.loclBGR/ze-cy.loclBGR/ka-cy.loclBGR/ve-cy.salt/ze-cy.salt/che-cy.salt/chedescender-cy.salt</string>
<string>u/tse-cy</string>
<string>all/space of/space the/space limes
all/space of/space the/space limes
all/space of/space the/space limes</string>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
<false/>
Expand Down
15 changes: 0 additions & 15 deletions sources/CascadiaCode-Italic.ufo/lib.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,6 @@
<key>Tag</key>
<string>wght</string>
</dict>
<dict>
<key>Name</key>
<string>Italic</string>
<key>Tag</key>
<string>ital</string>
</dict>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
<array>
<string>/b.alt</string>
<string>/De-cy/Ka-cy/El-cy/De-cy.loclBGR/be-cy/ve-cy/ge-cy/gheupturn-cy/ze-cy/el-cy/en-cy/ef-cy/che-cy/tse-cy/sha-cy/shcha-cy/softsign-cy/hardsign-cy/yeru-cy/lje-cy/nje-cy/e-cy/ereversed-cy/iu-cy/ia-cy/dje-cy/ghestroke-cy/endescender-cy/chedescender-cy/shha-cy/shha-cy.alt/ka-cy.loclBGR.alt/iu-cy.loclBGR.alt/zhe-cy.loclBGR/ze-cy.loclBGR/ka-cy.loclBGR/ve-cy.salt/ze-cy.salt/che-cy.salt/chedescender-cy.salt</string>
<string>u/tse-cy</string>
<string>all/space of/space the/space limes
all/space of/space the/space limes
all/space of/space the/space limes</string>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
<false/>
Expand Down
19 changes: 0 additions & 19 deletions sources/CascadiaCode-Regular.ufo/lib.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,6 @@
<key>Tag</key>
<string>wght</string>
</dict>
<dict>
<key>Name</key>
<string>Italic</string>
<key>Tag</key>
<string>ital</string>
</dict>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
<array>
<string>/vav-hb</string>
<string>/paseq-hb</string>
<string>/geresh-hb</string>
<string>/three-persian</string>
<string>/two-ar</string>
<string>/gafInvertedstroke-ar/gafInvertedstroke-ar.fina/gafInvertedstroke-ar.medi/gafInvertedstroke-ar.init</string>
<string>/kasratan-ar</string>
<string>/alef-hb/alefpatah-hb/alefqamats-hb/alefdagesh-hb/bet-hb/betdagesh-hb/gimel-hb/gimeldagesh-hb/dalet-hb/daletdagesh-hb/he-hb/hedagesh-hb/vav-hb/vavdagesh-hb/vavholam-hb/zayin-hb/zayindagesh-hb/het-hb/tet-hb/tetdagesh-hb/yod-hb/yoddagesh-hb/finalkaf-hb/finalkafdagesh-hb/kaf-hb/kafdagesh-hb/lamed-hb/lameddagesh-hb/finalmem-hb/mem-hb/memdagesh-hb/finalnun-hb/nun-hb/nundagesh-hb/samekh-hb/samekhdagesh-hb/ayin-hb/finalpe-hb/finalpedagesh-hb/pe-hb/pedagesh-hb/finaltsadi-hb/tsadi-hb/tsadidagesh-hb/qof-hb/qofdagesh-hb/resh-hb/reshdagesh-hb/shin-hb/shinshindot-hb/shinsindot-hb/shindageshshindot-hb/shindageshsindot-hb/shindagesh-hb/tav-hb/tavdagesh-hb

</string>
</array>
<key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
<false/>
Expand Down
10 changes: 0 additions & 10 deletions sources/CascadiaCode_variable.designspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<map input="600" output="650"/>
<map input="700" output="750"/>
</axis>
<axis tag="ital" name="Italic" minimum="0" maximum="0" default="0"/>
</axes>
<rules>
<rule name="BRACKET.500.750">
Expand Down Expand Up @@ -41,7 +40,6 @@
<source filename="CascadiaCode-ExtraLight.ufo" name="Cascadia Code ExtraLight" familyname="Cascadia Code" stylename="ExtraLight">
<location>
<dimension name="Weight" xvalue="140"/>
<dimension name="Italic" xvalue="0"/>
</location>
</source>
<source filename="CascadiaCode-Regular.ufo" name="Cascadia Code Regular" familyname="Cascadia Code" stylename="Regular">
Expand All @@ -51,21 +49,18 @@
<info copy="1"/>
<location>
<dimension name="Weight" xvalue="500"/>
<dimension name="Italic" xvalue="0"/>
</location>
</source>
<source filename="CascadiaCode-Bold.ufo" name="Cascadia Code Bold" familyname="Cascadia Code" stylename="Bold">
<location>
<dimension name="Weight" xvalue="750"/>
<dimension name="Italic" xvalue="0"/>
</location>
</source>
</sources>
<instances>
<instance name="Cascadia Code ExtraLight" familyname="Cascadia Code" stylename="ExtraLight" filename="instance_ufos/CascadiaCode-ExtraLight.ufo">
<location>
<dimension name="Weight" xvalue="140"/>
<dimension name="Italic" xvalue="0"/>
</location>
<kerning/>
<info/>
Expand All @@ -90,7 +85,6 @@
<instance name="Cascadia Code Light" familyname="Cascadia Code" stylename="Light" filename="instance_ufos/CascadiaCode-Light.ufo">
<location>
<dimension name="Weight" xvalue="260"/>
<dimension name="Italic" xvalue="0"/>
</location>
<kerning/>
<info/>
Expand All @@ -117,7 +111,6 @@
<instance name="Cascadia Code SemiLight" familyname="Cascadia Code" stylename="SemiLight" filename="instance_ufos/CascadiaCode-SemiLight.ufo">
<location>
<dimension name="Weight" xvalue="380"/>
<dimension name="Italic" xvalue="0"/>
</location>
<kerning/>
<info/>
Expand All @@ -144,7 +137,6 @@
<instance name="Cascadia Code Regular" familyname="Cascadia Code" stylename="Regular" filename="instance_ufos/CascadiaCode-Regular.ufo">
<location>
<dimension name="Weight" xvalue="500"/>
<dimension name="Italic" xvalue="0"/>
</location>
<kerning/>
<info/>
Expand All @@ -169,7 +161,6 @@
<instance name="Cascadia Code SemiBold" familyname="Cascadia Code" stylename="SemiBold" filename="instance_ufos/CascadiaCode-SemiBold.ufo">
<location>
<dimension name="Weight" xvalue="650"/>
<dimension name="Italic" xvalue="0"/>
</location>
<kerning/>
<info/>
Expand All @@ -196,7 +187,6 @@
<instance name="Cascadia Code Bold" familyname="Cascadia Code" stylename="Bold" filename="instance_ufos/CascadiaCode-Bold.ufo" stylemapfamilyname="Cascadia Code" stylemapstylename="bold">
<location>
<dimension name="Weight" xvalue="750"/>
<dimension name="Italic" xvalue="0"/>
</location>
<kerning/>
<info/>
Expand Down
10 changes: 0 additions & 10 deletions sources/CascadiaCode_variable_italic.designspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<map input="600" output="650"/>
<map input="700" output="750"/>
</axis>
<axis tag="ital" name="Italic" minimum="1" maximum="1" default="1"/>
</axes>
<rules>
<rule name="BRACKET.500.750">
Expand Down Expand Up @@ -41,7 +40,6 @@
<source filename="CascadiaCode-ExtraLightItalic.ufo" name="Cascadia Code ExtraLight Italic" familyname="Cascadia Code" stylename="ExtraLight Italic">
<location>
<dimension name="Weight" xvalue="140"/>
<dimension name="Italic" xvalue="1"/>
</location>
</source>
<source filename="CascadiaCode-Italic.ufo" name="Cascadia Code Italic" familyname="Cascadia Code" stylename="Italic">
Expand All @@ -51,21 +49,18 @@
<info copy="1"/>
<location>
<dimension name="Weight" xvalue="500"/>
<dimension name="Italic" xvalue="1"/>
</location>
</source>
<source filename="CascadiaCode-BoldItalic.ufo" name="Cascadia Code Bold Italic" familyname="Cascadia Code" stylename="Bold Italic">
<location>
<dimension name="Weight" xvalue="750"/>
<dimension name="Italic" xvalue="1"/>
</location>
</source>
</sources>
<instances>
<instance name="Cascadia Code ExtraLight Italic" familyname="Cascadia Code" stylename="ExtraLight Italic" filename="instance_ufos/CascadiaCode-ExtraLightItalic.ufo" stylemapfamilyname="Cascadia Code ExtraLight" stylemapstylename="italic">
<location>
<dimension name="Weight" xvalue="140"/>
<dimension name="Italic" xvalue="1"/>
</location>
<kerning/>
<info/>
Expand All @@ -90,7 +85,6 @@
<instance name="Cascadia Code Light Italic" familyname="Cascadia Code" stylename="Light Italic" filename="instance_ufos/CascadiaCode-LightItalic.ufo" stylemapfamilyname="Cascadia Code Light" stylemapstylename="italic">
<location>
<dimension name="Weight" xvalue="260"/>
<dimension name="Italic" xvalue="1"/>
</location>
<kerning/>
<info/>
Expand All @@ -117,7 +111,6 @@
<instance name="Cascadia Code SemiLight Italic" familyname="Cascadia Code" stylename="SemiLight Italic" filename="instance_ufos/CascadiaCode-SemiLightItalic.ufo" stylemapfamilyname="Cascadia Code SemiLight" stylemapstylename="italic">
<location>
<dimension name="Weight" xvalue="380"/>
<dimension name="Italic" xvalue="1"/>
</location>
<kerning/>
<info/>
Expand All @@ -144,7 +137,6 @@
<instance name="Cascadia Code Italic" familyname="Cascadia Code" stylename="Italic" filename="instance_ufos/CascadiaCode-Italic.ufo" stylemapfamilyname="Cascadia Code" stylemapstylename="italic">
<location>
<dimension name="Weight" xvalue="500"/>
<dimension name="Italic" xvalue="1"/>
</location>
<kerning/>
<info/>
Expand All @@ -169,7 +161,6 @@
<instance name="Cascadia Code SemiBold Italic" familyname="Cascadia Code" stylename="SemiBold Italic" filename="instance_ufos/CascadiaCode-SemiBoldItalic.ufo" stylemapfamilyname="Cascadia Code SemiBold" stylemapstylename="italic">
<location>
<dimension name="Weight" xvalue="650"/>
<dimension name="Italic" xvalue="1"/>
</location>
<kerning/>
<info/>
Expand All @@ -196,7 +187,6 @@
<instance name="Cascadia Code Bold Italic" familyname="Cascadia Code" stylename="Bold Italic" filename="instance_ufos/CascadiaCode-BoldItalic.ufo" stylemapfamilyname="Cascadia Code" stylemapstylename="bold italic">
<location>
<dimension name="Weight" xvalue="750"/>
<dimension name="Italic" xvalue="1"/>
</location>
<kerning/>
<info/>
Expand Down
Loading