shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[varLib tests] Add composite glyph ‘atilde’ to TestFamily2

Browse Source
This commit is contained in:
Miguel Sousa 2017-03-06 01:21:03 -08:00
parent bbecfe38c4
commit 77144253b6
9 changed files with 90 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master0.ttx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.7"> <ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.8">
<GlyphOrder> <GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. --> <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
@ -14,24 +14,25 @@
<GlyphID id="8" name="f_t"/> <GlyphID id="8" name="f_t"/>
<GlyphID id="9" name="a.alt"/> <GlyphID id="9" name="a.alt"/>
<GlyphID id="10" name="A.sc"/> <GlyphID id="10" name="A.sc"/>
<GlyphID id="11" name="ampersand"/> <GlyphID id="11" name="atilde"/>
<GlyphID id="12" name="uni25CC"/> <GlyphID id="12" name="ampersand"/>
<GlyphID id="13" name="uni0303"/> <GlyphID id="13" name="uni25CC"/>
<GlyphID id="14" name="uni0308"/> <GlyphID id="14" name="uni0303"/>
<GlyphID id="15" name="uni0330"/> <GlyphID id="15" name="uni0308"/>
<GlyphID id="16" name="uni0324"/> <GlyphID id="16" name="uni0330"/>
<GlyphID id="17" name="uni0324"/>
</GlyphOrder> </GlyphOrder>
<head> <head>
<!-- Most of this table will be recalculated by the compiler --> <!-- Most of this table will be recalculated by the compiler -->
<tableVersion value="1.0"/> <tableVersion value="1.0"/>
<fontRevision value="2.02"/> <fontRevision value="2.02"/>
<checkSumAdjustment value="0x1593884f"/> <checkSumAdjustment value="0xbc719815"/>
<magicNumber value="0x5f0f3cf5"/> <magicNumber value="0x5f0f3cf5"/>
<flags value="00000000 00000001"/> <flags value="00000000 00000001"/>
<unitsPerEm value="1000"/> <unitsPerEm value="1000"/>
<created value="Thu Mar 2 22:23:11 2017"/> <created value="Mon Mar 6 09:06:52 2017"/>
<modified value="Thu Mar 2 22:23:11 2017"/> <modified value="Mon Mar 6 09:06:52 2017"/>
<xMin value="-160"/> <xMin value="-160"/>
<yMin value="-220"/> <yMin value="-220"/>
<xMax value="550"/> <xMax value="550"/>
@ -60,17 +61,17 @@
<reserved2 value="0"/> <reserved2 value="0"/>
<reserved3 value="0"/> <reserved3 value="0"/>
<metricDataFormat value="0"/> <metricDataFormat value="0"/>
<numberOfHMetrics value="14"/> <numberOfHMetrics value="15"/>
</hhea> </hhea>
<maxp> <maxp>
<!-- Most of this table will be recalculated by the compiler --> <!-- Most of this table will be recalculated by the compiler -->
<tableVersion value="0x10000"/> <tableVersion value="0x10000"/>
<numGlyphs value="17"/> <numGlyphs value="18"/>
<maxPoints value="123"/> <maxPoints value="123"/>
<maxContours value="12"/> <maxContours value="12"/>
<maxCompositePoints value="24"/> <maxCompositePoints value="58"/>
<maxCompositeContours value="2"/> <maxCompositeContours value="3"/>
<maxZones value="1"/> <maxZones value="1"/>
<maxTwilightPoints value="0"/> <maxTwilightPoints value="0"/>
<maxStorage value="0"/> <maxStorage value="0"/>
@ -78,7 +79,7 @@
<maxInstructionDefs value="0"/> <maxInstructionDefs value="0"/>
<maxStackElements value="0"/> <maxStackElements value="0"/>
<maxSizeOfInstructions value="0"/> <maxSizeOfInstructions value="0"/>
<maxComponentElements value="1"/> <maxComponentElements value="2"/>
<maxComponentDepth value="1"/> <maxComponentDepth value="1"/>
</maxp> </maxp>
@ -86,7 +87,7 @@
<!-- The fields 'usFirstCharIndex' and 'usLastCharIndex' <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
will be recalculated by the compiler --> will be recalculated by the compiler -->
<version value="4"/> <version value="4"/>
<xAvgCharWidth value="470"/> <xAvgCharWidth value="471"/>
<usWeightClass value="200"/> <usWeightClass value="200"/>
<usWidthClass value="5"/> <usWidthClass value="5"/>
<fsType value="00000000 00000000"/> <fsType value="00000000 00000000"/>
@ -142,6 +143,7 @@
<mtx name="a" width="486" lsb="60"/> <mtx name="a" width="486" lsb="60"/>
<mtx name="a.alt" width="540" lsb="54"/> <mtx name="a.alt" width="540" lsb="54"/>
<mtx name="ampersand" width="562" lsb="37"/> <mtx name="ampersand" width="562" lsb="37"/>
<mtx name="atilde" width="486" lsb="60"/>
<mtx name="d" width="540" lsb="54"/> <mtx name="d" width="540" lsb="54"/>
<mtx name="f" width="252" lsb="34"/> <mtx name="f" width="252" lsb="34"/>
<mtx name="f_t" width="518" lsb="34"/> <mtx name="f_t" width="518" lsb="34"/>
@ -166,6 +168,7 @@
<map code="0x66" name="f"/><!-- LATIN SMALL LETTER F --> <map code="0x66" name="f"/><!-- LATIN SMALL LETTER F -->
<map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N --> <map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N -->
<map code="0x74" name="t"/><!-- LATIN SMALL LETTER T --> <map code="0x74" name="t"/><!-- LATIN SMALL LETTER T -->
<map code="0xe3" name="atilde"/><!-- LATIN SMALL LETTER A WITH TILDE -->
<map code="0x303" name="uni0303"/><!-- COMBINING TILDE --> <map code="0x303" name="uni0303"/><!-- COMBINING TILDE -->
<map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS --> <map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS -->
<map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW --> <map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW -->
@ -181,6 +184,7 @@
<map code="0x66" name="f"/><!-- LATIN SMALL LETTER F --> <map code="0x66" name="f"/><!-- LATIN SMALL LETTER F -->
<map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N --> <map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N -->
<map code="0x74" name="t"/><!-- LATIN SMALL LETTER T --> <map code="0x74" name="t"/><!-- LATIN SMALL LETTER T -->
<map code="0xe3" name="atilde"/><!-- LATIN SMALL LETTER A WITH TILDE -->
<map code="0x303" name="uni0303"/><!-- COMBINING TILDE --> <map code="0x303" name="uni0303"/><!-- COMBINING TILDE -->
<map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS --> <map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS -->
<map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW --> <map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW -->
@ -433,6 +437,11 @@
<instructions/> <instructions/>
</TTGlyph> </TTGlyph>
<TTGlyph name="atilde" xMin="60" yMin="-12" xMax="404" yMax="706">
<component glyphName="a" x="0" y="0" flags="0x204"/>
<component glyphName="uni0303" x="242" y="0" flags="0x4"/>
</TTGlyph>
<TTGlyph name="d" xMin="54" yMin="-12" xMax="444" yMax="722"> <TTGlyph name="d" xMin="54" yMin="-12" xMax="444" yMax="722">
<contour> <contour>
<pt x="252" y="-12" on="1"/> <pt x="252" y="-12" on="1"/>

41
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily2-Master1.ttx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.7"> <ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.8">
<GlyphOrder> <GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. --> <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
@ -14,24 +14,25 @@
<GlyphID id="8" name="f_t"/> <GlyphID id="8" name="f_t"/>
<GlyphID id="9" name="a.alt"/> <GlyphID id="9" name="a.alt"/>
<GlyphID id="10" name="A.sc"/> <GlyphID id="10" name="A.sc"/>
<GlyphID id="11" name="ampersand"/> <GlyphID id="11" name="atilde"/>
<GlyphID id="12" name="uni25CC"/> <GlyphID id="12" name="ampersand"/>
<GlyphID id="13" name="uni0303"/> <GlyphID id="13" name="uni25CC"/>
<GlyphID id="14" name="uni0308"/> <GlyphID id="14" name="uni0303"/>
<GlyphID id="15" name="uni0330"/> <GlyphID id="15" name="uni0308"/>
<GlyphID id="16" name="uni0324"/> <GlyphID id="16" name="uni0330"/>
<GlyphID id="17" name="uni0324"/>
</GlyphOrder> </GlyphOrder>
<head> <head>
<!-- Most of this table will be recalculated by the compiler --> <!-- Most of this table will be recalculated by the compiler -->
<tableVersion value="1.0"/> <tableVersion value="1.0"/>
<fontRevision value="2.02"/> <fontRevision value="2.02"/>
<checkSumAdjustment value="0x4e99b130"/> <checkSumAdjustment value="0xf545c03c"/>
<magicNumber value="0x5f0f3cf5"/> <magicNumber value="0x5f0f3cf5"/>
<flags value="00000000 00000001"/> <flags value="00000000 00000001"/>
<unitsPerEm value="1000"/> <unitsPerEm value="1000"/>
<created value="Thu Mar 2 22:23:11 2017"/> <created value="Mon Mar 6 09:06:52 2017"/>
<modified value="Thu Mar 2 22:23:11 2017"/> <modified value="Mon Mar 6 09:06:52 2017"/>
<xMin value="-196"/> <xMin value="-196"/>
<yMin value="-228"/> <yMin value="-228"/>
<xMax value="706"/> <xMax value="706"/>
@ -60,17 +61,17 @@
<reserved2 value="0"/> <reserved2 value="0"/>
<reserved3 value="0"/> <reserved3 value="0"/>
<metricDataFormat value="0"/> <metricDataFormat value="0"/>
<numberOfHMetrics value="14"/> <numberOfHMetrics value="15"/>
</hhea> </hhea>
<maxp> <maxp>
<!-- Most of this table will be recalculated by the compiler --> <!-- Most of this table will be recalculated by the compiler -->
<tableVersion value="0x10000"/> <tableVersion value="0x10000"/>
<numGlyphs value="17"/> <numGlyphs value="18"/>
<maxPoints value="123"/> <maxPoints value="123"/>
<maxContours value="12"/> <maxContours value="12"/>
<maxCompositePoints value="24"/> <maxCompositePoints value="58"/>
<maxCompositeContours value="2"/> <maxCompositeContours value="3"/>
<maxZones value="1"/> <maxZones value="1"/>
<maxTwilightPoints value="0"/> <maxTwilightPoints value="0"/>
<maxStorage value="0"/> <maxStorage value="0"/>
@ -78,7 +79,7 @@
<maxInstructionDefs value="0"/> <maxInstructionDefs value="0"/>
<maxStackElements value="0"/> <maxStackElements value="0"/>
<maxSizeOfInstructions value="0"/> <maxSizeOfInstructions value="0"/>
<maxComponentElements value="1"/> <maxComponentElements value="2"/>
<maxComponentDepth value="1"/> <maxComponentDepth value="1"/>
</maxp> </maxp>
@ -86,7 +87,7 @@
<!-- The fields 'usFirstCharIndex' and 'usLastCharIndex' <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
will be recalculated by the compiler --> will be recalculated by the compiler -->
<version value="4"/> <version value="4"/>
<xAvgCharWidth value="541"/> <xAvgCharWidth value="540"/>
<usWeightClass value="900"/> <usWeightClass value="900"/>
<usWidthClass value="5"/> <usWidthClass value="5"/>
<fsType value="00000000 00000000"/> <fsType value="00000000 00000000"/>
@ -142,6 +143,7 @@
<mtx name="a" width="536" lsb="38"/> <mtx name="a" width="536" lsb="38"/>
<mtx name="a.alt" width="580" lsb="36"/> <mtx name="a.alt" width="580" lsb="36"/>
<mtx name="ampersand" width="690" lsb="21"/> <mtx name="ampersand" width="690" lsb="21"/>
<mtx name="atilde" width="536" lsb="38"/>
<mtx name="d" width="580" lsb="36"/> <mtx name="d" width="580" lsb="36"/>
<mtx name="f" width="360" lsb="22"/> <mtx name="f" width="360" lsb="22"/>
<mtx name="f_t" width="724" lsb="22"/> <mtx name="f_t" width="724" lsb="22"/>
@ -166,6 +168,7 @@
<map code="0x66" name="f"/><!-- LATIN SMALL LETTER F --> <map code="0x66" name="f"/><!-- LATIN SMALL LETTER F -->
<map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N --> <map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N -->
<map code="0x74" name="t"/><!-- LATIN SMALL LETTER T --> <map code="0x74" name="t"/><!-- LATIN SMALL LETTER T -->
<map code="0xe3" name="atilde"/><!-- LATIN SMALL LETTER A WITH TILDE -->
<map code="0x303" name="uni0303"/><!-- COMBINING TILDE --> <map code="0x303" name="uni0303"/><!-- COMBINING TILDE -->
<map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS --> <map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS -->
<map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW --> <map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW -->
@ -181,6 +184,7 @@
<map code="0x66" name="f"/><!-- LATIN SMALL LETTER F --> <map code="0x66" name="f"/><!-- LATIN SMALL LETTER F -->
<map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N --> <map code="0x6e" name="n"/><!-- LATIN SMALL LETTER N -->
<map code="0x74" name="t"/><!-- LATIN SMALL LETTER T --> <map code="0x74" name="t"/><!-- LATIN SMALL LETTER T -->
<map code="0xe3" name="atilde"/><!-- LATIN SMALL LETTER A WITH TILDE -->
<map code="0x303" name="uni0303"/><!-- COMBINING TILDE --> <map code="0x303" name="uni0303"/><!-- COMBINING TILDE -->
<map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS --> <map code="0x308" name="uni0308"/><!-- COMBINING DIAERESIS -->
<map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW --> <map code="0x324" name="uni0324"/><!-- COMBINING DIAERESIS BELOW -->
@ -433,6 +437,11 @@
<instructions/> <instructions/>
</TTGlyph> </TTGlyph>
<TTGlyph name="atilde" xMin="38" yMin="-12" xMax="482" yMax="746">
<component glyphName="a" x="0" y="0" flags="0x204"/>
<component glyphName="uni0303" x="266" y="0" flags="0x4"/>
</TTGlyph>
<TTGlyph name="d" xMin="36" yMin="-12" xMax="522" yMax="696"> <TTGlyph name="d" xMin="36" yMin="-12" xMax="522" yMax="696">
<contour> <contour>
<pt x="240" y="-12" on="1"/> <pt x="240" y="-12" on="1"/>

9
Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/atilde.glif Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="atilde" format="1">
<unicode hex="00E3"/>
<advance width="486"/>
<outline>
<component base="a"/>
<component base="tildecmb" xOffset="242"/>
</outline>
</glyph>

2
Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/glyphs/contents.plist
View File

@ -14,6 +14,8 @@
<string>a.alt.glif</string> <string>a.alt.glif</string>
<key>ampersand</key> <key>ampersand</key>
<string>ampersand.glif</string> <string>ampersand.glif</string>
<key>atilde</key>
<string>atilde.glif</string>
<key>circledotted</key> <key>circledotted</key>
<string>circledotted.glif</string> <string>circledotted.glif</string>
<key>d</key> <key>d</key>

1
Tests/varLib/data/master_ufo/TestFamily2-Master0.ufo/lib.plist
View File

@ -15,6 +15,7 @@
<string>f_t</string> <string>f_t</string>
<string>a.alt</string> <string>a.alt</string>
<string>A.sc</string> <string>A.sc</string>
<string>atilde</string>
<string>ampersand</string> <string>ampersand</string>
<string>circledotted</string> <string>circledotted</string>
<string>tildecmb</string> <string>tildecmb</string>

9
Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/atilde.glif Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<glyph name="atilde" format="1">
<unicode hex="00E3"/>
<advance width="536"/>
<outline>
<component base="a"/>
<component base="tildecmb" xOffset="266"/>
</outline>
</glyph>

2
Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/glyphs/contents.plist
View File

@ -14,6 +14,8 @@
<string>a.alt.glif</string> <string>a.alt.glif</string>
<key>ampersand</key> <key>ampersand</key>
<string>ampersand.glif</string> <string>ampersand.glif</string>
<key>atilde</key>
<string>atilde.glif</string>
<key>circledotted</key> <key>circledotted</key>
<string>circledotted.glif</string> <string>circledotted.glif</string>
<key>d</key> <key>d</key>

1
Tests/varLib/data/master_ufo/TestFamily2-Master1.ufo/lib.plist
View File

@ -15,6 +15,7 @@
<string>f_t</string> <string>f_t</string>
<string>a.alt</string> <string>a.alt</string>
<string>A.sc</string> <string>A.sc</string>
<string>atilde</string>
<string>ampersand</string> <string>ampersand</string>
<string>circledotted</string> <string>circledotted</string>
<string>tildecmb</string> <string>tildecmb</string>

20
Tests/varLib/data/test_results/Build3.ttx
View File

@ -43,7 +43,7 @@
</VarRegionList> </VarRegionList>
<!-- VarDataCount=1 --> <!-- VarDataCount=1 -->
<VarData index="0"> <VarData index="0">
<!-- ItemCount=17 --> <!-- ItemCount=18 -->
<NumShorts value="1"/> <NumShorts value="1"/>
<!-- VarRegionCount=1 --> <!-- VarRegionCount=1 -->
<VarRegionIndex index="0" value="0"/> <VarRegionIndex index="0" value="0"/>
@ -58,12 +58,13 @@
<Item index="8" value="[206]"/> <Item index="8" value="[206]"/>
<Item index="9" value="[40]"/> <Item index="9" value="[40]"/>
<Item index="10" value="[72]"/> <Item index="10" value="[72]"/>
<Item index="11" value="[128]"/> <Item index="11" value="[50]"/>
<Item index="12" value="[-18]"/> <Item index="12" value="[128]"/>
<Item index="13" value="[0]"/> <Item index="13" value="[-18]"/>
<Item index="14" value="[0]"/> <Item index="14" value="[0]"/>
<Item index="15" value="[0]"/> <Item index="15" value="[0]"/>
<Item index="16" value="[0]"/> <Item index="16" value="[0]"/>
<Item index="17" value="[0]"/>
</VarData> </VarData>
</VarStore> </VarStore>
</HVAR> </HVAR>
@ -481,6 +482,17 @@
<delta pt="21" x="0" y="0"/> <delta pt="21" x="0" y="0"/>
</tuple> </tuple>
</glyphVariations> </glyphVariations>
<glyphVariations glyph="atilde">
<tuple>
<coord axis="wght" value="1.0"/>
<delta pt="0" x="0" y="0"/>
<delta pt="1" x="24" y="0"/>
<delta pt="2" x="0" y="0"/>
<delta pt="3" x="50" y="0"/>
<delta pt="4" x="0" y="40"/>
<delta pt="5" x="0" y="0"/>
</tuple>
</glyphVariations>
<glyphVariations glyph="ampersand"> <glyphVariations glyph="ampersand">
<tuple> <tuple>
<coord axis="wght" value="1.0"/> <coord axis="wght" value="1.0"/>