-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #962 from justvanrossum/patch-1
Use MathGlyph's "strict" flag
- Loading branch information
Showing
19 changed files
with
289 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
tests/data/InstantiatorStrictMathGlyph/SquareOne.ufo/fontinfo.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>ascender</key> | ||
| <integer>750</integer> | ||
| <key>capHeight</key> | ||
| <integer>750</integer> | ||
| <key>descender</key> | ||
| <integer>-250</integer> | ||
| <key>familyName</key> | ||
| <string>Test Ufo</string> | ||
| <key>guidelines</key> | ||
| <array/> | ||
| <key>postscriptBlueValues</key> | ||
| <array/> | ||
| <key>postscriptFamilyBlues</key> | ||
| <array/> | ||
| <key>postscriptFamilyOtherBlues</key> | ||
| <array/> | ||
| <key>postscriptOtherBlues</key> | ||
| <array/> | ||
| <key>postscriptStemSnapH</key> | ||
| <array/> | ||
| <key>postscriptStemSnapV</key> | ||
| <array/> | ||
| <key>styleName</key> | ||
| <string>Bold</string> | ||
| <key>unitsPerEm</key> | ||
| <integer>1000</integer> | ||
| <key>xHeight</key> | ||
| <integer>500</integer> | ||
| </dict> | ||
| </plist> |
8 changes: 8 additions & 0 deletions
8
tests/data/InstantiatorStrictMathGlyph/SquareOne.ufo/glyphs/contents.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>test</key> | ||
| <string>test.glif</string> | ||
| </dict> | ||
| </plist> |
8 changes: 8 additions & 0 deletions
8
tests/data/InstantiatorStrictMathGlyph/SquareOne.ufo/glyphs/layerinfo.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>color</key> | ||
| <string>1,0.75,0,0.7</string> | ||
| </dict> | ||
| </plist> |
24 changes: 24 additions & 0 deletions
24
tests/data/InstantiatorStrictMathGlyph/SquareOne.ufo/glyphs/test.glif
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <glyph name="test" format="2"> | ||
| <advance width="500"/> | ||
| <outline> | ||
| <contour> | ||
| <point x="19" y="17" type="curve"/> | ||
| <point x="481" y="17" type="line"/> | ||
| <point x="481.0" y="17.0"/> | ||
| <point x="481.0" y="17.0"/> | ||
| <point x="481" y="17" type="curve"/> | ||
| <point x="481" y="479" type="line"/> | ||
| <point x="481.0" y="479.0"/> | ||
| <point x="481.0" y="479.0"/> | ||
| <point x="481" y="479" type="curve"/> | ||
| <point x="19" y="479" type="line"/> | ||
| <point x="19.0" y="479.0"/> | ||
| <point x="19.0" y="479.0"/> | ||
| <point x="19" y="479" type="curve"/> | ||
| <point x="19" y="17" type="line"/> | ||
| <point x="19.0" y="17.0"/> | ||
| <point x="19.0" y="17.0"/> | ||
| </contour> | ||
| </outline> | ||
| </glyph> |
10 changes: 10 additions & 0 deletions
10
tests/data/InstantiatorStrictMathGlyph/SquareOne.ufo/layercontents.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <array> | ||
| <array> | ||
| <string>foreground</string> | ||
| <string>glyphs</string> | ||
| </array> | ||
| </array> | ||
| </plist> |
28 changes: 28 additions & 0 deletions
28
tests/data/InstantiatorStrictMathGlyph/SquareOne.ufo/lib.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>com.typemytype.robofont.compileSettings.autohint</key> | ||
| <true/> | ||
| <key>com.typemytype.robofont.compileSettings.checkOutlines</key> | ||
| <false/> | ||
| <key>com.typemytype.robofont.compileSettings.createDummyDSIG</key> | ||
| <true/> | ||
| <key>com.typemytype.robofont.compileSettings.decompose</key> | ||
| <false/> | ||
| <key>com.typemytype.robofont.compileSettings.generateFormat</key> | ||
| <integer>0</integer> | ||
| <key>com.typemytype.robofont.compileSettings.releaseMode</key> | ||
| <false/> | ||
| <key>com.typemytype.robofont.italicSlantOffset</key> | ||
| <integer>0</integer> | ||
| <key>com.typemytype.robofont.segmentType</key> | ||
| <string>curve</string> | ||
| <key>com.typemytype.robofont.shouldAddPointsInSplineConversion</key> | ||
| <integer>1</integer> | ||
| <key>public.glyphOrder</key> | ||
| <array> | ||
| <string>test</string> | ||
| </array> | ||
| </dict> | ||
| </plist> |
10 changes: 10 additions & 0 deletions
10
tests/data/InstantiatorStrictMathGlyph/SquareOne.ufo/metainfo.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>creator</key> | ||
| <string>com.github.fonttools.ufoLib</string> | ||
| <key>formatVersion</key> | ||
| <integer>3</integer> | ||
| </dict> | ||
| </plist> |
34 changes: 34 additions & 0 deletions
34
tests/data/InstantiatorStrictMathGlyph/SquareTwo.ufo/fontinfo.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>ascender</key> | ||
| <integer>750</integer> | ||
| <key>capHeight</key> | ||
| <integer>750</integer> | ||
| <key>descender</key> | ||
| <integer>-250</integer> | ||
| <key>familyName</key> | ||
| <string>Test Ufo</string> | ||
| <key>guidelines</key> | ||
| <array/> | ||
| <key>postscriptBlueValues</key> | ||
| <array/> | ||
| <key>postscriptFamilyBlues</key> | ||
| <array/> | ||
| <key>postscriptFamilyOtherBlues</key> | ||
| <array/> | ||
| <key>postscriptOtherBlues</key> | ||
| <array/> | ||
| <key>postscriptStemSnapH</key> | ||
| <array/> | ||
| <key>postscriptStemSnapV</key> | ||
| <array/> | ||
| <key>styleName</key> | ||
| <string>Regular</string> | ||
| <key>unitsPerEm</key> | ||
| <integer>1000</integer> | ||
| <key>xHeight</key> | ||
| <integer>500</integer> | ||
| </dict> | ||
| </plist> |
8 changes: 8 additions & 0 deletions
8
tests/data/InstantiatorStrictMathGlyph/SquareTwo.ufo/glyphs/contents.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>test</key> | ||
| <string>test.glif</string> | ||
| </dict> | ||
| </plist> |
8 changes: 8 additions & 0 deletions
8
tests/data/InstantiatorStrictMathGlyph/SquareTwo.ufo/glyphs/layerinfo.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>color</key> | ||
| <string>1,0.75,0,0.7</string> | ||
| </dict> | ||
| </plist> |
24 changes: 24 additions & 0 deletions
24
tests/data/InstantiatorStrictMathGlyph/SquareTwo.ufo/glyphs/test.glif
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <glyph name="test" format="2"> | ||
| <advance width="500"/> | ||
| <outline> | ||
| <contour> | ||
| <point x="219" y="217" type="curve"/> | ||
| <point x="281" y="217" type="line"/> | ||
| <point x="281.0" y="217.0"/> | ||
| <point x="281.0" y="217.0"/> | ||
| <point x="281" y="217" type="curve"/> | ||
| <point x="281" y="279" type="line"/> | ||
| <point x="281.0" y="279.0"/> | ||
| <point x="281.0" y="279.0"/> | ||
| <point x="281" y="279" type="curve"/> | ||
| <point x="219" y="279" type="line"/> | ||
| <point x="219.0" y="279.0"/> | ||
| <point x="219.0" y="279.0"/> | ||
| <point x="219" y="279" type="curve"/> | ||
| <point x="219" y="217" type="line"/> | ||
| <point x="219.0" y="217.0"/> | ||
| <point x="219.0" y="217.0"/> | ||
| </contour> | ||
| </outline> | ||
| </glyph> |
10 changes: 10 additions & 0 deletions
10
tests/data/InstantiatorStrictMathGlyph/SquareTwo.ufo/layercontents.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <array> | ||
| <array> | ||
| <string>foreground</string> | ||
| <string>glyphs</string> | ||
| </array> | ||
| </array> | ||
| </plist> |
28 changes: 28 additions & 0 deletions
28
tests/data/InstantiatorStrictMathGlyph/SquareTwo.ufo/lib.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>com.typemytype.robofont.compileSettings.autohint</key> | ||
| <true/> | ||
| <key>com.typemytype.robofont.compileSettings.checkOutlines</key> | ||
| <false/> | ||
| <key>com.typemytype.robofont.compileSettings.createDummyDSIG</key> | ||
| <true/> | ||
| <key>com.typemytype.robofont.compileSettings.decompose</key> | ||
| <false/> | ||
| <key>com.typemytype.robofont.compileSettings.generateFormat</key> | ||
| <integer>0</integer> | ||
| <key>com.typemytype.robofont.compileSettings.releaseMode</key> | ||
| <false/> | ||
| <key>com.typemytype.robofont.italicSlantOffset</key> | ||
| <integer>0</integer> | ||
| <key>com.typemytype.robofont.segmentType</key> | ||
| <string>curve</string> | ||
| <key>com.typemytype.robofont.shouldAddPointsInSplineConversion</key> | ||
| <integer>1</integer> | ||
| <key>public.glyphOrder</key> | ||
| <array> | ||
| <string>test</string> | ||
| </array> | ||
| </dict> | ||
| </plist> |
10 changes: 10 additions & 0 deletions
10
tests/data/InstantiatorStrictMathGlyph/SquareTwo.ufo/metainfo.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>creator</key> | ||
| <string>com.github.fonttools.ufoLib</string> | ||
| <key>formatVersion</key> | ||
| <integer>3</integer> | ||
| </dict> | ||
| </plist> |
26 changes: 26 additions & 0 deletions
26
tests/data/InstantiatorStrictMathGlyph/StrictMathGlyph.designspace
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <designspace format="4.1"> | ||
| <axes> | ||
| <axis tag="wght" name="Weight" minimum="100" maximum="1000" default="100"/> | ||
| </axes> | ||
| <sources> | ||
| <source filename="SquareOne.ufo" familyname="InstatiatorStrictMathGlyph" stylename="Regular"> | ||
| <location> | ||
| <dimension name="Weight" xvalue="100"/> | ||
| </location> | ||
| </source> | ||
| <source filename="SquareTwo.ufo" familyname="InstatiatorStrictMathGlyph" stylename="Bold"> | ||
| <location> | ||
| <dimension name="Weight" xvalue="1000"/> | ||
| </location> | ||
| </source> | ||
| </sources> | ||
|
|
||
| <instances> | ||
| <instance filename="SquareIntermediate.ufo" familyname="InstatiatorStrictMathGlyph" stylename="Medium"> | ||
| <location> | ||
| <dimension name="Weight" xvalue="500"/> | ||
| </location> | ||
| </instance> | ||
| </instances> | ||
| </designspace> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters