Fix smcp / liga ordering issue

Closes #30.
indestructible-type · Jan 10, 2023 · 9be6eb6 · 9be6eb6
1 parent 99d5b97
commit 9be6eb6
Show file tree

Hide file tree

Showing 114 changed files with 39 additions and 33 deletions.
diff --git a/fonts/otf/Besley-Black.otf b/fonts/otf/Besley-Black.otf
diff --git a/fonts/otf/Besley-BlackItalic.otf b/fonts/otf/Besley-BlackItalic.otf
diff --git a/fonts/otf/Besley-Bold.otf b/fonts/otf/Besley-Bold.otf
diff --git a/fonts/otf/Besley-BoldItalic.otf b/fonts/otf/Besley-BoldItalic.otf
diff --git a/fonts/otf/Besley-ExtraBold.otf b/fonts/otf/Besley-ExtraBold.otf
diff --git a/fonts/otf/Besley-ExtraBoldItalic.otf b/fonts/otf/Besley-ExtraBoldItalic.otf
diff --git a/fonts/otf/Besley-Italic.otf b/fonts/otf/Besley-Italic.otf
diff --git a/fonts/otf/Besley-Medium.otf b/fonts/otf/Besley-Medium.otf
diff --git a/fonts/otf/Besley-MediumItalic.otf b/fonts/otf/Besley-MediumItalic.otf
diff --git a/fonts/otf/Besley-Regular.otf b/fonts/otf/Besley-Regular.otf
diff --git a/fonts/otf/Besley-SemiBold.otf b/fonts/otf/Besley-SemiBold.otf
diff --git a/fonts/otf/Besley-SemiBoldItalic.otf b/fonts/otf/Besley-SemiBoldItalic.otf
diff --git a/fonts/otf/BesleyCondensed-Black.otf b/fonts/otf/BesleyCondensed-Black.otf
diff --git a/fonts/otf/BesleyCondensed-BlackItalic.otf b/fonts/otf/BesleyCondensed-BlackItalic.otf
diff --git a/fonts/otf/BesleyCondensed-Bold.otf b/fonts/otf/BesleyCondensed-Bold.otf
diff --git a/fonts/otf/BesleyCondensed-BoldItalic.otf b/fonts/otf/BesleyCondensed-BoldItalic.otf
diff --git a/fonts/otf/BesleyCondensed-ExtraBold.otf b/fonts/otf/BesleyCondensed-ExtraBold.otf
diff --git a/fonts/otf/BesleyCondensed-ExtraBoldItalic.otf b/fonts/otf/BesleyCondensed-ExtraBoldItalic.otf
diff --git a/fonts/otf/BesleyCondensed-Italic.otf b/fonts/otf/BesleyCondensed-Italic.otf
diff --git a/fonts/otf/BesleyCondensed-Medium.otf b/fonts/otf/BesleyCondensed-Medium.otf
diff --git a/fonts/otf/BesleyCondensed-MediumItalic.otf b/fonts/otf/BesleyCondensed-MediumItalic.otf
diff --git a/fonts/otf/BesleyCondensed-Regular.otf b/fonts/otf/BesleyCondensed-Regular.otf
diff --git a/fonts/otf/BesleyCondensed-SemiBold.otf b/fonts/otf/BesleyCondensed-SemiBold.otf
diff --git a/fonts/otf/BesleyCondensed-SemiBoldItalic.otf b/fonts/otf/BesleyCondensed-SemiBoldItalic.otf
diff --git a/fonts/otf/BesleyNarrow-Black.otf b/fonts/otf/BesleyNarrow-Black.otf
diff --git a/fonts/otf/BesleyNarrow-BlackItalic.otf b/fonts/otf/BesleyNarrow-BlackItalic.otf
diff --git a/fonts/otf/BesleyNarrow-Bold.otf b/fonts/otf/BesleyNarrow-Bold.otf
diff --git a/fonts/otf/BesleyNarrow-BoldItalic.otf b/fonts/otf/BesleyNarrow-BoldItalic.otf
diff --git a/fonts/otf/BesleyNarrow-ExtraBold.otf b/fonts/otf/BesleyNarrow-ExtraBold.otf
diff --git a/fonts/otf/BesleyNarrow-ExtraBoldItalic.otf b/fonts/otf/BesleyNarrow-ExtraBoldItalic.otf
diff --git a/fonts/otf/BesleyNarrow-Italic.otf b/fonts/otf/BesleyNarrow-Italic.otf
diff --git a/fonts/otf/BesleyNarrow-Medium.otf b/fonts/otf/BesleyNarrow-Medium.otf
diff --git a/fonts/otf/BesleyNarrow-MediumItalic.otf b/fonts/otf/BesleyNarrow-MediumItalic.otf
diff --git a/fonts/otf/BesleyNarrow-Regular.otf b/fonts/otf/BesleyNarrow-Regular.otf
diff --git a/fonts/otf/BesleyNarrow-SemiBold.otf b/fonts/otf/BesleyNarrow-SemiBold.otf
diff --git a/fonts/otf/BesleyNarrow-SemiBoldItalic.otf b/fonts/otf/BesleyNarrow-SemiBoldItalic.otf
diff --git a/fonts/ttf/Besley-Black.ttf b/fonts/ttf/Besley-Black.ttf
diff --git a/fonts/ttf/Besley-BlackItalic.ttf b/fonts/ttf/Besley-BlackItalic.ttf
diff --git a/fonts/ttf/Besley-Bold.ttf b/fonts/ttf/Besley-Bold.ttf
diff --git a/fonts/ttf/Besley-BoldItalic.ttf b/fonts/ttf/Besley-BoldItalic.ttf
diff --git a/fonts/ttf/Besley-ExtraBold.ttf b/fonts/ttf/Besley-ExtraBold.ttf
diff --git a/fonts/ttf/Besley-ExtraBoldItalic.ttf b/fonts/ttf/Besley-ExtraBoldItalic.ttf
diff --git a/fonts/ttf/Besley-Italic.ttf b/fonts/ttf/Besley-Italic.ttf
diff --git a/fonts/ttf/Besley-Medium.ttf b/fonts/ttf/Besley-Medium.ttf
diff --git a/fonts/ttf/Besley-MediumItalic.ttf b/fonts/ttf/Besley-MediumItalic.ttf
diff --git a/fonts/ttf/Besley-Regular.ttf b/fonts/ttf/Besley-Regular.ttf
diff --git a/fonts/ttf/Besley-SemiBold.ttf b/fonts/ttf/Besley-SemiBold.ttf
diff --git a/fonts/ttf/Besley-SemiBoldItalic.ttf b/fonts/ttf/Besley-SemiBoldItalic.ttf
diff --git a/fonts/ttf/BesleyCondensed-Black.ttf b/fonts/ttf/BesleyCondensed-Black.ttf
diff --git a/fonts/ttf/BesleyCondensed-BlackItalic.ttf b/fonts/ttf/BesleyCondensed-BlackItalic.ttf
diff --git a/fonts/ttf/BesleyCondensed-Bold.ttf b/fonts/ttf/BesleyCondensed-Bold.ttf
diff --git a/fonts/ttf/BesleyCondensed-BoldItalic.ttf b/fonts/ttf/BesleyCondensed-BoldItalic.ttf
diff --git a/fonts/ttf/BesleyCondensed-ExtraBold.ttf b/fonts/ttf/BesleyCondensed-ExtraBold.ttf
diff --git a/fonts/ttf/BesleyCondensed-ExtraBoldItalic.ttf b/fonts/ttf/BesleyCondensed-ExtraBoldItalic.ttf
diff --git a/fonts/ttf/BesleyCondensed-Italic.ttf b/fonts/ttf/BesleyCondensed-Italic.ttf
diff --git a/fonts/ttf/BesleyCondensed-Medium.ttf b/fonts/ttf/BesleyCondensed-Medium.ttf
diff --git a/fonts/ttf/BesleyCondensed-MediumItalic.ttf b/fonts/ttf/BesleyCondensed-MediumItalic.ttf
diff --git a/fonts/ttf/BesleyCondensed-Regular.ttf b/fonts/ttf/BesleyCondensed-Regular.ttf
diff --git a/fonts/ttf/BesleyCondensed-SemiBold.ttf b/fonts/ttf/BesleyCondensed-SemiBold.ttf
diff --git a/fonts/ttf/BesleyCondensed-SemiBoldItalic.ttf b/fonts/ttf/BesleyCondensed-SemiBoldItalic.ttf
diff --git a/fonts/ttf/BesleyNarrow-Black.ttf b/fonts/ttf/BesleyNarrow-Black.ttf
diff --git a/fonts/ttf/BesleyNarrow-BlackItalic.ttf b/fonts/ttf/BesleyNarrow-BlackItalic.ttf
diff --git a/fonts/ttf/BesleyNarrow-Bold.ttf b/fonts/ttf/BesleyNarrow-Bold.ttf
diff --git a/fonts/ttf/BesleyNarrow-BoldItalic.ttf b/fonts/ttf/BesleyNarrow-BoldItalic.ttf
diff --git a/fonts/ttf/BesleyNarrow-ExtraBold.ttf b/fonts/ttf/BesleyNarrow-ExtraBold.ttf
diff --git a/fonts/ttf/BesleyNarrow-ExtraBoldItalic.ttf b/fonts/ttf/BesleyNarrow-ExtraBoldItalic.ttf
diff --git a/fonts/ttf/BesleyNarrow-Italic.ttf b/fonts/ttf/BesleyNarrow-Italic.ttf
diff --git a/fonts/ttf/BesleyNarrow-Medium.ttf b/fonts/ttf/BesleyNarrow-Medium.ttf
diff --git a/fonts/ttf/BesleyNarrow-MediumItalic.ttf b/fonts/ttf/BesleyNarrow-MediumItalic.ttf
diff --git a/fonts/ttf/BesleyNarrow-Regular.ttf b/fonts/ttf/BesleyNarrow-Regular.ttf
diff --git a/fonts/ttf/BesleyNarrow-SemiBold.ttf b/fonts/ttf/BesleyNarrow-SemiBold.ttf
diff --git a/fonts/ttf/BesleyNarrow-SemiBoldItalic.ttf b/fonts/ttf/BesleyNarrow-SemiBoldItalic.ttf
diff --git a/fonts/variable/Besley-Italic[wdth,wght].ttf b/fonts/variable/Besley-Italic[wdth,wght].ttf
diff --git a/fonts/variable/Besley[wdth,wght].ttf b/fonts/variable/Besley[wdth,wght].ttf
diff --git a/fonts/webfonts/Besley-Black.woff2 b/fonts/webfonts/Besley-Black.woff2
diff --git a/fonts/webfonts/Besley-BlackItalic.woff2 b/fonts/webfonts/Besley-BlackItalic.woff2
diff --git a/fonts/webfonts/Besley-Bold.woff2 b/fonts/webfonts/Besley-Bold.woff2
diff --git a/fonts/webfonts/Besley-BoldItalic.woff2 b/fonts/webfonts/Besley-BoldItalic.woff2
diff --git a/fonts/webfonts/Besley-ExtraBold.woff2 b/fonts/webfonts/Besley-ExtraBold.woff2
diff --git a/fonts/webfonts/Besley-ExtraBoldItalic.woff2 b/fonts/webfonts/Besley-ExtraBoldItalic.woff2
diff --git a/fonts/webfonts/Besley-Italic.woff2 b/fonts/webfonts/Besley-Italic.woff2
diff --git a/fonts/webfonts/Besley-Italic[wdth,wght].woff2 b/fonts/webfonts/Besley-Italic[wdth,wght].woff2
diff --git a/fonts/webfonts/Besley-Medium.woff2 b/fonts/webfonts/Besley-Medium.woff2
diff --git a/fonts/webfonts/Besley-MediumItalic.woff2 b/fonts/webfonts/Besley-MediumItalic.woff2
diff --git a/fonts/webfonts/Besley-Regular.woff2 b/fonts/webfonts/Besley-Regular.woff2
diff --git a/fonts/webfonts/Besley-SemiBold.woff2 b/fonts/webfonts/Besley-SemiBold.woff2
diff --git a/fonts/webfonts/Besley-SemiBoldItalic.woff2 b/fonts/webfonts/Besley-SemiBoldItalic.woff2
diff --git a/fonts/webfonts/BesleyCondensed-Black.woff2 b/fonts/webfonts/BesleyCondensed-Black.woff2
diff --git a/fonts/webfonts/BesleyCondensed-BlackItalic.woff2 b/fonts/webfonts/BesleyCondensed-BlackItalic.woff2
diff --git a/fonts/webfonts/BesleyCondensed-Bold.woff2 b/fonts/webfonts/BesleyCondensed-Bold.woff2
diff --git a/fonts/webfonts/BesleyCondensed-BoldItalic.woff2 b/fonts/webfonts/BesleyCondensed-BoldItalic.woff2
diff --git a/fonts/webfonts/BesleyCondensed-ExtraBold.woff2 b/fonts/webfonts/BesleyCondensed-ExtraBold.woff2
diff --git a/fonts/webfonts/BesleyCondensed-ExtraBoldItalic.woff2 b/fonts/webfonts/BesleyCondensed-ExtraBoldItalic.woff2
diff --git a/fonts/webfonts/BesleyCondensed-Italic.woff2 b/fonts/webfonts/BesleyCondensed-Italic.woff2
diff --git a/fonts/webfonts/BesleyCondensed-Medium.woff2 b/fonts/webfonts/BesleyCondensed-Medium.woff2
diff --git a/fonts/webfonts/BesleyCondensed-MediumItalic.woff2 b/fonts/webfonts/BesleyCondensed-MediumItalic.woff2
diff --git a/fonts/webfonts/BesleyCondensed-Regular.woff2 b/fonts/webfonts/BesleyCondensed-Regular.woff2
diff --git a/fonts/webfonts/BesleyCondensed-SemiBold.woff2 b/fonts/webfonts/BesleyCondensed-SemiBold.woff2
diff --git a/fonts/webfonts/BesleyCondensed-SemiBoldItalic.woff2 b/fonts/webfonts/BesleyCondensed-SemiBoldItalic.woff2
diff --git a/fonts/webfonts/BesleyNarrow-Black.woff2 b/fonts/webfonts/BesleyNarrow-Black.woff2
diff --git a/fonts/webfonts/BesleyNarrow-BlackItalic.woff2 b/fonts/webfonts/BesleyNarrow-BlackItalic.woff2
diff --git a/fonts/webfonts/BesleyNarrow-Bold.woff2 b/fonts/webfonts/BesleyNarrow-Bold.woff2
diff --git a/fonts/webfonts/BesleyNarrow-BoldItalic.woff2 b/fonts/webfonts/BesleyNarrow-BoldItalic.woff2
diff --git a/fonts/webfonts/BesleyNarrow-ExtraBold.woff2 b/fonts/webfonts/BesleyNarrow-ExtraBold.woff2
diff --git a/fonts/webfonts/BesleyNarrow-ExtraBoldItalic.woff2 b/fonts/webfonts/BesleyNarrow-ExtraBoldItalic.woff2
diff --git a/fonts/webfonts/BesleyNarrow-Italic.woff2 b/fonts/webfonts/BesleyNarrow-Italic.woff2
diff --git a/fonts/webfonts/BesleyNarrow-Medium.woff2 b/fonts/webfonts/BesleyNarrow-Medium.woff2
diff --git a/fonts/webfonts/BesleyNarrow-MediumItalic.woff2 b/fonts/webfonts/BesleyNarrow-MediumItalic.woff2
diff --git a/fonts/webfonts/BesleyNarrow-Regular.woff2 b/fonts/webfonts/BesleyNarrow-Regular.woff2
diff --git a/fonts/webfonts/BesleyNarrow-SemiBold.woff2 b/fonts/webfonts/BesleyNarrow-SemiBold.woff2
diff --git a/fonts/webfonts/BesleyNarrow-SemiBoldItalic.woff2 b/fonts/webfonts/BesleyNarrow-SemiBoldItalic.woff2
diff --git a/fonts/webfonts/Besley[wdth,wght].woff2 b/fonts/webfonts/Besley[wdth,wght].woff2
diff --git a/sources/build-webfonts.sh b/sources/build-webfonts.sh
@@ -5,14 +5,20 @@ if [[ ! -d ../fonts/webfonts ]]; then
     mkdir ../fonts/webfonts
 fi
 
-for font in ../fonts/ttf/*; do
-    FA=`basename "$font"`
-    FN=${FA::-4}
-    fonttools ttLib.woff2 compress "$font" --output-file "../fonts/webfonts/"$FN".woff2"
-done
+HAS_PARALLEL=$(hash parallel ; echo $?)
+TTFONTS=../fonts/ttf/*
+VARFONTS=../fonts/variable/*
+BUILDFONT='
+    FA="`basename $FONT`"
+    fonttools ttLib.woff2 compress "$FONT" --output-file "../fonts/webfonts/${FA%%.*}.woff2"
+'
 
-for font in ../fonts/variable/*; do
-    FA=`basename "$font"`
-    FN=${FA::-4}
-    fonttools ttLib.woff2 compress "$font" --output-file "../fonts/webfonts/"$FN".woff2"
-done
+if [[ $HAS_PARALLEL -eq 0 ]]; then
+    parallel --bar '
+        FONT={};'"$BUILDFONT" ::: $TTFONTS $VARFONTS
+else
+    >&2 echo 'This script will run slower. Consider installing GNU `parallel`.'
+    for FONT in $TTFONTS $VARFONTS; do
+        eval $BUILDFONT
+    done
+fi
diff --git a/sources/misc/featuresItalic.fea b/sources/misc/featuresItalic.fea
@@ -6,15 +6,6 @@ languagesystem latn dflt;
 # GSUB 
 
 
-lookup ligaStandardLigatureslookup0 {
-  lookupflag 0;
-    sub \f \f  by \uniFB00;
-    sub \f \i  by \uniFB01;
-    sub \f \l  by \uniFB02;
-    sub \f \f \i  by \uniFB03;
-    sub \f \f \l  by \uniFB04;
-} ligaStandardLigatureslookup0;
-
 lookup onumOldstyleFigureslookup1 {
   lookupflag 0;
     sub \zero by \zero.oldstyle ;
@@ -327,20 +318,14 @@ lookup caltContextualAlternateslookup9 {
 	\zacute.sc \zcaron.sc \zdotaccent.sc ] [\hyphen ]'  by [\hyphen.sc ];
 } caltContextualAlternateslookup9;
 
-feature liga {
-
- script DFLT;
-     language dflt ;
-      lookup ligaStandardLigatureslookup0;
-
- script grek;
-     language dflt ;
-      lookup ligaStandardLigatureslookup0;
-
- script latn;
-     language dflt ;
-      lookup ligaStandardLigatureslookup0;
-} liga;
+lookup ligaStandardLigatureslookup0 {
+  lookupflag 0;
+    sub \f \f  by \uniFB00;
+    sub \f \i  by \uniFB01;
+    sub \f \l  by \uniFB02;
+    sub \f \f \i  by \uniFB03;
+    sub \f \f \l  by \uniFB04;
+} ligaStandardLigatureslookup0;
 
 feature onum {
 
@@ -418,6 +403,21 @@ feature c2sc {
      language dflt ;
       lookup c2scCapitalstoSmallCapitalsinLatinlookup1;
 } c2sc;
+
+feature liga {
+
+ script DFLT;
+     language dflt ;
+      lookup ligaStandardLigatureslookup0;
+
+ script grek;
+     language dflt ;
+      lookup ligaStandardLigatureslookup0;
+
+ script latn;
+     language dflt ;
+      lookup ligaStandardLigatureslookup0;
+} liga;
 #Mark attachment classes (defined in GDEF, used in lookupflags)
 
 @GDEF_Simple = [\ampersand \period \zero \one \two \three \four \five \six \seven