Commit 99630427 authored by Nikolaus Waxweiler's avatar Nikolaus Waxweiler

Remove .subs glyphs, move *inferior glyphs down, use for sinf

The subs and sinf feature can use the same glyphs. Moving the *inferior glyphs down makes it possible to stack *superior glyphs on top.
parent 54d9fe21
Pipeline #79765 failed with stage
in 1 minute and 12 seconds
......@@ -156,16 +156,16 @@ sub nine by nineinferior;
feature sinf {
# automatic
sub zero by zero.subs;
sub one by one.subs;
sub two by two.subs;
sub three by three.subs;
sub four by four.subs;
sub five by five.subs;
sub six by six.subs;
sub seven by seven.subs;
sub eight by eight.subs;
sub nine by nine.subs;
sub zero by zeroinferior;
sub one by oneinferior;
sub two by twoinferior;
sub three by threeinferior;
sub four by fourinferior;
sub five by fiveinferior;
sub six by sixinferior;
sub seven by seveninferior;
sub eight by eightinferior;
sub nine by nineinferior;
} sinf;
......
......@@ -1062,8 +1062,6 @@
<string>eight.numr.glif</string>
<key>eight.osf</key>
<string>eight.osf.glif</string>
<key>eight.subs</key>
<string>eight.subs.glif</string>
<key>eight.tf</key>
<string>eight.tf.glif</string>
<key>eight.tosf</key>
......@@ -1164,8 +1162,6 @@
<string>five.numr.glif</string>
<key>five.osf</key>
<string>five.osf.glif</string>
<key>five.subs</key>
<string>five.subs.glif</string>
<key>five.tf</key>
<string>five.tf.glif</string>
<key>five.tosf</key>
......@@ -1190,8 +1186,6 @@
<string>four.numr.glif</string>
<key>four.osf</key>
<string>four.osf.glif</string>
<key>four.subs</key>
<string>four.subs.glif</string>
<key>four.tf</key>
<string>four.tf.glif</string>
<key>four.tosf</key>
......@@ -1508,8 +1502,6 @@
<string>nine.numr.glif</string>
<key>nine.osf</key>
<string>nine.osf.glif</string>
<key>nine.subs</key>
<string>nine.subs.glif</string>
<key>nine.tf</key>
<string>nine.tf.glif</string>
<key>nine.tosf</key>
......@@ -1622,8 +1614,6 @@
<string>one.numr.glif</string>
<key>one.osf</key>
<string>one.osf.glif</string>
<key>one.subs</key>
<string>one.subs.glif</string>
<key>one.tf</key>
<string>one.tf.glif</string>
<key>one.tosf</key>
......@@ -1830,8 +1820,6 @@
<string>seven.numr.glif</string>
<key>seven.osf</key>
<string>seven.osf.glif</string>
<key>seven.subs</key>
<string>seven.subs.glif</string>
<key>seven.tf</key>
<string>seven.tf.glif</string>
<key>seven.tosf</key>
......@@ -1856,8 +1844,6 @@
<string>six.numr.glif</string>
<key>six.osf</key>
<string>six.osf.glif</string>
<key>six.subs</key>
<string>six.subs.glif</string>
<key>six.tf</key>
<string>six.tf.glif</string>
<key>six.tosf</key>
......@@ -1924,8 +1910,6 @@
<string>three.numr.glif</string>
<key>three.osf</key>
<string>three.osf.glif</string>
<key>three.subs</key>
<string>three.subs.glif</string>
<key>three.tf</key>
<string>three.tf.glif</string>
<key>three.tosf</key>
......@@ -1976,8 +1960,6 @@
<string>two.numr.glif</string>
<key>two.osf</key>
<string>two.osf.glif</string>
<key>two.subs</key>
<string>two.subs.glif</string>
<key>two.tf</key>
<string>two.tf.glif</string>
<key>two.tosf</key>
......@@ -2152,8 +2134,6 @@
<string>zero.osf.glif</string>
<key>zero.osf.zero</key>
<string>zero.osf.zero.glif</string>
<key>zero.subs</key>
<string>zero.subs.glif</string>
<key>zero.tf</key>
<string>zero.tf.glif</string>
<key>zero.tf.zero</key>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="eight.subs" format="2">
<advance width="469"/>
<outline>
<component base="eight.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>eight.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>eight.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="469"/>
<unicode hex="2088"/>
<outline>
<component base="eight.dnom" yOffset="-100"/>
<component base="eight.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="five.subs" format="2">
<advance width="448"/>
<outline>
<component base="five.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>five.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>five.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="448"/>
<unicode hex="2085"/>
<outline>
<component base="five.dnom" yOffset="-100"/>
<component base="five.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="four.subs" format="2">
<advance width="478"/>
<outline>
<component base="four.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>four.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>four.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="478"/>
<unicode hex="2084"/>
<outline>
<component base="four.dnom" yOffset="-100"/>
<component base="four.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
......@@ -1066,8 +1066,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.tosf</key>
......@@ -1168,8 +1166,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.tosf</key>
......@@ -1194,8 +1190,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.tosf</key>
......@@ -1512,8 +1506,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.tosf</key>
......@@ -1626,8 +1618,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.tosf</key>
......@@ -1834,8 +1824,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.tosf</key>
......@@ -1860,8 +1848,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.tosf</key>
......@@ -1928,8 +1914,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.tosf</key>
......@@ -1980,8 +1964,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.osf</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.tosf</key>
......@@ -2156,8 +2138,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.osf.zero</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.subs</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.tf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.tf.zero</key>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="nine.subs" format="2">
<advance width="462"/>
<outline>
<component base="nine.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>nine.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>nine.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="462"/>
<unicode hex="2089"/>
<outline>
<component base="nine.dnom" yOffset="-100"/>
<component base="nine.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one.subs" format="2">
<advance width="381"/>
<outline>
<component base="one.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>one.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>one.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="381"/>
<unicode hex="2081"/>
<outline>
<component base="one.dnom" yOffset="-100"/>
<component base="one.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="seven.subs" format="2">
<advance width="403"/>
<outline>
<component base="seven.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>seven.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>seven.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="403"/>
<unicode hex="2087"/>
<outline>
<component base="seven.dnom" yOffset="-100"/>
<component base="seven.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="six.subs" format="2">
<advance width="462"/>
<outline>
<component base="six.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>six.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>six.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="462"/>
<unicode hex="2086"/>
<outline>
<component base="six.dnom" yOffset="-100"/>
<component base="six.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="three.subs" format="2">
<advance width="435"/>
<outline>
<component base="three.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>three.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>three.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="435"/>
<unicode hex="2083"/>
<outline>
<component base="three.dnom" yOffset="-100"/>
<component base="three.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="two.subs" format="2">
<advance width="438"/>
<outline>
<component base="two.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>two.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>two.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="438"/>
<unicode hex="2082"/>
<outline>
<component base="two.dnom" yOffset="-100"/>
<component base="two.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="zero.subs" format="2">
<advance width="493"/>
<outline>
<component base="zero.dnom" yOffset="-180"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>zero.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>zero.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="493"/>
<unicode hex="2080"/>
<outline>
<component base="zero.dnom" yOffset="-100"/>
<component base="zero.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
......@@ -1321,16 +1321,6 @@
<string>seveninferior</string>
<string>eightinferior</string>
<string>nineinferior</string>
<string>zero.subs</string>
<string>one.subs</string>
<string>two.subs</string>
<string>three.subs</string>
<string>four.subs</string>
<string>five.subs</string>
<string>six.subs</string>
<string>seven.subs</string>
<string>eight.subs</string>
<string>nine.subs</string>
<string>zero.dnom</string>
<string>one.dnom</string>
<string>two.dnom</string>
......
......@@ -156,16 +156,16 @@ sub nine by nineinferior;
feature sinf {
# automatic
sub zero by zero.subs;
sub one by one.subs;
sub two by two.subs;
sub three by three.subs;
sub four by four.subs;
sub five by five.subs;
sub six by six.subs;
sub seven by seven.subs;
sub eight by eight.subs;
sub nine by nine.subs;
sub zero by zeroinferior;
sub one by oneinferior;
sub two by twoinferior;
sub three by threeinferior;
sub four by fourinferior;
sub five by fiveinferior;
sub six by sixinferior;
sub seven by seveninferior;
sub eight by eightinferior;
sub nine by nineinferior;
} sinf;
......
......@@ -1062,8 +1062,6 @@
<string>eight.numr.glif</string>
<key>eight.osf</key>
<string>eight.osf.glif</string>
<key>eight.subs</key>
<string>eight.subs.glif</string>
<key>eight.tf</key>
<string>eight.tf.glif</string>
<key>eight.tosf</key>
......@@ -1164,8 +1162,6 @@
<string>five.numr.glif</string>
<key>five.osf</key>
<string>five.osf.glif</string>
<key>five.subs</key>
<string>five.subs.glif</string>
<key>five.tf</key>
<string>five.tf.glif</string>
<key>five.tosf</key>
......@@ -1190,8 +1186,6 @@
<string>four.numr.glif</string>
<key>four.osf</key>
<string>four.osf.glif</string>
<key>four.subs</key>
<string>four.subs.glif</string>
<key>four.tf</key>
<string>four.tf.glif</string>
<key>four.tosf</key>
......@@ -1508,8 +1502,6 @@
<string>nine.numr.glif</string>
<key>nine.osf</key>
<string>nine.osf.glif</string>
<key>nine.subs</key>
<string>nine.subs.glif</string>
<key>nine.tf</key>
<string>nine.tf.glif</string>
<key>nine.tosf</key>
......@@ -1622,8 +1614,6 @@
<string>one.numr.glif</string>
<key>one.osf</key>
<string>one.osf.glif</string>
<key>one.subs</key>
<string>one.subs.glif</string>
<key>one.tf</key>
<string>one.tf.glif</string>
<key>one.tosf</key>
......@@ -1830,8 +1820,6 @@
<string>seven.numr.glif</string>
<key>seven.osf</key>
<string>seven.osf.glif</string>
<key>seven.subs</key>
<string>seven.subs.glif</string>
<key>seven.tf</key>
<string>seven.tf.glif</string>
<key>seven.tosf</key>
......@@ -1856,8 +1844,6 @@
<string>six.numr.glif</string>
<key>six.osf</key>
<string>six.osf.glif</string>
<key>six.subs</key>
<string>six.subs.glif</string>
<key>six.tf</key>
<string>six.tf.glif</string>
<key>six.tosf</key>
......@@ -1924,8 +1910,6 @@
<string>three.numr.glif</string>
<key>three.osf</key>
<string>three.osf.glif</string>
<key>three.subs</key>
<string>three.subs.glif</string>
<key>three.tf</key>
<string>three.tf.glif</string>
<key>three.tosf</key>
......@@ -1976,8 +1960,6 @@
<string>two.numr.glif</string>
<key>two.osf</key>
<string>two.osf.glif</string>
<key>two.subs</key>
<string>two.subs.glif</string>
<key>two.tf</key>
<string>two.tf.glif</string>
<key>two.tosf</key>
......@@ -2152,8 +2134,6 @@
<string>zero.osf.glif</string>
<key>zero.osf.zero</key>
<string>zero.osf.zero.glif</string>
<key>zero.subs</key>
<string>zero.subs.glif</string>
<key>zero.tf</key>
<string>zero.tf.glif</string>
<key>zero.tf.zero</key>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="eight.subs" format="2">
<advance width="431"/>
<outline>
<component base="eight.dnom" yOffset="-170"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>eight.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>eight.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="431"/>
<unicode hex="2088"/>
<outline>
<component base="eight.dnom" yOffset="-100"/>
<component base="eight.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="five.subs" format="2">
<advance width="400"/>
<outline>
<component base="five.dnom" yOffset="-170"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>five.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>five.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="400"/>
<unicode hex="2085"/>
<outline>
<component base="five.dnom" yOffset="-100"/>
<component base="five.dnom" yOffset="-217"/>
</outline>
<lib>
<dict>
......
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="four.subs" format="2">
<advance width="425"/>
<outline>
<component base="four.dnom" yOffset="-170"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>four.dnom</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>four.dnom</string>
</dict>
</lib>
</glyph>
......@@ -3,7 +3,7 @@
<advance width="425"/>
<unicode hex="2084"/>
<outline>
<component base="four.dnom" yOffset="-100"/>
<component base="four.dnom" yOffset="-217"/>
</outline>