[feaLib] adjust test data to changes in builder.LookupBuilder
'LookupList' elements now contains 'Lookup' elements, in turn containing one or more lookup subtables
This commit is contained in:
Cosimo Lupo
parent
df06ce4981
commit
d89bcd422d
33
Lib/fontTools/feaLib/testdata/GSUB_3.ttx
vendored
33
Lib/fontTools/feaLib/testdata/GSUB_3.ttx
vendored
@ -37,20 +37,25 @@
|
||||
</FeatureList>
|
||||
<LookupList>
|
||||
<!-- LookupCount=1 -->
|
||||
<AlternateSubst index="0" Format="1">
|
||||
<AlternateSet glyph="A">
|
||||
<Alternate glyph="A.alt1"/>
|
||||
<Alternate glyph="A.alt2"/>
|
||||
</AlternateSet>
|
||||
<AlternateSet glyph="B">
|
||||
<Alternate glyph="B.alt1"/>
|
||||
<Alternate glyph="B.alt2"/>
|
||||
<Alternate glyph="B.alt3"/>
|
||||
</AlternateSet>
|
||||
<AlternateSet glyph="C">
|
||||
<Alternate glyph="C.alt1"/>
|
||||
</AlternateSet>
|
||||
</AlternateSubst>
|
||||
<Lookup index="0">
|
||||
<!-- LookupType=3 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<AlternateSubst index="0" Format="1">
|
||||
<AlternateSet glyph="A">
|
||||
<Alternate glyph="A.alt1"/>
|
||||
<Alternate glyph="A.alt2"/>
|
||||
</AlternateSet>
|
||||
<AlternateSet glyph="B">
|
||||
<Alternate glyph="B.alt1"/>
|
||||
<Alternate glyph="B.alt2"/>
|
||||
<Alternate glyph="B.alt3"/>
|
||||
</AlternateSet>
|
||||
<AlternateSet glyph="C">
|
||||
<Alternate glyph="C.alt1"/>
|
||||
</AlternateSet>
|
||||
</AlternateSubst>
|
||||
</Lookup>
|
||||
</LookupList>
|
||||
</GSUB>
|
||||
|
||||
|
||||
106
Lib/fontTools/feaLib/testdata/language_required.ttx
vendored
106
Lib/fontTools/feaLib/testdata/language_required.ttx
vendored
@ -70,49 +70,69 @@
|
||||
</FeatureList>
|
||||
<LookupList>
|
||||
<!-- LookupCount=4 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="D">
|
||||
<Ligature components="D,E,U" glyph="D_E_U"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<LigatureSubst index="1" Format="1">
|
||||
<LigatureSet glyph="F">
|
||||
<Ligature components="F,R,A" glyph="D_E_U"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<LigatureSubst index="2" Format="1">
|
||||
<LigatureSet glyph="I">
|
||||
<Ligature components="I,T,A" glyph="I_T_A"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<SingleSubst index="3">
|
||||
<Substitution in="a" out="A.sc"/>
|
||||
<Substitution in="b" out="B.sc"/>
|
||||
<Substitution in="c" out="C.sc"/>
|
||||
<Substitution in="d" out="D.sc"/>
|
||||
<Substitution in="e" out="E.sc"/>
|
||||
<Substitution in="f" out="F.sc"/>
|
||||
<Substitution in="g" out="G.sc"/>
|
||||
<Substitution in="h" out="H.sc"/>
|
||||
<Substitution in="i" out="I.sc"/>
|
||||
<Substitution in="j" out="J.sc"/>
|
||||
<Substitution in="k" out="K.sc"/>
|
||||
<Substitution in="l" out="L.sc"/>
|
||||
<Substitution in="m" out="M.sc"/>
|
||||
<Substitution in="n" out="N.sc"/>
|
||||
<Substitution in="o" out="O.sc"/>
|
||||
<Substitution in="p" out="P.sc"/>
|
||||
<Substitution in="q" out="Q.sc"/>
|
||||
<Substitution in="r" out="R.sc"/>
|
||||
<Substitution in="s" out="S.sc"/>
|
||||
<Substitution in="t" out="T.sc"/>
|
||||
<Substitution in="u" out="U.sc"/>
|
||||
<Substitution in="v" out="V.sc"/>
|
||||
<Substitution in="w" out="W.sc"/>
|
||||
<Substitution in="x" out="X.sc"/>
|
||||
<Substitution in="y" out="Y.sc"/>
|
||||
<Substitution in="z" out="Z.sc"/>
|
||||
</SingleSubst>
|
||||
<Lookup index="0">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="D">
|
||||
<Ligature components="D,E,U" glyph="D_E_U"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
<Lookup index="1">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="F">
|
||||
<Ligature components="F,R,A" glyph="D_E_U"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
<Lookup index="2">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="I">
|
||||
<Ligature components="I,T,A" glyph="I_T_A"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
<Lookup index="3">
|
||||
<!-- LookupType=1 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<SingleSubst index="0">
|
||||
<Substitution in="a" out="A.sc"/>
|
||||
<Substitution in="b" out="B.sc"/>
|
||||
<Substitution in="c" out="C.sc"/>
|
||||
<Substitution in="d" out="D.sc"/>
|
||||
<Substitution in="e" out="E.sc"/>
|
||||
<Substitution in="f" out="F.sc"/>
|
||||
<Substitution in="g" out="G.sc"/>
|
||||
<Substitution in="h" out="H.sc"/>
|
||||
<Substitution in="i" out="I.sc"/>
|
||||
<Substitution in="j" out="J.sc"/>
|
||||
<Substitution in="k" out="K.sc"/>
|
||||
<Substitution in="l" out="L.sc"/>
|
||||
<Substitution in="m" out="M.sc"/>
|
||||
<Substitution in="n" out="N.sc"/>
|
||||
<Substitution in="o" out="O.sc"/>
|
||||
<Substitution in="p" out="P.sc"/>
|
||||
<Substitution in="q" out="Q.sc"/>
|
||||
<Substitution in="r" out="R.sc"/>
|
||||
<Substitution in="s" out="S.sc"/>
|
||||
<Substitution in="t" out="T.sc"/>
|
||||
<Substitution in="u" out="U.sc"/>
|
||||
<Substitution in="v" out="V.sc"/>
|
||||
<Substitution in="w" out="W.sc"/>
|
||||
<Substitution in="x" out="X.sc"/>
|
||||
<Substitution in="y" out="Y.sc"/>
|
||||
<Substitution in="z" out="Z.sc"/>
|
||||
</SingleSubst>
|
||||
</Lookup>
|
||||
</LookupList>
|
||||
</GSUB>
|
||||
|
||||
|
||||
114
Lib/fontTools/feaLib/testdata/spec4h1.ttx
vendored
114
Lib/fontTools/feaLib/testdata/spec4h1.ttx
vendored
@ -81,53 +81,73 @@
|
||||
</FeatureList>
|
||||
<LookupList>
|
||||
<!-- LookupCount=4 -->
|
||||
<SingleSubst index="0">
|
||||
<Substitution in="a" out="A.sc"/>
|
||||
<Substitution in="b" out="B.sc"/>
|
||||
<Substitution in="c" out="C.sc"/>
|
||||
<Substitution in="d" out="D.sc"/>
|
||||
<Substitution in="e" out="E.sc"/>
|
||||
<Substitution in="f" out="F.sc"/>
|
||||
<Substitution in="g" out="G.sc"/>
|
||||
<Substitution in="h" out="H.sc"/>
|
||||
<Substitution in="i" out="I.sc"/>
|
||||
<Substitution in="j" out="J.sc"/>
|
||||
<Substitution in="k" out="K.sc"/>
|
||||
<Substitution in="l" out="L.sc"/>
|
||||
<Substitution in="m" out="M.sc"/>
|
||||
<Substitution in="n" out="N.sc"/>
|
||||
<Substitution in="o" out="O.sc"/>
|
||||
<Substitution in="p" out="P.sc"/>
|
||||
<Substitution in="q" out="Q.sc"/>
|
||||
<Substitution in="r" out="R.sc"/>
|
||||
<Substitution in="s" out="S.sc"/>
|
||||
<Substitution in="t" out="T.sc"/>
|
||||
<Substitution in="u" out="U.sc"/>
|
||||
<Substitution in="v" out="V.sc"/>
|
||||
<Substitution in="w" out="W.sc"/>
|
||||
<Substitution in="x" out="X.sc"/>
|
||||
<Substitution in="y" out="Y.sc"/>
|
||||
<Substitution in="z" out="Z.sc"/>
|
||||
</SingleSubst>
|
||||
<LigatureSubst index="1" Format="1">
|
||||
<LigatureSet glyph="f">
|
||||
<Ligature components="f,f" glyph="f_f"/>
|
||||
<Ligature components="f,i" glyph="f_i"/>
|
||||
<Ligature components="f,l" glyph="f_l"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<LigatureSubst index="2" Format="1">
|
||||
<LigatureSet glyph="c">
|
||||
<Ligature components="c,s" glyph="c_s"/>
|
||||
<Ligature components="c,t" glyph="c_t"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<LigatureSubst index="3" Format="1">
|
||||
<LigatureSet glyph="c">
|
||||
<Ligature components="c,h" glyph="c_h"/>
|
||||
<Ligature components="c,k" glyph="c_k"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<Lookup index="0">
|
||||
<!-- LookupType=1 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<SingleSubst index="0">
|
||||
<Substitution in="a" out="A.sc"/>
|
||||
<Substitution in="b" out="B.sc"/>
|
||||
<Substitution in="c" out="C.sc"/>
|
||||
<Substitution in="d" out="D.sc"/>
|
||||
<Substitution in="e" out="E.sc"/>
|
||||
<Substitution in="f" out="F.sc"/>
|
||||
<Substitution in="g" out="G.sc"/>
|
||||
<Substitution in="h" out="H.sc"/>
|
||||
<Substitution in="i" out="I.sc"/>
|
||||
<Substitution in="j" out="J.sc"/>
|
||||
<Substitution in="k" out="K.sc"/>
|
||||
<Substitution in="l" out="L.sc"/>
|
||||
<Substitution in="m" out="M.sc"/>
|
||||
<Substitution in="n" out="N.sc"/>
|
||||
<Substitution in="o" out="O.sc"/>
|
||||
<Substitution in="p" out="P.sc"/>
|
||||
<Substitution in="q" out="Q.sc"/>
|
||||
<Substitution in="r" out="R.sc"/>
|
||||
<Substitution in="s" out="S.sc"/>
|
||||
<Substitution in="t" out="T.sc"/>
|
||||
<Substitution in="u" out="U.sc"/>
|
||||
<Substitution in="v" out="V.sc"/>
|
||||
<Substitution in="w" out="W.sc"/>
|
||||
<Substitution in="x" out="X.sc"/>
|
||||
<Substitution in="y" out="Y.sc"/>
|
||||
<Substitution in="z" out="Z.sc"/>
|
||||
</SingleSubst>
|
||||
</Lookup>
|
||||
<Lookup index="1">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="f">
|
||||
<Ligature components="f,f" glyph="f_f"/>
|
||||
<Ligature components="f,i" glyph="f_i"/>
|
||||
<Ligature components="f,l" glyph="f_l"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
<Lookup index="2">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="c">
|
||||
<Ligature components="c,s" glyph="c_s"/>
|
||||
<Ligature components="c,t" glyph="c_t"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
<Lookup index="3">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="c">
|
||||
<Ligature components="c,h" glyph="c_h"/>
|
||||
<Ligature components="c,k" glyph="c_k"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
</LookupList>
|
||||
</GSUB>
|
||||
|
||||
|
||||
33
Lib/fontTools/feaLib/testdata/spec5d1.ttx
vendored
33
Lib/fontTools/feaLib/testdata/spec5d1.ttx
vendored
@ -37,20 +37,25 @@
|
||||
</FeatureList>
|
||||
<LookupList>
|
||||
<!-- LookupCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="one">
|
||||
<Ligature components="one,fraction,two" glyph="onehalf"/>
|
||||
<Ligature components="one,fraction,two.oldstyle" glyph="onehalf"/>
|
||||
<Ligature components="one,slash,two" glyph="onehalf"/>
|
||||
<Ligature components="one,slash,two.oldstyle" glyph="onehalf"/>
|
||||
</LigatureSet>
|
||||
<LigatureSet glyph="one.oldstyle">
|
||||
<Ligature components="one.oldstyle,fraction,two" glyph="onehalf"/>
|
||||
<Ligature components="one.oldstyle,fraction,two.oldstyle" glyph="onehalf"/>
|
||||
<Ligature components="one.oldstyle,slash,two" glyph="onehalf"/>
|
||||
<Ligature components="one.oldstyle,slash,two.oldstyle" glyph="onehalf"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<Lookup index="0">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="one">
|
||||
<Ligature components="one,fraction,two" glyph="onehalf"/>
|
||||
<Ligature components="one,fraction,two.oldstyle" glyph="onehalf"/>
|
||||
<Ligature components="one,slash,two" glyph="onehalf"/>
|
||||
<Ligature components="one,slash,two.oldstyle" glyph="onehalf"/>
|
||||
</LigatureSet>
|
||||
<LigatureSet glyph="one.oldstyle">
|
||||
<Ligature components="one.oldstyle,fraction,two" glyph="onehalf"/>
|
||||
<Ligature components="one.oldstyle,fraction,two.oldstyle" glyph="onehalf"/>
|
||||
<Ligature components="one.oldstyle,slash,two" glyph="onehalf"/>
|
||||
<Ligature components="one.oldstyle,slash,two.oldstyle" glyph="onehalf"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
</LookupList>
|
||||
</GSUB>
|
||||
|
||||
|
||||
25
Lib/fontTools/feaLib/testdata/spec5d2.ttx
vendored
25
Lib/fontTools/feaLib/testdata/spec5d2.ttx
vendored
@ -37,16 +37,21 @@
|
||||
</FeatureList>
|
||||
<LookupList>
|
||||
<!-- LookupCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="f">
|
||||
<Ligature components="f,f,i" glyph="f_f_i"/>
|
||||
<Ligature components="f,f" glyph="f_f"/>
|
||||
<Ligature components="f,i" glyph="f_i"/>
|
||||
</LigatureSet>
|
||||
<LigatureSet glyph="o">
|
||||
<Ligature components="o,f,f,i" glyph="o_f_f_i"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
<Lookup index="0">
|
||||
<!-- LookupType=4 -->
|
||||
<LookupFlag value="0"/>
|
||||
<!-- SubTableCount=1 -->
|
||||
<LigatureSubst index="0" Format="1">
|
||||
<LigatureSet glyph="f">
|
||||
<Ligature components="f,f,i" glyph="f_f_i"/>
|
||||
<Ligature components="f,f" glyph="f_f"/>
|
||||
<Ligature components="f,i" glyph="f_i"/>
|
||||
</LigatureSet>
|
||||
<LigatureSet glyph="o">
|
||||
<Ligature components="o,f,f,i" glyph="o_f_f_i"/>
|
||||
</LigatureSet>
|
||||
</LigatureSubst>
|
||||
</Lookup>
|
||||
</LookupList>
|
||||
</GSUB>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user