Skip to content

Commit

Permalink
Fold together scripts for identical lookups.
Browse files Browse the repository at this point in the history 
This removes all `script` clauses, since currently these are all identical. Crimson does have different scripts, but I don't currently see any reason to distinguish them.

This is cleanup for #29.
  • Loading branch information
katef committed Jan 4, 2016
1 parent 87f1e9b commit cf8eb4b
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 270 deletions.
20 changes: 4 additions & 16 deletions Source Files/Crimson-Bold.fea
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,24 +371,12 @@ lookup c2scCapitalstoSmallCapitalsinLa {
} c2scCapitalstoSmallCapitalsinLa;

feature smcp {

script DFLT;
language dflt ;
lookup smcpLowercasetoSmallCapitalsinL;

script latn;
language dflt ;
lookup smcpLowercasetoSmallCapitalsinL;
language dflt;
lookup smcpLowercasetoSmallCapitalsinL;
} smcp;

feature c2sc {

script DFLT;
language dflt ;
lookup c2scCapitalstoSmallCapitalsinLa;

script latn;
language dflt ;
lookup c2scCapitalstoSmallCapitalsinLa;
language dflt;
lookup c2scCapitalstoSmallCapitalsinLa;
} c2sc;

58 changes: 11 additions & 47 deletions Source Files/Crimson-BoldItalic.fea
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,64 +52,28 @@ lookup ligaStandardLigatureslookup0 {
} ligaStandardLigatureslookup0;

feature ccmp {

script latn;
language TRK exclude_dflt;
lookup ccmpTurkishi;
language TRK exclude_dflt;
lookup ccmpTurkishi;
} ccmp;

feature onum {
language dflt;
lookup onumOldstyleFigureslookup3;

script DFLT;
language dflt ;
lookup onumOldstyleFigureslookup3;

script grek;
language dflt ;
lookup onumOldstyleFigureslookup3;

script latn;
language dflt ;
lookup onumOldstyleFigureslookup3;
language TRK exclude_dflt;
lookup onumOldstyleFigureslookup3;
language TRK exclude_dflt;
} onum;

feature pnum {
language dflt ;
lookup pnumProportionalNumberslookup12;

script DFLT;
language dflt ;
lookup pnumProportionalNumberslookup12;

script grek;
language dflt ;
lookup pnumProportionalNumberslookup12;

script latn;
language dflt ;
lookup pnumProportionalNumberslookup12;
language TRK exclude_dflt;
lookup pnumProportionalNumberslookup12;
language TRK exclude_dflt;
} pnum;

feature liga {
language dflt ;
lookup ligaStandardLigatureslookup0;

script DFLT;
language dflt ;
lookup ligaStandardLigatureslookup0;

script cyrl;
language dflt ;
lookup ligaStandardLigatureslookup0;

script grek;
language dflt ;
lookup ligaStandardLigatureslookup0;

script latn;
language dflt ;
lookup ligaStandardLigatureslookup0;
language TRK exclude_dflt;
lookup ligaStandardLigatureslookup0;
language TRK exclude_dflt;
} liga;

85 changes: 16 additions & 69 deletions Source Files/Crimson-Italic.fea
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,94 +437,41 @@ lookup c2scCapitalstoSmallCapitalslook {
} c2scCapitalstoSmallCapitalslook;

feature liga {
language dflt;
lookup ligaLigaturesstandardlookups5;

script DFLT;
language dflt ;
lookup ligaLigaturesstandardlookups5;

script cyrl;
language dflt ;
lookup ligaLigaturesstandardlookups5;

script grek;
language dflt ;
lookup ligaLigaturesstandardlookups5;

script latn;
language dflt ;
lookup ligaLigaturesstandardlookups5;
language TRK exclude_dflt;
lookup ligaLigaturesstandardlookups5;
language TRK exclude_dflt;
} liga;

feature ccmp {

script latn;
language TRK exclude_dflt;
lookup ccmpTurkishi;

This comment has been minimized.

Sign in to view

Copy link
@katef

Jan 4, 2016

Author Collaborator

Oops. I'll quietly replace this in the next commit.
language TRK exclude_dflt;
} ccmp;

feature onum {
language dflt;
lookup onumOldstyleFiguresinLatinlooku;

script DFLT;
language dflt ;
lookup onumOldstyleFiguresinLatinlooku;

script latn;
language dflt ;
lookup onumOldstyleFiguresinLatinlooku;
language TRK exclude_dflt;
lookup onumOldstyleFiguresinLatinlooku;
language TRK exclude_dflt;
} onum;

feature pnum {
language dflt;
lookup pnumProportionalNumberslookup12;

script DFLT;
language dflt ;
lookup pnumProportionalNumberslookup12;

script grek;
language dflt ;
lookup pnumProportionalNumberslookup12;

script latn;
language dflt ;
lookup pnumProportionalNumberslookup12;
language TRK exclude_dflt;
lookup pnumProportionalNumberslookup12;
language TRK exclude_dflt;
} pnum;

feature smcp {
language dflt;
lookup smcpLowercasetoSmallCapitalsinL;

script DFLT;
language dflt ;
lookup smcpLowercasetoSmallCapitalsinL;

script latn;
language dflt ;
lookup smcpLowercasetoSmallCapitalsinL;
language TRK exclude_dflt;
lookup smcpLowercasetoSmallCapitalsinL;
language TRK exclude_dflt;
} smcp;

feature c2sc {
language dflt;
lookup c2scCapitalstoSmallCapitalslook;

script DFLT;
language dflt ;
lookup c2scCapitalstoSmallCapitalslook;

script cyrl;
language dflt ;
lookup c2scCapitalstoSmallCapitalslook;

script grek;
language dflt ;
lookup c2scCapitalstoSmallCapitalslook;

script latn;
language dflt ;
lookup c2scCapitalstoSmallCapitalslook;
language TRK exclude_dflt;
lookup c2scCapitalstoSmallCapitalslook;
language TRK exclude_dflt;
} c2sc;

132 changes: 24 additions & 108 deletions Source Files/Crimson-Roman.fea
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,142 +480,58 @@ lookup ordnOrdinalslookup0 {
} ordnOrdinalslookup0;

feature liga {
language dflt ;
lookup ligaLigaturesstandardlookups7;

script DFLT;
language dflt ;
lookup ligaLigaturesstandardlookups7;

script cyrl;
language dflt ;
lookup ligaLigaturesstandardlookups7;

script grek;
language dflt ;
lookup ligaLigaturesstandardlookups7;

script latn;
language dflt ;
lookup ligaLigaturesstandardlookups7;
language TRK exclude_dflt;
lookup ligaLigaturesstandardlookups7;
language TRK exclude_dflt;
} liga;

feature dlig {
language dflt;
lookup dligDiscretionaryLigatureslooku;

script DFLT;
language dflt ;
lookup dligDiscretionaryLigatureslooku;

script cyrl;
language dflt ;
lookup dligDiscretionaryLigatureslooku;

script grek;
language dflt ;
lookup dligDiscretionaryLigatureslooku;

script latn;
language dflt ;
lookup dligDiscretionaryLigatureslooku;
language TRK exclude_dflt;
lookup dligDiscretionaryLigatureslooku;
language TRK exclude_dflt;
} dlig;

feature c2sc {
language dflt;
lookup c2scCapitalstoSmallCapitalsinLa;

script DFLT;
language dflt ;
lookup c2scCapitalstoSmallCapitalsinLa;

script latn;
language dflt ;
lookup c2scCapitalstoSmallCapitalsinLa;
language TRK exclude_dflt;
lookup c2scCapitalstoSmallCapitalsinLa;
language TRK exclude_dflt;
} c2sc;

feature smcp {
language dflt;
lookup smcpLowercasetoSmallCapitalsloo;

script DFLT;
language dflt ;
lookup smcpLowercasetoSmallCapitalsloo;

script grek;
language dflt ;
lookup smcpLowercasetoSmallCapitalsloo;

script latn;
language dflt ;
lookup smcpLowercasetoSmallCapitalsloo;
language TRK exclude_dflt;
lookup smcpLowercasetoSmallCapitalsloo;
language TRK exclude_dflt;
} smcp;

feature pnum {
language dflt;
lookup pnumProportionalNumberslookup12;

script DFLT;
language dflt ;
lookup pnumProportionalNumberslookup12;

script grek;
language dflt ;
lookup pnumProportionalNumberslookup12;

script latn;
language dflt ;
lookup pnumProportionalNumberslookup12;
language TRK exclude_dflt;
lookup pnumProportionalNumberslookup12;
language TRK exclude_dflt;
} pnum;

feature zero {
language dflt;
lookup zeroSlashedZerolookup11;

script DFLT;
language dflt ;
lookup zeroSlashedZerolookup11;

script grek;
language dflt ;
lookup zeroSlashedZerolookup11;

script latn;
language dflt ;
lookup zeroSlashedZerolookup11;
language TRK exclude_dflt;
lookup zeroSlashedZerolookup11;
language TRK exclude_dflt;
} zero;

feature onum {
language dflt;
lookup onumOldstyleFigureslookup3;

script DFLT;
language dflt ;
lookup onumOldstyleFigureslookup3;

script grek;
language dflt ;
lookup onumOldstyleFigureslookup3;

script latn;
language dflt ;
lookup onumOldstyleFigureslookup3;
language TRK exclude_dflt;
lookup onumOldstyleFigureslookup3;
language TRK exclude_dflt;
} onum;

feature ordn {
language dflt;
lookup ordnOrdinalslookup0;

script DFLT;
language dflt ;
lookup ordnOrdinalslookup0;

script grek;
language dflt ;
lookup ordnOrdinalslookup0;

script latn;
language dflt ;
lookup ordnOrdinalslookup0;
language TRK exclude_dflt;
lookup ordnOrdinalslookup0;
language TRK exclude_dflt;
} ordn;

Loading

0 comments on commit cf8eb4b

Please sign in to comment.