Skip to content

Commit

Permalink
Enable feaLib tests
Browse files Browse the repository at this point in the history 
Some tests required cosmetic changes to TTX output to pass, others had
the wrong output from feaLib. The remaining xfail tests test parts of
feature files spec not supported by makeotf.
  • Loading branch information
@khaledhosny @cjchapman
khaledhosny authored and cjchapman committed Sep 30, 2019
1 parent 33c6954 commit 73c8057
Show file tree
Hide file tree
Showing 96 changed files with 1,101 additions and 655 deletions.
18 changes: 9 additions & 9 deletions tests/makeotfexe_data/expected_output/fealib/GPOS_1.ttx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<LookupFlag value="0"/>
<!-- SubTableCount=7 -->
<SinglePos index="0" Format="2">
<Coverage>
<Coverage Format="1">
<Glyph value="four"/>
<Glyph value="six"/>
<Glyph value="seven"/>
Expand All @@ -59,8 +59,8 @@
<Value index="4" XAdvance="-100"/>
<Value index="5" XAdvance="401"/>
</SinglePos>
<SinglePos index="1" Format="1">
<Coverage>
<SinglePos index="1" Format="2">
<Coverage Format="1">
<Glyph value="one"/>
<Glyph value="two"/>
<Glyph value="three"/>
Expand All @@ -70,7 +70,7 @@
<Value XPlacement="-80" XAdvance="-160"/>
</SinglePos>
<SinglePos index="2" Format="2">
<Coverage>
<Coverage Format="1">
<Glyph value="P"/>
<Glyph value="Q"/>
<Glyph value="R"/>
Expand All @@ -82,7 +82,7 @@
<Value index="2" XPlacement="1" XAdvance="802"/>
</SinglePos>
<SinglePos index="3" Format="2">
<Coverage>
<Coverage Format="2">
<Glyph value="S"/>
<Glyph value="T"/>
<Glyph value="U"/>
Expand All @@ -94,7 +94,7 @@
<Value index="2" XPlacement="1" YPlacement="1" XAdvance="805"/>
</SinglePos>
<SinglePos index="4" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="A"/>
<Glyph value="B"/>
</Coverage>
Expand All @@ -121,13 +121,13 @@
</Value>
</SinglePos>
<SinglePos index="5" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="zero"/>
</Coverage>
<ValueFormat value="0"/>
</SinglePos>
<SinglePos index="6" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="C"/>
</Coverage>
<ValueFormat value="255"/>
Expand Down Expand Up @@ -164,7 +164,7 @@
<LookupFlag value="0"/>
<!-- SubTableCount=1 -->
<SinglePos index="0" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="A"/>
</Coverage>
<ValueFormat value="8"/>
Expand Down
4 changes: 2 additions & 2 deletions tests/makeotfexe_data/expected_output/fealib/GPOS_1_zero.ttx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
<LookupFlag value="0"/>
<!-- SubTableCount=2 -->
<SinglePos index="0" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="zero"/>
</Coverage>
<ValueFormat value="0"/>
</SinglePos>
<SinglePos index="1" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="four"/>
</Coverage>
<ValueFormat value="4"/>
Expand Down
19 changes: 10 additions & 9 deletions tests/makeotfexe_data/expected_output/fealib/GPOS_2.ttx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<FeatureTag value="kern"/>
<Feature>
<!-- LookupCount=2 -->
<LookupListIndex index="0" value="1"/>
<LookupListIndex index="1" value="0"/>
<LookupListIndex index="0" value="0"/>
<LookupListIndex index="1" value="1"/>
</Feature>
</FeatureRecord>
<FeatureRecord index="1">
Expand All @@ -43,7 +43,7 @@
<LookupFlag value="0"/>
<!-- SubTableCount=2 -->
<PairPos index="0" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="v"/>
</Coverage>
<ValueFormat1 value="4"/>
Expand All @@ -58,16 +58,16 @@
</PairSet>
</PairPos>
<PairPos index="1" Format="2">
<Coverage>
<Coverage Format="1">
<Glyph value="D"/>
<Glyph value="O"/>
<Glyph value="Q"/>
</Coverage>
<ValueFormat1 value="4"/>
<ValueFormat2 value="0"/>
<ClassDef1>
<ClassDef1 Format="2">
</ClassDef1>
<ClassDef2>
<ClassDef2 Format="1">
<ClassDef glyph="T" class="1"/>
<ClassDef glyph="V" class="1"/>
<ClassDef glyph="W" class="1"/>
Expand All @@ -76,6 +76,7 @@
<!-- Class2Count=2 -->
<Class1Record index="0">
<Class2Record index="0">
<Value1 XAdvance="0"/>
</Class2Record>
<Class2Record index="1">
<Value1 XAdvance="-26"/>
Expand All @@ -88,7 +89,7 @@
<LookupFlag value="0"/>
<!-- SubTableCount=2 -->
<PairPos index="0" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="T"/>
<Glyph value="X"/>
<Glyph value="Y"/>
Expand Down Expand Up @@ -143,7 +144,7 @@
</PairSet>
</PairPos>
<PairPos index="1" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="Y"/>
</Coverage>
<ValueFormat1 value="15"/>
Expand All @@ -163,7 +164,7 @@
<LookupFlag value="0"/>
<!-- SubTableCount=1 -->
<PairPos index="0" Format="1">
<Coverage>
<Coverage Format="1">
<Glyph value="T"/>
</Coverage>
<ValueFormat1 value="8"/>
Expand Down
40 changes: 23 additions & 17 deletions tests/makeotfexe_data/expected_output/fealib/GPOS_2b.ttx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
<LookupFlag value="0"/>
<!-- SubTableCount=3 -->
<PairPos index="0" Format="2">
<Coverage>
<Coverage Format="1">
<Glyph value="A"/>
</Coverage>
<ValueFormat1 value="4"/>
<ValueFormat2 value="0"/>
<ClassDef1>
<ClassDef1 Format="2">
</ClassDef1>
<ClassDef2>
<ClassDef2 Format="2">
<ClassDef glyph="comma" class="1"/>
<ClassDef glyph="period" class="1"/>
<ClassDef glyph="semicolon" class="1"/>
Expand All @@ -50,14 +50,15 @@
<!-- Class2Count=2 -->
<Class1Record index="0">
<Class2Record index="0">
<Value1 XAdvance="0"/>
</Class2Record>
<Class2Record index="1">
<Value1 XAdvance="1"/>
</Class2Record>
</Class1Record>
</PairPos>
<PairPos index="1" Format="2">
<Coverage>
<Coverage Format="2">
<Glyph value="B"/>
<Glyph value="C"/>
<Glyph value="D"/>
Expand All @@ -66,46 +67,50 @@
</Coverage>
<ValueFormat1 value="4"/>
<ValueFormat2 value="0"/>
<ClassDef1>
<ClassDef glyph="B" class="1"/>
<ClassDef glyph="C" class="1"/>
<ClassDef1 Format="2">
<ClassDef glyph="D" class="1"/>
<ClassDef glyph="E" class="1"/>
<ClassDef glyph="F" class="1"/>
</ClassDef1>
<ClassDef2>
<ClassDef glyph="comma" class="2"/>
<ClassDef glyph="period" class="1"/>
<ClassDef glyph="semicolon" class="1"/>
<ClassDef2 Format="2">
<ClassDef glyph="comma" class="1"/>
<ClassDef glyph="period" class="2"/>
<ClassDef glyph="semicolon" class="2"/>
</ClassDef2>
<!-- Class1Count=2 -->
<!-- Class2Count=3 -->
<Class1Record index="0">
<Class2Record index="0">
<Value1 XAdvance="0"/>
</Class2Record>
<Class2Record index="1">
<Value1 XAdvance="4"/>
<Value1 XAdvance="2"/>
</Class2Record>
<Class2Record index="2">
<Value1 XAdvance="3"/>
<Value1 XAdvance="0"/>
</Class2Record>
</Class1Record>
<Class1Record index="1">
<Class2Record index="0">
<Value1 XAdvance="0"/>
</Class2Record>
<Class2Record index="1">
<Value1 XAdvance="3"/>
</Class2Record>
<Class2Record index="2">
<Value1 XAdvance="2"/>
<Value1 XAdvance="4"/>
</Class2Record>
</Class1Record>
</PairPos>
<PairPos index="2" Format="2">
<Coverage>
<Coverage Format="1">
<Glyph value="G"/>
</Coverage>
<ValueFormat1 value="15"/>
<ValueFormat2 value="0"/>
<ClassDef1>
<ClassDef1 Format="2">
</ClassDef1>
<ClassDef2>
<ClassDef2 Format="2">
<ClassDef glyph="comma" class="1"/>
<ClassDef glyph="period" class="1"/>
<ClassDef glyph="semicolon" class="1"/>
Expand All @@ -114,6 +119,7 @@
<!-- Class2Count=2 -->
<Class1Record index="0">
<Class2Record index="0">
<Value1 XPlacement="0" YPlacement="0" XAdvance="0" YAdvance="0"/>
</Class2Record>
<Class2Record index="1">
<Value1 XPlacement="5" YPlacement="5" XAdvance="5" YAdvance="5"/>
Expand Down
30 changes: 3 additions & 27 deletions tests/makeotfexe_data/expected_output/fealib/GPOS_3.ttx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,14 @@
<LookupFlag value="0"/>
<!-- SubTableCount=1 -->
<CursivePos index="0" Format="1">
<Coverage>
<Coverage Format="2">
<Glyph value="zero"/>
<Glyph value="one"/>
<Glyph value="two"/>
<Glyph value="three"/>
<Glyph value="four"/>
<Glyph value="five"/>
</Coverage>
<!-- EntryExitCount=6 -->
<!-- EntryExitCount=5 -->
<EntryExitRecord index="0">
</EntryExitRecord>
<EntryExitRecord index="1">
Expand All @@ -53,7 +52,7 @@
<ExitAnchor Format="2">
<XCoordinate value="3"/>
<YCoordinate value="4"/>
<AnchorPoint value="2"/>
<AnchorPoint value="0"/>
</ExitAnchor>
</EntryExitRecord>
<EntryExitRecord index="2">
Expand Down Expand Up @@ -83,29 +82,6 @@
<YCoordinate value="4"/>
</ExitAnchor>
</EntryExitRecord>
<EntryExitRecord index="5">
<EntryAnchor Format="3">
<XCoordinate value="124"/>
<YCoordinate value="-4"/>
<XDeviceTable>
<StartSize value="8"/>
<EndSize value="9"/>
<DeltaFormat value="2"/>
<DeltaValue value="[1, 2]"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="7"/>
<EndSize value="7"/>
<DeltaFormat value="2"/>
<DeltaValue value="[3]"/>
</YDeviceTable>
</EntryAnchor>
<ExitAnchor Format="2">
<XCoordinate value="3"/>
<YCoordinate value="4"/>
<AnchorPoint value="2"/>
</ExitAnchor>
</EntryExitRecord>
</CursivePos>
</Lookup>
</LookupList>
Expand Down
16 changes: 8 additions & 8 deletions tests/makeotfexe_data/expected_output/fealib/GPOS_4.ttx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<GDEF>
<Version value="0x00010000"/>
<GlyphClassDef>
<GlyphClassDef Format="2">
<ClassDef glyph="a" class="1"/>
<ClassDef glyph="acute" class="3"/>
<ClassDef glyph="b" class="1"/>
Expand Down Expand Up @@ -49,14 +49,14 @@
<LookupFlag value="0"/>
<!-- SubTableCount=1 -->
<MarkBasePos index="0" Format="1">
<MarkCoverage>
<MarkCoverage Format="1">
<Glyph value="grave"/>
<Glyph value="acute"/>
<Glyph value="macron"/>
<Glyph value="acute"/>
<Glyph value="cedilla"/>
<Glyph value="ogonek"/>
</MarkCoverage>
<BaseCoverage>
<BaseCoverage Format="2">
<Glyph value="a"/>
<Glyph value="b"/>
<Glyph value="c"/>
Expand All @@ -75,15 +75,15 @@
<MarkRecord index="1">
<Class value="0"/>
<MarkAnchor Format="1">
<XCoordinate value="111"/>
<YCoordinate value="-11"/>
<XCoordinate value="112"/>
<YCoordinate value="-12"/>
</MarkAnchor>
</MarkRecord>
<MarkRecord index="2">
<Class value="0"/>
<MarkAnchor Format="1">
<XCoordinate value="112"/>
<YCoordinate value="-12"/>
<XCoordinate value="111"/>
<YCoordinate value="-11"/>
</MarkAnchor>
</MarkRecord>
<MarkRecord index="3">
Expand Down
Loading

0 comments on commit 73c8057

Please sign in to comment.