From b5a52bd029765cda28aceddb12ae1f4f228e3fc8 Mon Sep 17 00:00:00 2001 From: "Paul D. Hunt" Date: Wed, 16 Dec 2020 13:28:44 +1100 Subject: [PATCH] Checks in WIP, Italic bit in VAR fonts seems to be properly set now. --- Italic/Instances/familyVersion.fea | 2 +- .../SourceCodeVariable-Italic.designspace | 24 +-- Italic/Masters/familyVersion.fea | 2 +- .../fontinfo.plist | 4 +- .../Masters/{master_1 => master_0}/fontinfo | 0 .../fontinfo.plist | 4 +- .../fontinfo.plist | 4 +- LICENSE.md | 2 +- Roman/Instances/familyVersion.fea | 2 +- Roman/Masters/SourceCodePro.designspace | 172 +++++++++--------- .../SourceCodeVariable-Roman.designspace | 24 +-- Roman/Masters/familyVersion.fea | 2 +- .../SourceCode_ExtraLight.ufo/fontinfo.plist | 6 +- Roman/Masters/{master_1 => master_0}/fontinfo | 0 .../SourceCode_Regular.ufo/fontinfo.plist | 6 +- .../SourceCode_Black.ufo/fontinfo.plist | 6 +- build.cmd | 7 +- familynameIDs.fea | 2 +- familynameIDsVar.fea | 2 + featuresVar.fea | 2 + 20 files changed, 138 insertions(+), 135 deletions(-) rename Italic/Masters/{master_1 => master_0}/fontinfo (100%) rename Roman/Masters/{master_1 => master_0}/fontinfo (100%) create mode 100644 familynameIDsVar.fea diff --git a/Italic/Instances/familyVersion.fea b/Italic/Instances/familyVersion.fea index 3d7caf673f..8718c87cd7 100644 --- a/Italic/Instances/familyVersion.fea +++ b/Italic/Instances/familyVersion.fea @@ -1,2 +1,2 @@ # Romans -FontRevision 1.054; +FontRevision 1.056; diff --git a/Italic/Masters/SourceCodeVariable-Italic.designspace b/Italic/Masters/SourceCodeVariable-Italic.designspace index b85d404886..f309b437d7 100644 --- a/Italic/Masters/SourceCodeVariable-Italic.designspace +++ b/Italic/Masters/SourceCodeVariable-Italic.designspace @@ -2,25 +2,20 @@ - - - - - - - - - - - - - - + + + + + + + + + @@ -34,7 +29,6 @@ - diff --git a/Italic/Masters/familyVersion.fea b/Italic/Masters/familyVersion.fea index a73ae3048d..59542a7172 100644 --- a/Italic/Masters/familyVersion.fea +++ b/Italic/Masters/familyVersion.fea @@ -1,2 +1,2 @@ # Italic variable -FontRevision 1.014; +FontRevision 1.016; diff --git a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/fontinfo.plist b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/fontinfo.plist index 25a8482077..f1ebba128e 100644 --- a/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/fontinfo.plist +++ b/Italic/Masters/master_0/SourceCode_ExtraLight-Italic.ufo/fontinfo.plist @@ -17,6 +17,8 @@ italicAngle -11 + openTypeOS2VendorID + ADBO postscriptBlueFuzz 0 postscriptBlueScale @@ -86,7 +88,7 @@ versionMajor 1 versionMinor - 0 + 16 xHeight 478 diff --git a/Italic/Masters/master_1/fontinfo b/Italic/Masters/master_0/fontinfo similarity index 100% rename from Italic/Masters/master_1/fontinfo rename to Italic/Masters/master_0/fontinfo diff --git a/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/fontinfo.plist b/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/fontinfo.plist index 3184fa0a72..d094569c83 100644 --- a/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/fontinfo.plist +++ b/Italic/Masters/master_1/SourceCode_Regular-Italic.ufo/fontinfo.plist @@ -17,6 +17,8 @@ italicAngle -11 + openTypeOS2VendorID + ADBO postscriptBlueFuzz 0 postscriptBlueScale @@ -86,7 +88,7 @@ versionMajor 1 versionMinor - 0 + 16 xHeight 486 diff --git a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/fontinfo.plist b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/fontinfo.plist index 074f7842b9..b0252bd709 100644 --- a/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/fontinfo.plist +++ b/Italic/Masters/master_2/SourceCode_Black-Italic.ufo/fontinfo.plist @@ -17,6 +17,8 @@ italicAngle -11 + openTypeOS2VendorID + ADBO postscriptBlueFuzz 0 postscriptBlueScale @@ -86,7 +88,7 @@ versionMajor 1 versionMinor - 0 + 16 xHeight 500 diff --git a/LICENSE.md b/LICENSE.md index ac85ef372a..db2a8ba7a5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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. diff --git a/Roman/Instances/familyVersion.fea b/Roman/Instances/familyVersion.fea index 91563e6749..306857cf8e 100644 --- a/Roman/Instances/familyVersion.fea +++ b/Roman/Instances/familyVersion.fea @@ -1,2 +1,2 @@ # Romans -FontRevision 2.034; +FontRevision 2.036; diff --git a/Roman/Masters/SourceCodePro.designspace b/Roman/Masters/SourceCodePro.designspace index b58fdd9b11..71302ba7e2 100644 --- a/Roman/Masters/SourceCodePro.designspace +++ b/Roman/Masters/SourceCodePro.designspace @@ -1,89 +1,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Roman/Masters/SourceCodeVariable-Roman.designspace b/Roman/Masters/SourceCodeVariable-Roman.designspace index d968b76a5d..7237f13409 100644 --- a/Roman/Masters/SourceCodeVariable-Roman.designspace +++ b/Roman/Masters/SourceCodeVariable-Roman.designspace @@ -2,25 +2,20 @@ - - - - - - - - - - - - - - + + + + + + + + + @@ -39,6 +34,7 @@ + diff --git a/Roman/Masters/familyVersion.fea b/Roman/Masters/familyVersion.fea index 99f1e636af..1341ffc17e 100644 --- a/Roman/Masters/familyVersion.fea +++ b/Roman/Masters/familyVersion.fea @@ -1,2 +1,2 @@ # Roman variable -FontRevision 1.014; +FontRevision 1.016; diff --git a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/fontinfo.plist b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/fontinfo.plist index d446a8b3b2..7a9bf9c79b 100644 --- a/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/fontinfo.plist +++ b/Roman/Masters/master_0/SourceCode_ExtraLight.ufo/fontinfo.plist @@ -15,6 +15,8 @@ guidelines + openTypeOS2VendorID + ADBO postscriptBlueFuzz 0 postscriptBlueScale @@ -82,9 +84,9 @@ unitsPerEm 1000 versionMajor - 1 + 2 versionMinor - 0 + 36 xHeight 478 diff --git a/Roman/Masters/master_1/fontinfo b/Roman/Masters/master_0/fontinfo similarity index 100% rename from Roman/Masters/master_1/fontinfo rename to Roman/Masters/master_0/fontinfo diff --git a/Roman/Masters/master_1/SourceCode_Regular.ufo/fontinfo.plist b/Roman/Masters/master_1/SourceCode_Regular.ufo/fontinfo.plist index 9f1b022d19..6ca1df5ade 100644 --- a/Roman/Masters/master_1/SourceCode_Regular.ufo/fontinfo.plist +++ b/Roman/Masters/master_1/SourceCode_Regular.ufo/fontinfo.plist @@ -15,6 +15,8 @@ guidelines + openTypeOS2VendorID + ADBO postscriptBlueFuzz 0 postscriptBlueScale @@ -82,9 +84,9 @@ unitsPerEm 1000 versionMajor - 1 + 2 versionMinor - 0 + 36 xHeight 486 diff --git a/Roman/Masters/master_2/SourceCode_Black.ufo/fontinfo.plist b/Roman/Masters/master_2/SourceCode_Black.ufo/fontinfo.plist index 44d24b7dbf..d95855cb82 100644 --- a/Roman/Masters/master_2/SourceCode_Black.ufo/fontinfo.plist +++ b/Roman/Masters/master_2/SourceCode_Black.ufo/fontinfo.plist @@ -15,6 +15,8 @@ guidelines + openTypeOS2VendorID + ADBO postscriptBlueFuzz 0 postscriptBlueScale @@ -82,9 +84,9 @@ unitsPerEm 1000 versionMajor - 1 + 2 versionMinor - 0 + 36 xHeight 500 diff --git a/build.cmd b/build.cmd index 366f3737bd..2fd88373d6 100644 --- a/build.cmd +++ b/build.cmd @@ -10,7 +10,6 @@ for /f %%a in ('where makeotf') do set MAKEOTF_PATH=%%a if "%MAKEOTF_PATH%" == "" goto error_makeotf_not_found call :GetDirectoryName PYTHON_PATH "%MAKEOTF_PATH%" -set PYTHON_PATH=%PYTHON_PATH%Python\AFDKOPython27\python.exe set TARGET_PATH=%~dp0\target\ set TARGET_OTF_PATH=%TARGET_PATH%OTF\ @@ -43,10 +42,8 @@ goto :eof :: %1 - Roman/Italic :: %2 - Weight :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.ttf" -r -ci "%~dp0\uvs.txt" -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" +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 -o "%TARGET_TTF_PATH%\%FAMILY%-%2.ttf" -ff "%~dp0\%1\Instances\%2\font.ufo\features.fea" goto :eof :error_makeotf_not_found diff --git a/familynameIDs.fea b/familynameIDs.fea index 92b33bda2e..4cd8182cc2 100644 --- a/familynameIDs.fea +++ b/familynameIDs.fea @@ -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 8 "Adobe Systems Incorporated"; nameid 9 "Paul D. Hunt, Teo Tuominen"; diff --git a/familynameIDsVar.fea b/familynameIDsVar.fea new file mode 100644 index 0000000000..6218155e2a --- /dev/null +++ b/familynameIDsVar.fea @@ -0,0 +1,2 @@ +nameid 256 "Roman"; +nameid 257 "Italic"; diff --git a/featuresVar.fea b/featuresVar.fea index 05d3428fe6..e7e7a3389b 100644 --- a/featuresVar.fea +++ b/featuresVar.fea @@ -3,6 +3,8 @@ include (../../../familyTables.fea); table name { include (../nameIDs.fea); include (../../../familynameIDs.fea); + include (../../../familynameIDsVar.fea); } name; include (../../familyGSUB.fea); +include (../STAT.fea);