Checks in WIP, Italic bit in VAR fonts seems to be properly set now.

This commit is contained in:
Paul D. Hunt 2020-12-16 13:28:44 +11:00
parent 85ddd08f0c
commit b5a52bd029
20 changed files with 138 additions and 135 deletions

View File

@ -1,2 +1,2 @@
# Romans # Romans
FontRevision 1.054; FontRevision 1.056;

View File

@ -2,25 +2,20 @@
<designspace format="3"> <designspace format="3">
<axes> <axes>
<axis default="200.0" maximum="900.0" minimum="200.0" name="weight" tag="wght"> <axis default="200.0" maximum="900.0" minimum="200.0" name="weight" tag="wght">
<map input="200" output="0"/> <map input="200" output="0"/> <!-- ExtraLight -->
<!-- ExtraLight --> <map input="300" output="100"/> <!-- Light -->
<map input="300" output="100"/> <map input="400" output="368"/> <!-- Regular -->
<!-- Light --> <map input="500" output="486"/> <!-- Medium -->
<map input="400" output="368"/> <map input="600" output="600"/> <!-- Semibold -->
<!-- Regular --> <map input="700" output="824"/> <!-- Bold -->
<map input="500" output="486"/> <map input="900" output="1000"/> <!-- Black -->
<!-- Medium -->
<map input="600" output="600"/>
<!-- Semibold -->
<map input="700" output="824"/>
<!-- Bold -->
<map input="900" output="1000"/>
<!-- Black -->
</axis> </axis>
</axes> </axes>
<sources> <sources>
<source filename="master_0/SourceCode_ExtraLight-Italic.ufo" name="master_0"> <source filename="master_0/SourceCode_ExtraLight-Italic.ufo" name="master_0">
<lib copy="1"/> <lib copy="1"/>
<groups copy="1"/>
<info copy="1"/>
<location> <location>
<dimension name="weight" xvalue="0"/> <dimension name="weight" xvalue="0"/>
</location> </location>
@ -34,7 +29,6 @@
<glyph mute="1" name="esh"/> <glyph mute="1" name="esh"/>
<glyph mute="1" name="l"/> <glyph mute="1" name="l"/>
<glyph mute="1" name="t"/> <glyph mute="1" name="t"/>
<info copy="1"/>
<location> <location>
<dimension name="weight" xvalue="368"/> <dimension name="weight" xvalue="368"/>
</location> </location>

View File

@ -1,2 +1,2 @@
# Italic variable # Italic variable
FontRevision 1.014; FontRevision 1.016;

View File

@ -17,6 +17,8 @@
</array> </array>
<key>italicAngle</key> <key>italicAngle</key>
<integer>-11</integer> <integer>-11</integer>
<key>openTypeOS2VendorID</key>
<string>ADBO</string>
<key>postscriptBlueFuzz</key> <key>postscriptBlueFuzz</key>
<integer>0</integer> <integer>0</integer>
<key>postscriptBlueScale</key> <key>postscriptBlueScale</key>
@ -86,7 +88,7 @@
<key>versionMajor</key> <key>versionMajor</key>
<integer>1</integer> <integer>1</integer>
<key>versionMinor</key> <key>versionMinor</key>
<integer>0</integer> <integer>16</integer>
<key>xHeight</key> <key>xHeight</key>
<integer>478</integer> <integer>478</integer>
</dict> </dict>

View File

@ -17,6 +17,8 @@
</array> </array>
<key>italicAngle</key> <key>italicAngle</key>
<integer>-11</integer> <integer>-11</integer>
<key>openTypeOS2VendorID</key>
<string>ADBO</string>
<key>postscriptBlueFuzz</key> <key>postscriptBlueFuzz</key>
<integer>0</integer> <integer>0</integer>
<key>postscriptBlueScale</key> <key>postscriptBlueScale</key>
@ -86,7 +88,7 @@
<key>versionMajor</key> <key>versionMajor</key>
<integer>1</integer> <integer>1</integer>
<key>versionMinor</key> <key>versionMinor</key>
<integer>0</integer> <integer>16</integer>
<key>xHeight</key> <key>xHeight</key>
<integer>486</integer> <integer>486</integer>
</dict> </dict>

View File

@ -17,6 +17,8 @@
</array> </array>
<key>italicAngle</key> <key>italicAngle</key>
<integer>-11</integer> <integer>-11</integer>
<key>openTypeOS2VendorID</key>
<string>ADBO</string>
<key>postscriptBlueFuzz</key> <key>postscriptBlueFuzz</key>
<integer>0</integer> <integer>0</integer>
<key>postscriptBlueScale</key> <key>postscriptBlueScale</key>
@ -86,7 +88,7 @@
<key>versionMajor</key> <key>versionMajor</key>
<integer>1</integer> <integer>1</integer>
<key>versionMinor</key> <key>versionMinor</key>
<integer>0</integer> <integer>16</integer>
<key>xHeight</key> <key>xHeight</key>
<integer>500</integer> <integer>500</integer>
</dict> </dict>

View File

@ -1,4 +1,4 @@
Copyright 2010-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. Copyright 2010-2020 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
This Font Software is licensed under the SIL Open Font License, Version 1.1. This Font Software is licensed under the SIL Open Font License, Version 1.1.

View File

@ -1,2 +1,2 @@
# Romans # Romans
FontRevision 2.034; FontRevision 2.036;

View File

@ -1,89 +1,89 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<designspace format="3"> <designspace format="3">
<axes> <axes>
<axis default="0.0" maximum="1000.0" minimum="0.0" name="weight" tag="wght"/> <axis default="0.0" maximum="1000.0" minimum="0.0" name="weight" tag="wght" />
</axes> </axes>
<sources> <sources>
<source filename="master_0/SourceCode_ExtraLight.ufo" name="master_0"> <source filename="master_0/SourceCode_ExtraLight.ufo" name="master_0">
<lib copy="1"/> <lib copy="1" />
<groups copy="1"/> <groups copy="1" />
<info copy="1"/> <info copy="1" />
<location> <location>
<dimension name="weight" xvalue="0"/> <dimension name="weight" xvalue="0" />
</location> </location>
</source> </source>
<source filename="master_1/SourceCode_Regular.ufo" name="master_1"> <source filename="master_1/SourceCode_Regular.ufo" name="master_1">
<glyph mute="1" name="H"/> <glyph mute="1" name="H" />
<glyph mute="1" name="O"/> <glyph mute="1" name="O" />
<glyph mute="1" name="T"/> <glyph mute="1" name="T" />
<glyph mute="1" name="Y"/> <glyph mute="1" name="Y" />
<glyph mute="1" name="Ustraight"/> <glyph mute="1" name="Ustraight" />
<glyph mute="1" name="dotlessi.a"/> <glyph mute="1" name="dotlessi.a" />
<glyph mute="1" name="dotlessi"/> <glyph mute="1" name="dotlessi" />
<glyph mute="1" name="dotlessj"/> <glyph mute="1" name="dotlessj" />
<glyph mute="1" name="esh"/> <glyph mute="1" name="esh" />
<glyph mute="1" name="l"/> <glyph mute="1" name="l" />
<glyph mute="1" name="t"/> <glyph mute="1" name="t" />
<glyph mute="1" name="ustraight"/> <glyph mute="1" name="ustraight" />
<location> <location>
<dimension name="weight" xvalue="368"/> <dimension name="weight" xvalue="368" />
</location> </location>
</source> </source>
<source filename="master_2/SourceCode_Black.ufo" name="master_2"> <source filename="master_2/SourceCode_Black.ufo" name="master_2">
<location> <location>
<dimension name="weight" xvalue="1000"/> <dimension name="weight" xvalue="1000" />
</location> </location>
</source> </source>
</sources> </sources>
<instances> <instances>
<instance familyname="Source Code Pro" filename="../Instances/ExtraLight/font.ufo" postscriptfontname="SourceCodePro-ExtraLight" stylename="ExtraLight"> <instance familyname="Source Code Pro" filename="../Instances/ExtraLight/font.ufo" postscriptfontname="SourceCodePro-ExtraLight" stylename="ExtraLight">
<location> <location>
<dimension name="weight" xvalue="0"/> <dimension name="weight" xvalue="0" />
</location> </location>
<kerning/> <kerning />
<info/> <info />
</instance> </instance>
<instance familyname="Source Code Pro" filename="../Instances/Light/font.ufo" postscriptfontname="SourceCodePro-Light" stylename="Light"> <instance familyname="Source Code Pro" filename="../Instances/Light/font.ufo" postscriptfontname="SourceCodePro-Light" stylename="Light">
<location> <location>
<dimension name="weight" xvalue="100"/> <dimension name="weight" xvalue="100" />
</location> </location>
<kerning/> <kerning />
<info/> <info />
</instance> </instance>
<instance familyname="Source Code Pro" filename="../Instances/Regular/font.ufo" postscriptfontname="SourceCodePro-Regular" stylename="Regular"> <instance familyname="Source Code Pro" filename="../Instances/Regular/font.ufo" postscriptfontname="SourceCodePro-Regular" stylename="Regular">
<location> <location>
<dimension name="weight" xvalue="368"/> <dimension name="weight" xvalue="368" />
</location> </location>
<kerning/> <kerning />
<info/> <info />
</instance> </instance>
<instance familyname="Source Code Pro" filename="../Instances/Medium/font.ufo" postscriptfontname="SourceCodePro-Medium" stylename="Medium"> <instance familyname="Source Code Pro" filename="../Instances/Medium/font.ufo" postscriptfontname="SourceCodePro-Medium" stylename="Medium">
<location> <location>
<dimension name="weight" xvalue="486"/> <dimension name="weight" xvalue="486" />
</location> </location>
<kerning/> <kerning />
<info/> <info />
</instance> </instance>
<instance familyname="Source Code Pro" filename="../Instances/Semibold/font.ufo" postscriptfontname="SourceCodePro-Semibold" stylename="Semibold"> <instance familyname="Source Code Pro" filename="../Instances/Semibold/font.ufo" postscriptfontname="SourceCodePro-Semibold" stylename="Semibold">
<location> <location>
<dimension name="weight" xvalue="600"/> <dimension name="weight" xvalue="600" />
</location> </location>
<kerning/> <kerning />
<info/> <info />
</instance> </instance>
<instance familyname="Source Code Pro" filename="../Instances/Bold/font.ufo" postscriptfontname="SourceCodePro-Bold" stylename="Bold"> <instance familyname="Source Code Pro" filename="../Instances/Bold/font.ufo" postscriptfontname="SourceCodePro-Bold" stylename="Bold">
<location> <location>
<dimension name="weight" xvalue="824"/> <dimension name="weight" xvalue="824" />
</location> </location>
<kerning/> <kerning />
<info/> <info />
</instance> </instance>
<instance familyname="Source Code Pro" filename="../Instances/Black/font.ufo" postscriptfontname="SourceCodePro-Black" stylename="Black"> <instance familyname="Source Code Pro" filename="../Instances/Black/font.ufo" postscriptfontname="SourceCodePro-Black" stylename="Black">
<location> <location>
<dimension name="weight" xvalue="1000"/> <dimension name="weight" xvalue="1000" />
</location> </location>
<kerning/> <kerning />
<info/> <info />
</instance> </instance>
</instances> </instances>
</designspace> </designspace>

View File

@ -2,25 +2,20 @@
<designspace format="3"> <designspace format="3">
<axes> <axes>
<axis default="200.0" maximum="900.0" minimum="200.0" name="weight" tag="wght"> <axis default="200.0" maximum="900.0" minimum="200.0" name="weight" tag="wght">
<map input="200" output="0"/> <map input="200" output="0"/> <!-- ExtraLight -->
<!-- ExtraLight --> <map input="300" output="100"/> <!-- Light -->
<map input="300" output="100"/> <map input="400" output="368"/> <!-- Regular -->
<!-- Light --> <map input="500" output="486"/> <!-- Medium -->
<map input="400" output="368"/> <map input="600" output="600"/> <!-- Semibold -->
<!-- Regular --> <map input="700" output="824"/> <!-- Bold -->
<map input="500" output="486"/> <map input="900" output="1000"/> <!-- Black -->
<!-- Medium -->
<map input="600" output="600"/>
<!-- Semibold -->
<map input="700" output="824"/>
<!-- Bold -->
<map input="900" output="1000"/>
<!-- Black -->
</axis> </axis>
</axes> </axes>
<sources> <sources>
<source filename="master_0/SourceCode_ExtraLight.ufo" name="master_0"> <source filename="master_0/SourceCode_ExtraLight.ufo" name="master_0">
<lib copy="1"/> <lib copy="1"/>
<groups copy="1"/>
<info copy="1"/>
<location> <location>
<dimension name="weight" xvalue="0"/> <dimension name="weight" xvalue="0"/>
</location> </location>
@ -39,6 +34,7 @@
<glyph mute="1" name="l"/> <glyph mute="1" name="l"/>
<glyph mute="1" name="t"/> <glyph mute="1" name="t"/>
<glyph mute="1" name="ustraight"/> <glyph mute="1" name="ustraight"/>
<kerning mute="1"/>
<location> <location>
<dimension name="weight" xvalue="368"/> <dimension name="weight" xvalue="368"/>
</location> </location>

View File

@ -1,2 +1,2 @@
# Roman variable # Roman variable
FontRevision 1.014; FontRevision 1.016;

View File

@ -15,6 +15,8 @@
<key>guidelines</key> <key>guidelines</key>
<array> <array>
</array> </array>
<key>openTypeOS2VendorID</key>
<string>ADBO</string>
<key>postscriptBlueFuzz</key> <key>postscriptBlueFuzz</key>
<integer>0</integer> <integer>0</integer>
<key>postscriptBlueScale</key> <key>postscriptBlueScale</key>
@ -82,9 +84,9 @@
<key>unitsPerEm</key> <key>unitsPerEm</key>
<integer>1000</integer> <integer>1000</integer>
<key>versionMajor</key> <key>versionMajor</key>
<integer>1</integer> <integer>2</integer>
<key>versionMinor</key> <key>versionMinor</key>
<integer>0</integer> <integer>36</integer>
<key>xHeight</key> <key>xHeight</key>
<integer>478</integer> <integer>478</integer>
</dict> </dict>

View File

@ -15,6 +15,8 @@
<key>guidelines</key> <key>guidelines</key>
<array> <array>
</array> </array>
<key>openTypeOS2VendorID</key>
<string>ADBO</string>
<key>postscriptBlueFuzz</key> <key>postscriptBlueFuzz</key>
<integer>0</integer> <integer>0</integer>
<key>postscriptBlueScale</key> <key>postscriptBlueScale</key>
@ -82,9 +84,9 @@
<key>unitsPerEm</key> <key>unitsPerEm</key>
<integer>1000</integer> <integer>1000</integer>
<key>versionMajor</key> <key>versionMajor</key>
<integer>1</integer> <integer>2</integer>
<key>versionMinor</key> <key>versionMinor</key>
<integer>0</integer> <integer>36</integer>
<key>xHeight</key> <key>xHeight</key>
<integer>486</integer> <integer>486</integer>
</dict> </dict>

View File

@ -15,6 +15,8 @@
<key>guidelines</key> <key>guidelines</key>
<array> <array>
</array> </array>
<key>openTypeOS2VendorID</key>
<string>ADBO</string>
<key>postscriptBlueFuzz</key> <key>postscriptBlueFuzz</key>
<integer>0</integer> <integer>0</integer>
<key>postscriptBlueScale</key> <key>postscriptBlueScale</key>
@ -82,9 +84,9 @@
<key>unitsPerEm</key> <key>unitsPerEm</key>
<integer>1000</integer> <integer>1000</integer>
<key>versionMajor</key> <key>versionMajor</key>
<integer>1</integer> <integer>2</integer>
<key>versionMinor</key> <key>versionMinor</key>
<integer>0</integer> <integer>36</integer>
<key>xHeight</key> <key>xHeight</key>
<integer>500</integer> <integer>500</integer>
</dict> </dict>

View File

@ -10,7 +10,6 @@ for /f %%a in ('where makeotf') do set MAKEOTF_PATH=%%a
if "%MAKEOTF_PATH%" == "" goto error_makeotf_not_found if "%MAKEOTF_PATH%" == "" goto error_makeotf_not_found
call :GetDirectoryName PYTHON_PATH "%MAKEOTF_PATH%" call :GetDirectoryName PYTHON_PATH "%MAKEOTF_PATH%"
set PYTHON_PATH=%PYTHON_PATH%Python\AFDKOPython27\python.exe
set TARGET_PATH=%~dp0\target\ set TARGET_PATH=%~dp0\target\
set TARGET_OTF_PATH=%TARGET_PATH%OTF\ set TARGET_OTF_PATH=%TARGET_PATH%OTF\
@ -43,10 +42,8 @@ goto :eof
:: %1 - Roman/Italic :: %1 - Roman/Italic
:: %2 - Weight :: %2 - Weight
:build_font :build_font
call makeotf -f "%~dp0\%1\Instances\%2\font.ufo" -r -ci "%~dp0\uvs.txt" -o "%TARGET_OTF_PATH%\%FAMILY%-%2.otf" call makeotf -f "%~dp0\%1\Instances\%2\font.ufo" -r -o "%TARGET_OTF_PATH%\%FAMILY%-%2.otf"
call makeotf -f "%~dp0\%1\Instances\%2\font.ttf" -r -ci "%~dp0\uvs.txt" -o "%TARGET_TTF_PATH%\%FAMILY%-%2.ttf" -ff "%~dp0\%1\Instances\%2\font.ufo\features.fea" call makeotf -f "%~dp0\%1\Instances\%2\font.ttf" -r -o "%TARGET_TTF_PATH%\%FAMILY%-%2.ttf" -ff "%~dp0\%1\Instances\%2\font.ufo\features.fea"
:: "%PYTHON_PATH%" "%~dp0\addSVGtable.py" "%TARGET_OTF_PATH%\%FAMILY%-%2.otf" "%~dp0\svg"
:: "%PYTHON_PATH%" "%~dp0\addSVGtable.py" "%TARGET_TTF_PATH%\%FAMILY%-%2.ttf" "%~dp0\svg"
goto :eof goto :eof
:error_makeotf_not_found :error_makeotf_not_found

View File

@ -1,4 +1,4 @@
nameid 0 "\00a9 2010 - 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name \2018Source\2019."; nameid 0 "\00a9 2010 - 2020 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name \2018Source\2019.";
nameid 7 "Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries."; nameid 7 "Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.";
nameid 8 "Adobe Systems Incorporated"; nameid 8 "Adobe Systems Incorporated";
nameid 9 "Paul D. Hunt, Teo Tuominen"; nameid 9 "Paul D. Hunt, Teo Tuominen";

2
familynameIDsVar.fea Normal file
View File

@ -0,0 +1,2 @@
nameid 256 "Roman";
nameid 257 "Italic";

View File

@ -3,6 +3,8 @@ include (../../../familyTables.fea);
table name { table name {
include (../nameIDs.fea); include (../nameIDs.fea);
include (../../../familynameIDs.fea); include (../../../familynameIDs.fea);
include (../../../familynameIDsVar.fea);
} name; } name;
include (../../familyGSUB.fea); include (../../familyGSUB.fea);
include (../STAT.fea);