diff --git a/Cargo.toml b/Cargo.toml index d2fc052..9e40f11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ required-features = ["binary"] [dependencies] folder = "0.6" -font = { git = "https://github.com/bodoni/font.git" } +font = "0.31" svg = "0.17" arguments = { version = "0.7", optional = true } diff --git a/tests/fixtures/internal/features/CrimsonText-Regular.txt b/tests/fixtures/internal/features/CrimsonText-Regular.txt index 0927c8a..71f552b 100644 --- a/tests/fixtures/internal/features/CrimsonText-Regular.txt +++ b/tests/fixtures/internal/features/CrimsonText-Regular.txt @@ -1,60 +1,60 @@ -case DFLT -case latn +case DFLT DFLT case latn AZE case latn CAT case latn CRT +case latn DFLT case latn KAZ case latn MOL case latn ROM case latn TAT case latn TRK -ccmp DFLT -ccmp latn +ccmp DFLT DFLT ccmp latn AZE ccmp latn CAT ccmp latn CRT +ccmp latn DFLT ccmp latn KAZ ccmp latn MOL ccmp latn ROM ccmp latn TAT ccmp latn TRK -dlig DFLT -dlig latn +dlig DFLT DFLT dlig latn AZE dlig latn CAT dlig latn CRT +dlig latn DFLT dlig latn KAZ dlig latn MOL dlig latn ROM dlig latn TAT dlig latn TRK -dnom DFLT -dnom latn +dnom DFLT DFLT dnom latn AZE dnom latn CAT dnom latn CRT +dnom latn DFLT dnom latn KAZ dnom latn MOL dnom latn ROM dnom latn TAT dnom latn TRK -frac DFLT -frac latn +frac DFLT DFLT frac latn AZE frac latn CAT frac latn CRT +frac latn DFLT frac latn KAZ frac latn MOL frac latn ROM frac latn TAT frac latn TRK -kern DFLT -kern latn -liga DFLT -liga latn +kern DFLT DFLT +kern latn DFLT +liga DFLT DFLT liga latn AZE liga latn CAT liga latn CRT +liga latn DFLT liga latn KAZ liga latn MOL liga latn ROM @@ -68,55 +68,55 @@ locl latn MOL locl latn ROM locl latn TAT locl latn TRK -mark DFLT -mark latn -mkmk DFLT -mkmk latn -numr DFLT -numr latn +mark DFLT DFLT +mark latn DFLT +mkmk DFLT DFLT +mkmk latn DFLT +numr DFLT DFLT numr latn AZE numr latn CAT numr latn CRT +numr latn DFLT numr latn KAZ numr latn MOL numr latn ROM numr latn TAT numr latn TRK -sinf DFLT -sinf latn +sinf DFLT DFLT sinf latn AZE sinf latn CAT sinf latn CRT +sinf latn DFLT sinf latn KAZ sinf latn MOL sinf latn ROM sinf latn TAT sinf latn TRK -subs DFLT -subs latn +subs DFLT DFLT subs latn AZE subs latn CAT subs latn CRT +subs latn DFLT subs latn KAZ subs latn MOL subs latn ROM subs latn TAT subs latn TRK -sups DFLT -sups latn +sups DFLT DFLT sups latn AZE sups latn CAT sups latn CRT +sups latn DFLT sups latn KAZ sups latn MOL sups latn ROM sups latn TAT sups latn TRK -zero DFLT -zero latn +zero DFLT DFLT zero latn AZE zero latn CAT zero latn CRT +zero latn DFLT zero latn KAZ zero latn MOL zero latn ROM diff --git a/tests/fixtures/internal/features/Numans-Regular.txt b/tests/fixtures/internal/features/Numans-Regular.txt index 57abeb0..beee5bb 100644 --- a/tests/fixtures/internal/features/Numans-Regular.txt +++ b/tests/fixtures/internal/features/Numans-Regular.txt @@ -1,2 +1,2 @@ -kern DFLT -kern latn +kern DFLT DFLT +kern latn DFLT diff --git a/tests/fixtures/internal/features/OpenSans-Italic.txt b/tests/fixtures/internal/features/OpenSans-Italic.txt index 51f3dec..4647212 100644 --- a/tests/fixtures/internal/features/OpenSans-Italic.txt +++ b/tests/fixtures/internal/features/OpenSans-Italic.txt @@ -1,29 +1,29 @@ -liga latn +liga latn DFLT liga latn MOL liga latn ROM -lnum latn +lnum latn DFLT lnum latn MOL lnum latn ROM locl latn MOL locl latn ROM -onum latn +onum latn DFLT onum latn MOL onum latn ROM -pnum latn +pnum latn DFLT pnum latn MOL pnum latn ROM -salt latn +salt latn DFLT salt latn MOL salt latn ROM -ss01 latn +ss01 latn DFLT ss01 latn MOL ss01 latn ROM -ss02 latn +ss02 latn DFLT ss02 latn MOL ss02 latn ROM -ss03 latn +ss03 latn DFLT ss03 latn MOL ss03 latn ROM -tnum latn +tnum latn DFLT tnum latn MOL tnum latn ROM diff --git a/tests/fixtures/internal/features/SourceSerifPro-Regular.txt b/tests/fixtures/internal/features/SourceSerifPro-Regular.txt index 8d900ad..6b0389f 100644 --- a/tests/fixtures/internal/features/SourceSerifPro-Regular.txt +++ b/tests/fixtures/internal/features/SourceSerifPro-Regular.txt @@ -1,88 +1,88 @@ -aalt DFLT -aalt latn +aalt DFLT DFLT aalt latn AZE aalt latn CRT +aalt latn DFLT aalt latn TRK -case DFLT -case latn +case DFLT DFLT case latn AZE case latn CRT +case latn DFLT case latn TRK -dnom DFLT -dnom latn +dnom DFLT DFLT dnom latn AZE dnom latn CRT +dnom latn DFLT dnom latn TRK -frac DFLT -frac latn +frac DFLT DFLT frac latn AZE frac latn CRT +frac latn DFLT frac latn TRK -kern DFLT -kern latn +kern DFLT DFLT kern latn AZE kern latn CRT +kern latn DFLT kern latn TRK -liga DFLT -liga latn +liga DFLT DFLT liga latn AZE liga latn CRT +liga latn DFLT liga latn TRK -lnum DFLT -lnum latn +lnum DFLT DFLT lnum latn AZE lnum latn CRT +lnum latn DFLT lnum latn TRK locl latn AZE locl latn CRT locl latn TRK -numr DFLT -numr latn +numr DFLT DFLT numr latn AZE numr latn CRT +numr latn DFLT numr latn TRK -onum DFLT -onum latn +onum DFLT DFLT onum latn AZE onum latn CRT +onum latn DFLT onum latn TRK -ordn DFLT -ordn latn +ordn DFLT DFLT ordn latn AZE ordn latn CRT +ordn latn DFLT ordn latn TRK -pnum DFLT -pnum latn +pnum DFLT DFLT pnum latn AZE pnum latn CRT +pnum latn DFLT pnum latn TRK -sinf DFLT -sinf latn +sinf DFLT DFLT sinf latn AZE sinf latn CRT +sinf latn DFLT sinf latn TRK -size DFLT -size latn +size DFLT DFLT size latn AZE size latn CRT +size latn DFLT size latn TRK -subs DFLT -subs latn +subs DFLT DFLT subs latn AZE subs latn CRT +subs latn DFLT subs latn TRK -sups DFLT -sups latn +sups DFLT DFLT sups latn AZE sups latn CRT +sups latn DFLT sups latn TRK -tnum DFLT -tnum latn +tnum DFLT DFLT tnum latn AZE tnum latn CRT +tnum latn DFLT tnum latn TRK -zero DFLT -zero latn +zero DFLT DFLT zero latn AZE zero latn CRT +zero latn DFLT zero latn TRK diff --git a/tests/fixtures/internal/features/Thabit-Bold.txt b/tests/fixtures/internal/features/Thabit-Bold.txt index f0644e1..fc81957 100644 --- a/tests/fixtures/internal/features/Thabit-Bold.txt +++ b/tests/fixtures/internal/features/Thabit-Bold.txt @@ -1,7 +1,7 @@ -fina arab -init arab -liga arab -liga latn -mark arab -medi arab -rlig arab +fina arab DFLT +init arab DFLT +liga arab DFLT +liga latn DFLT +mark arab DFLT +medi arab DFLT +rlig arab DFLT diff --git a/tests/fixtures/internal/features/VesperLibre-Regular.txt b/tests/fixtures/internal/features/VesperLibre-Regular.txt index 9ef2e6b..4fc0954 100644 --- a/tests/fixtures/internal/features/VesperLibre-Regular.txt +++ b/tests/fixtures/internal/features/VesperLibre-Regular.txt @@ -1,160 +1,160 @@ -aalt DFLT -aalt deva +aalt DFLT DFLT +aalt deva DFLT aalt deva MAR aalt deva NEP -aalt dev2 +aalt dev2 DFLT aalt dev2 MAR aalt dev2 NEP -aalt latn +aalt latn DFLT aalt latn MOL aalt latn ROM -abvm DFLT -abvm deva +abvm DFLT DFLT +abvm deva DFLT abvm deva MAR abvm deva NEP -abvm dev2 +abvm dev2 DFLT abvm dev2 MAR abvm dev2 NEP -abvm latn +abvm latn DFLT abvm latn MOL abvm latn ROM -abvs deva +abvs deva DFLT abvs deva MAR abvs deva NEP -abvs dev2 +abvs dev2 DFLT abvs dev2 MAR abvs dev2 NEP -akhn deva +akhn deva DFLT akhn deva MAR akhn deva NEP -akhn dev2 +akhn dev2 DFLT akhn dev2 MAR akhn dev2 NEP -blwf deva -blwf dev2 -blwm DFLT -blwm deva +blwf deva DFLT +blwf dev2 DFLT +blwm DFLT DFLT +blwm deva DFLT blwm deva MAR blwm deva NEP -blwm dev2 +blwm dev2 DFLT blwm dev2 MAR blwm dev2 NEP -blwm latn +blwm latn DFLT blwm latn MOL blwm latn ROM -calt DFLT -calt deva +calt DFLT DFLT +calt deva DFLT calt deva MAR calt deva NEP -calt dev2 +calt dev2 DFLT calt dev2 MAR calt dev2 NEP -calt latn +calt latn DFLT calt latn MOL calt latn ROM -ccmp dev2 -cjct dev2 +ccmp dev2 DFLT +cjct dev2 DFLT cjct dev2 MAR cjct dev2 NEP -dist deva +dist deva DFLT dist deva MAR dist deva NEP -dist dev2 +dist dev2 DFLT dist dev2 MAR dist dev2 NEP -frac DFLT -frac deva +frac DFLT DFLT +frac deva DFLT frac deva MAR frac deva NEP -frac dev2 +frac dev2 DFLT frac dev2 MAR frac dev2 NEP -frac latn +frac latn DFLT frac latn MOL frac latn ROM -half deva +half deva DFLT half deva MAR half deva NEP -half dev2 +half dev2 DFLT half dev2 MAR half dev2 NEP -kern DFLT -kern deva +kern DFLT DFLT +kern deva DFLT kern deva MAR kern deva NEP -kern dev2 +kern dev2 DFLT kern dev2 MAR kern dev2 NEP -kern latn +kern latn DFLT kern latn MOL kern latn ROM -liga DFLT -liga deva +liga DFLT DFLT +liga deva DFLT liga deva MAR liga deva NEP -liga dev2 +liga dev2 DFLT liga dev2 MAR liga dev2 NEP -liga latn +liga latn DFLT liga latn MOL liga latn ROM -locl deva -locl dev2 +locl deva DFLT +locl dev2 DFLT locl dev2 MAR locl dev2 NEP locl latn MOL locl latn ROM -mark DFLT -mark deva +mark DFLT DFLT +mark deva DFLT mark deva MAR mark deva NEP -mark dev2 +mark dev2 DFLT mark dev2 MAR mark dev2 NEP -mark latn +mark latn DFLT mark latn MOL mark latn ROM -nukt deva +nukt deva DFLT nukt deva MAR nukt deva NEP -nukt dev2 +nukt dev2 DFLT nukt dev2 MAR nukt dev2 NEP -ordn DFLT -ordn deva +ordn DFLT DFLT +ordn deva DFLT ordn deva MAR ordn deva NEP -ordn dev2 +ordn dev2 DFLT ordn dev2 MAR ordn dev2 NEP -ordn latn +ordn latn DFLT ordn latn MOL ordn latn ROM -pres deva +pres deva DFLT pres deva MAR pres deva NEP -pres dev2 +pres dev2 DFLT pres dev2 MAR pres dev2 NEP -rkrf deva +rkrf deva DFLT rkrf deva MAR rkrf deva NEP -rkrf dev2 +rkrf dev2 DFLT rkrf dev2 MAR rkrf dev2 NEP -rphf deva +rphf deva DFLT rphf deva MAR rphf deva NEP -rphf dev2 +rphf dev2 DFLT rphf dev2 MAR rphf dev2 NEP -sups DFLT -sups deva +sups DFLT DFLT +sups deva DFLT sups deva MAR sups deva NEP -sups dev2 +sups dev2 DFLT sups dev2 MAR sups dev2 NEP -sups latn +sups latn DFLT sups latn MOL sups latn ROM