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.

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

Fix smcp / liga ordering issue #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified fonts/otf/Besley-Black.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-BlackItalic.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-Bold.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-BoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-ExtraBold.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-ExtraBoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-Italic.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-Medium.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-MediumItalic.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-Regular.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-SemiBold.otf
Binary file not shown.
Binary file modified fonts/otf/Besley-SemiBoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-Black.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-BlackItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-Bold.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-BoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-ExtraBold.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-ExtraBoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-Italic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-Medium.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-MediumItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-Regular.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-SemiBold.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyCondensed-SemiBoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-Black.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-BlackItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-Bold.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-BoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-ExtraBold.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-ExtraBoldItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-Italic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-Medium.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-MediumItalic.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-Regular.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-SemiBold.otf
Binary file not shown.
Binary file modified fonts/otf/BesleyNarrow-SemiBoldItalic.otf
Binary file not shown.
Binary file removed fonts/ttf/Besley-Black.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-BlackItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-Bold.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-BoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-ExtraBold.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-ExtraBoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-Italic.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-Medium.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-MediumItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-Regular.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-SemiBold.ttf
Binary file not shown.
Binary file removed fonts/ttf/Besley-SemiBoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-Black.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-BlackItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-Bold.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-BoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-ExtraBold.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-ExtraBoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-Italic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-Medium.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-MediumItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-Regular.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-SemiBold.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyCondensed-SemiBoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-Black.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-BlackItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-Bold.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-BoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-ExtraBold.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-ExtraBoldItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-Italic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-Medium.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-MediumItalic.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-Regular.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-SemiBold.ttf
Binary file not shown.
Binary file removed fonts/ttf/BesleyNarrow-SemiBoldItalic.ttf
Binary file not shown.
Binary file modified fonts/variable/Besley-Italic[wdth,wght].ttf
Binary file not shown.
Binary file modified fonts/variable/Besley[wdth,wght].ttf
Binary file not shown.
Binary file modified fonts/webfonts/Besley-Black.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-BlackItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-Bold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-BoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-ExtraBold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-ExtraBoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-Italic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-Italic[wdth,wght].woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-Medium.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-MediumItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-Regular.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-SemiBold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley-SemiBoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-Black.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-BlackItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-Bold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-BoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-ExtraBold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-ExtraBoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-Italic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-Medium.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-MediumItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-Regular.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-SemiBold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyCondensed-SemiBoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-Black.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-BlackItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-Bold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-BoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-ExtraBold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-ExtraBoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-Italic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-Medium.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-MediumItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-Regular.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-SemiBold.woff2
Binary file not shown.
Binary file modified fonts/webfonts/BesleyNarrow-SemiBoldItalic.woff2
Binary file not shown.
Binary file modified fonts/webfonts/Besley[wdth,wght].woff2
Binary file not shown.
26 changes: 16 additions & 10 deletions sources/build-webfonts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
46 changes: 23 additions & 23 deletions sources/misc/featuresItalic.fea
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 {

Expand Down Expand Up @@ -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
Expand Down