Skip to content

Commit

Permalink
Update test expectation
Browse files Browse the repository at this point in the history 
The DesignSpace document has a source that uses Medium layer, but before
the previous fix the anchor position was taken from the default layer.
  • Loading branch information
@khaledhosny
khaledhosny committed May 20, 2024
1 parent dd324c4 commit ab1ed09
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 50 deletions.
22 changes: 15 additions & 7 deletions tests/data/TestVariableFont-CFF2-cffsubr.ttx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="4.44">
<ttFont sfntVersion="OTTO" ttLibVersion="4.51">

<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
Expand Down Expand Up @@ -319,8 +319,15 @@
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="0.36365"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.36365"/>
<PeakCoord value="1.0"/>
Expand All @@ -332,10 +339,11 @@
<VarData index="0">
<!-- ItemCount=2 -->
<NumShorts value="0"/>
<!-- VarRegionCount=1 -->
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<Item index="0" value="[1]"/>
<Item index="1" value="[88]"/>
<VarRegionIndex index="1" value="1"/>
<Item index="0" value="[11, 88]"/>
<Item index="1" value="[89, 1]"/>
</VarData>
</VarStore>
</GDEF>
Expand Down Expand Up @@ -398,12 +406,12 @@
<YCoordinate value="556"/>
<XDeviceTable>
<StartSize value="0"/>
<EndSize value="0"/>
<EndSize value="1"/>
<DeltaFormat value="32768"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="0"/>
<EndSize value="1"/>
<EndSize value="0"/>
<DeltaFormat value="32768"/>
</YDeviceTable>
</BaseAnchor>
Expand Down
22 changes: 15 additions & 7 deletions tests/data/TestVariableFont-CFF2-post3.ttx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="4.44">
<ttFont sfntVersion="OTTO" ttLibVersion="4.51">

<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
Expand Down Expand Up @@ -302,8 +302,15 @@
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="0.36365"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.36365"/>
<PeakCoord value="1.0"/>
Expand All @@ -315,10 +322,11 @@
<VarData index="0">
<!-- ItemCount=2 -->
<NumShorts value="0"/>
<!-- VarRegionCount=1 -->
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<Item index="0" value="[1]"/>
<Item index="1" value="[88]"/>
<VarRegionIndex index="1" value="1"/>
<Item index="0" value="[11, 88]"/>
<Item index="1" value="[89, 1]"/>
</VarData>
</VarStore>
</GDEF>
Expand Down Expand Up @@ -381,12 +389,12 @@
<YCoordinate value="556"/>
<XDeviceTable>
<StartSize value="0"/>
<EndSize value="0"/>
<EndSize value="1"/>
<DeltaFormat value="32768"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="0"/>
<EndSize value="1"/>
<EndSize value="0"/>
<DeltaFormat value="32768"/>
</YDeviceTable>
</BaseAnchor>
Expand Down
22 changes: 15 additions & 7 deletions tests/data/TestVariableFont-CFF2-useProductionNames.ttx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="4.44">
<ttFont sfntVersion="OTTO" ttLibVersion="4.51">

<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
Expand Down Expand Up @@ -319,8 +319,15 @@
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="0.36365"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.36365"/>
<PeakCoord value="1.0"/>
Expand All @@ -332,10 +339,11 @@
<VarData index="0">
<!-- ItemCount=2 -->
<NumShorts value="0"/>
<!-- VarRegionCount=1 -->
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<Item index="0" value="[1]"/>
<Item index="1" value="[88]"/>
<VarRegionIndex index="1" value="1"/>
<Item index="0" value="[11, 88]"/>
<Item index="1" value="[89, 1]"/>
</VarData>
</VarStore>
</GDEF>
Expand Down Expand Up @@ -398,12 +406,12 @@
<YCoordinate value="556"/>
<XDeviceTable>
<StartSize value="0"/>
<EndSize value="0"/>
<EndSize value="1"/>
<DeltaFormat value="32768"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="0"/>
<EndSize value="1"/>
<EndSize value="0"/>
<DeltaFormat value="32768"/>
</YDeviceTable>
</BaseAnchor>
Expand Down
22 changes: 15 additions & 7 deletions tests/data/TestVariableFont-CFF2.ttx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="4.44">
<ttFont sfntVersion="OTTO" ttLibVersion="4.51">

<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
Expand Down Expand Up @@ -316,8 +316,15 @@
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="0.36365"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.36365"/>
<PeakCoord value="1.0"/>
Expand All @@ -329,10 +336,11 @@
<VarData index="0">
<!-- ItemCount=2 -->
<NumShorts value="0"/>
<!-- VarRegionCount=1 -->
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<Item index="0" value="[1]"/>
<Item index="1" value="[88]"/>
<VarRegionIndex index="1" value="1"/>
<Item index="0" value="[11, 88]"/>
<Item index="1" value="[89, 1]"/>
</VarData>
</VarStore>
</GDEF>
Expand Down Expand Up @@ -395,12 +403,12 @@
<YCoordinate value="556"/>
<XDeviceTable>
<StartSize value="0"/>
<EndSize value="0"/>
<EndSize value="1"/>
<DeltaFormat value="32768"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="0"/>
<EndSize value="1"/>
<EndSize value="0"/>
<DeltaFormat value="32768"/>
</YDeviceTable>
</BaseAnchor>
Expand Down
22 changes: 15 additions & 7 deletions tests/data/TestVariableFont-TTF-post3.ttx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.44">
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.51">

<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
Expand Down Expand Up @@ -305,8 +305,15 @@
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="0.36365"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.36365"/>
<PeakCoord value="1.0"/>
Expand All @@ -318,10 +325,11 @@
<VarData index="0">
<!-- ItemCount=2 -->
<NumShorts value="0"/>
<!-- VarRegionCount=1 -->
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<Item index="0" value="[1]"/>
<Item index="1" value="[88]"/>
<VarRegionIndex index="1" value="1"/>
<Item index="0" value="[11, 88]"/>
<Item index="1" value="[89, 1]"/>
</VarData>
</VarStore>
</GDEF>
Expand Down Expand Up @@ -384,12 +392,12 @@
<YCoordinate value="556"/>
<XDeviceTable>
<StartSize value="0"/>
<EndSize value="0"/>
<EndSize value="1"/>
<DeltaFormat value="32768"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="0"/>
<EndSize value="1"/>
<EndSize value="0"/>
<DeltaFormat value="32768"/>
</YDeviceTable>
</BaseAnchor>
Expand Down
22 changes: 15 additions & 7 deletions tests/data/TestVariableFont-TTF-useProductionNames.ttx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.44">
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.51">

<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
Expand Down Expand Up @@ -322,8 +322,15 @@
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="0.36365"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.36365"/>
<PeakCoord value="1.0"/>
Expand All @@ -335,10 +342,11 @@
<VarData index="0">
<!-- ItemCount=2 -->
<NumShorts value="0"/>
<!-- VarRegionCount=1 -->
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<Item index="0" value="[1]"/>
<Item index="1" value="[88]"/>
<VarRegionIndex index="1" value="1"/>
<Item index="0" value="[11, 88]"/>
<Item index="1" value="[89, 1]"/>
</VarData>
</VarStore>
</GDEF>
Expand Down Expand Up @@ -401,12 +409,12 @@
<YCoordinate value="556"/>
<XDeviceTable>
<StartSize value="0"/>
<EndSize value="0"/>
<EndSize value="1"/>
<DeltaFormat value="32768"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="0"/>
<EndSize value="1"/>
<EndSize value="0"/>
<DeltaFormat value="32768"/>
</YDeviceTable>
</BaseAnchor>
Expand Down
22 changes: 15 additions & 7 deletions tests/data/TestVariableFont-TTF.ttx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.44">
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.51">

<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
Expand Down Expand Up @@ -319,8 +319,15 @@
<Format value="1"/>
<VarRegionList>
<!-- RegionAxisCount=1 -->
<!-- RegionCount=1 -->
<!-- RegionCount=2 -->
<Region index="0">
<VarRegionAxis index="0">
<StartCoord value="0.0"/>
<PeakCoord value="0.36365"/>
<EndCoord value="1.0"/>
</VarRegionAxis>
</Region>
<Region index="1">
<VarRegionAxis index="0">
<StartCoord value="0.36365"/>
<PeakCoord value="1.0"/>
Expand All @@ -332,10 +339,11 @@
<VarData index="0">
<!-- ItemCount=2 -->
<NumShorts value="0"/>
<!-- VarRegionCount=1 -->
<!-- VarRegionCount=2 -->
<VarRegionIndex index="0" value="0"/>
<Item index="0" value="[1]"/>
<Item index="1" value="[88]"/>
<VarRegionIndex index="1" value="1"/>
<Item index="0" value="[11, 88]"/>
<Item index="1" value="[89, 1]"/>
</VarData>
</VarStore>
</GDEF>
Expand Down Expand Up @@ -398,12 +406,12 @@
<YCoordinate value="556"/>
<XDeviceTable>
<StartSize value="0"/>
<EndSize value="0"/>
<EndSize value="1"/>
<DeltaFormat value="32768"/>
</XDeviceTable>
<YDeviceTable>
<StartSize value="0"/>
<EndSize value="1"/>
<EndSize value="0"/>
<DeltaFormat value="32768"/>
</YDeviceTable>
</BaseAnchor>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def test_debugFeatureFile(self, designspace):
feature mark {
lookup mark2base {
pos base e
<anchor (wght=350:314 wght=450:314 wght=625:315) (wght=350:556 wght=450:556 wght=625:644)> mark @MC_top;
<anchor (wght=350:314 wght=450:403 wght=625:315) (wght=350:556 wght=450:567 wght=625:644)> mark @MC_top;
} mark2base;
} mark;
Expand Down

0 comments on commit ab1ed09

Please sign in to comment.