Commit 54d9fe21 authored by Nikolaus Waxweiler's avatar Nikolaus Waxweiler

Remove .lf indirection of proportional numerals

parent 02856e6e
......@@ -396,36 +396,6 @@ sub circumflexcomb_acutecomb by circumflexcomb_acutecomb.case;
sub circumflexcomb_gravecomb by circumflexcomb_gravecomb.case;
sub circumflexcomb_hookabovecomb by circumflexcomb_hookabovecomb.case;
sub circumflexcomb_tildecomb by circumflexcomb_tildecomb.case;
sub zero.osf by zero.lf;
sub one.osf by one.lf;
sub two.osf by two.lf;
sub three.osf by three.lf;
sub four.osf by four.lf;
sub five.osf by five.lf;
sub six.osf by six.lf;
sub seven.osf by seven.lf;
sub eight.osf by eight.lf;
sub nine.osf by nine.lf;
sub zero.tf by zero.lf;
sub one.tf by one.lf;
sub two.tf by two.lf;
sub three.tf by three.lf;
sub four.tf by four.lf;
sub five.tf by five.lf;
sub six.tf by six.lf;
sub seven.tf by seven.lf;
sub eight.tf by eight.lf;
sub nine.tf by nine.lf;
sub zero.tosf by zero.lf;
sub one.tosf by one.lf;
sub two.tosf by two.lf;
sub three.tosf by three.lf;
sub four.tosf by four.lf;
sub five.tosf by five.lf;
sub six.tosf by six.lf;
sub seven.tosf by seven.lf;
sub eight.tosf by eight.lf;
sub nine.tosf by nine.lf;
} case;
......@@ -441,7 +411,6 @@ sub f l by fl;
feature zero {
# automatic
sub zero.lf by zero.lf.zero;
sub zero.osf by zero.osf.zero;
sub zero.tf by zero.tf.zero;
sub zero.tosf by zero.tosf.zero;
......
......@@ -1058,8 +1058,6 @@
<string>eight.glif</string>
<key>eight.dnom</key>
<string>eight.dnom.glif</string>
<key>eight.lf</key>
<string>eight.lf.glif</string>
<key>eight.numr</key>
<string>eight.numr.glif</string>
<key>eight.osf</key>
......@@ -1162,8 +1160,6 @@
<string>five.glif</string>
<key>five.dnom</key>
<string>five.dnom.glif</string>
<key>five.lf</key>
<string>five.lf.glif</string>
<key>five.numr</key>
<string>five.numr.glif</string>
<key>five.osf</key>
......@@ -1190,8 +1186,6 @@
<string>four.glif</string>
<key>four.dnom</key>
<string>four.dnom.glif</string>
<key>four.lf</key>
<string>four.lf.glif</string>
<key>four.numr</key>
<string>four.numr.glif</string>
<key>four.osf</key>
......@@ -1510,8 +1504,6 @@
<string>nine.glif</string>
<key>nine.dnom</key>
<string>nine.dnom.glif</string>
<key>nine.lf</key>
<string>nine.lf.glif</string>
<key>nine.numr</key>
<string>nine.numr.glif</string>
<key>nine.osf</key>
......@@ -1626,8 +1618,6 @@
<string>one.glif</string>
<key>one.dnom</key>
<string>one.dnom.glif</string>
<key>one.lf</key>
<string>one.lf.glif</string>
<key>one.numr</key>
<string>one.numr.glif</string>
<key>one.osf</key>
......@@ -1836,8 +1826,6 @@
<string>seven.glif</string>
<key>seven.dnom</key>
<string>seven.dnom.glif</string>
<key>seven.lf</key>
<string>seven.lf.glif</string>
<key>seven.numr</key>
<string>seven.numr.glif</string>
<key>seven.osf</key>
......@@ -1864,8 +1852,6 @@
<string>six.glif</string>
<key>six.dnom</key>
<string>six.dnom.glif</string>
<key>six.lf</key>
<string>six.lf.glif</string>
<key>six.numr</key>
<string>six.numr.glif</string>
<key>six.osf</key>
......@@ -1934,8 +1920,6 @@
<string>three.glif</string>
<key>three.dnom</key>
<string>three.dnom.glif</string>
<key>three.lf</key>
<string>three.lf.glif</string>
<key>three.numr</key>
<string>three.numr.glif</string>
<key>three.osf</key>
......@@ -1988,8 +1972,6 @@
<string>two.glif</string>
<key>two.dnom</key>
<string>two.dnom.glif</string>
<key>two.lf</key>
<string>two.lf.glif</string>
<key>two.numr</key>
<string>two.numr.glif</string>
<key>two.osf</key>
......@@ -2164,10 +2146,6 @@
<string>zero.glif</string>
<key>zero.dnom</key>
<string>zero.dnom.glif</string>
<key>zero.lf</key>
<string>zero.lf.glif</string>
<key>zero.lf.zero</key>
<string>zero.lf.zero.glif</string>
<key>zero.numr</key>
<string>zero.numr.glif</string>
<key>zero.osf</key>
......
......@@ -3,14 +3,51 @@
<advance width="603"/>
<unicode hex="0038"/>
<outline>
<component base="eight.lf"/>
<contour>
<point x="298" y="-10" type="curve" smooth="yes"/>
<point x="468" y="-10"/>
<point x="580" y="76"/>
<point x="580" y="203" type="curve" smooth="yes"/>
<point x="580" y="434"/>
<point x="212" y="379"/>
<point x="212" y="502" type="curve" smooth="yes"/>
<point x="212" y="539"/>
<point x="246" y="566"/>
<point x="300" y="566" type="curve" smooth="yes"/>
<point x="354" y="566"/>
<point x="389" y="539"/>
<point x="389" y="497" type="curve" smooth="yes"/>
<point x="389" y="454"/>
<point x="351" y="424"/>
<point x="295" y="419" type="curve"/>
<point x="412" y="359" type="line"/>
<point x="505" y="393"/>
<point x="557" y="455"/>
<point x="557" y="529" type="curve" smooth="yes"/>
<point x="557" y="634"/>
<point x="455" y="704"/>
<point x="309" y="704" type="curve" smooth="yes"/>
<point x="149" y="704"/>
<point x="44" y="619"/>
<point x="44" y="493" type="curve" smooth="yes"/>
<point x="44" y="257"/>
<point x="412" y="311"/>
<point x="412" y="193" type="curve" smooth="yes"/>
<point x="412" y="155"/>
<point x="373" y="128"/>
<point x="309" y="128" type="curve" smooth="yes"/>
<point x="239" y="128"/>
<point x="193" y="162"/>
<point x="193" y="215" type="curve" smooth="yes"/>
<point x="193" y="264"/>
<point x="233" y="292"/>
<point x="303" y="294" type="curve"/>
<point x="204" y="357" type="line"/>
<point x="92" y="337"/>
<point x="25" y="273"/>
<point x="25" y="183" type="curve" smooth="yes"/>
<point x="25" y="68"/>
<point x="136" y="-10"/>
</contour>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>eight.lf</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>eight.lf</string>
</dict>
</lib>
</glyph>
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="eight.lf" format="2">
<advance width="603"/>
<outline>
<contour>
<point x="298" y="-10" type="curve" smooth="yes"/>
<point x="468" y="-10"/>
<point x="580" y="76"/>
<point x="580" y="203" type="curve" smooth="yes"/>
<point x="580" y="434"/>
<point x="212" y="379"/>
<point x="212" y="502" type="curve" smooth="yes"/>
<point x="212" y="539"/>
<point x="246" y="566"/>
<point x="300" y="566" type="curve" smooth="yes"/>
<point x="354" y="566"/>
<point x="389" y="539"/>
<point x="389" y="497" type="curve" smooth="yes"/>
<point x="389" y="454"/>
<point x="351" y="424"/>
<point x="295" y="419" type="curve"/>
<point x="412" y="359" type="line"/>
<point x="505" y="393"/>
<point x="557" y="455"/>
<point x="557" y="529" type="curve" smooth="yes"/>
<point x="557" y="634"/>
<point x="455" y="704"/>
<point x="309" y="704" type="curve" smooth="yes"/>
<point x="149" y="704"/>
<point x="44" y="619"/>
<point x="44" y="493" type="curve" smooth="yes"/>
<point x="44" y="257"/>
<point x="412" y="311"/>
<point x="412" y="193" type="curve" smooth="yes"/>
<point x="412" y="155"/>
<point x="373" y="128"/>
<point x="309" y="128" type="curve" smooth="yes"/>
<point x="239" y="128"/>
<point x="193" y="162"/>
<point x="193" y="215" type="curve" smooth="yes"/>
<point x="193" y="264"/>
<point x="233" y="292"/>
<point x="303" y="294" type="curve"/>
<point x="204" y="357" type="line"/>
<point x="92" y="337"/>
<point x="25" y="273"/>
<point x="25" y="183" type="curve" smooth="yes"/>
<point x="25" y="68"/>
<point x="136" y="-10"/>
</contour>
</outline>
</glyph>
......@@ -3,14 +3,38 @@
<advance width="566"/>
<unicode hex="0035"/>
<outline>
<component base="five.lf"/>
<contour>
<point x="243" y="-10" type="curve" smooth="yes"/>
<point x="426" y="-10"/>
<point x="543" y="80"/>
<point x="543" y="230" type="curve" smooth="yes"/>
<point x="543" y="362"/>
<point x="449" y="436"/>
<point x="281" y="436" type="curve" smooth="yes"/>
<point x="238" y="436"/>
<point x="216" y="431"/>
<point x="196" y="418" type="curve"/>
<point x="239" y="365" type="line"/>
<point x="247" y="543" type="line"/>
<point x="506" y="543" type="line"/>
<point x="506" y="694" type="line"/>
<point x="78" y="694" type="line"/>
<point x="60" y="287" type="line"/>
<point x="103" y="295"/>
<point x="158" y="301"/>
<point x="199" y="301" type="curve" smooth="yes"/>
<point x="303" y="301"/>
<point x="363" y="268"/>
<point x="363" y="212" type="curve" smooth="yes"/>
<point x="363" y="165"/>
<point x="320" y="140"/>
<point x="242" y="140" type="curve" smooth="yes"/>
<point x="182" y="140"/>
<point x="115" y="154"/>
<point x="65" y="178" type="curve"/>
<point x="18" y="42" type="line"/>
<point x="85" y="8"/>
<point x="161" y="-10"/>
</contour>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>five.lf</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>five.lf</string>
</dict>
</lib>
</glyph>
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="five.lf" format="2">
<advance width="566"/>
<outline>
<contour>
<point x="243" y="-10" type="curve" smooth="yes"/>
<point x="426" y="-10"/>
<point x="543" y="80"/>
<point x="543" y="230" type="curve" smooth="yes"/>
<point x="543" y="362"/>
<point x="449" y="436"/>
<point x="281" y="436" type="curve" smooth="yes"/>
<point x="238" y="436"/>
<point x="216" y="431"/>
<point x="196" y="418" type="curve"/>
<point x="239" y="365" type="line"/>
<point x="247" y="543" type="line"/>
<point x="506" y="543" type="line"/>
<point x="506" y="694" type="line"/>
<point x="78" y="694" type="line"/>
<point x="60" y="287" type="line"/>
<point x="103" y="295"/>
<point x="158" y="301"/>
<point x="199" y="301" type="curve" smooth="yes"/>
<point x="303" y="301"/>
<point x="363" y="268"/>
<point x="363" y="212" type="curve" smooth="yes"/>
<point x="363" y="165"/>
<point x="320" y="140"/>
<point x="242" y="140" type="curve" smooth="yes"/>
<point x="182" y="140"/>
<point x="115" y="154"/>
<point x="65" y="178" type="curve"/>
<point x="18" y="42" type="line"/>
<point x="85" y="8"/>
<point x="161" y="-10"/>
</contour>
</outline>
</glyph>
......@@ -3,14 +3,19 @@
<advance width="622"/>
<unicode hex="0034"/>
<outline>
<component base="four.lf"/>
<contour>
<point x="322" y="-5" type="line"/>
<point x="491" y="-5" type="line"/>
<point x="491" y="694" type="line"/>
<point x="327" y="694" type="line"/>
<point x="4" y="215" type="line"/>
<point x="4" y="124" type="line"/>
<point x="613" y="124" type="line"/>
<point x="613" y="270" type="line"/>
<point x="92" y="272" type="line"/>
<point x="142" y="217" type="line"/>
<point x="343" y="534" type="line"/>
<point x="322" y="583" type="line"/>
</contour>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>four.lf</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>four.lf</string>
</dict>
</lib>
</glyph>
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="four.lf" format="2">
<advance width="622"/>
<outline>
<contour>
<point x="322" y="-5" type="line"/>
<point x="491" y="-5" type="line"/>
<point x="491" y="694" type="line"/>
<point x="327" y="694" type="line"/>
<point x="4" y="215" type="line"/>
<point x="4" y="124" type="line"/>
<point x="613" y="124" type="line"/>
<point x="613" y="270" type="line"/>
<point x="92" y="272" type="line"/>
<point x="142" y="217" type="line"/>
<point x="343" y="534" type="line"/>
<point x="322" y="583" type="line"/>
</contour>
</outline>
</glyph>
......@@ -1062,8 +1062,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.osf</key>
......@@ -1166,8 +1164,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.osf</key>
......@@ -1194,8 +1190,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.osf</key>
......@@ -1514,8 +1508,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.osf</key>
......@@ -1630,8 +1622,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
......@@ -1840,8 +1830,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.osf</key>
......@@ -1868,8 +1856,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.osf</key>
......@@ -1938,8 +1924,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.osf</key>
......@@ -1992,8 +1976,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.osf</key>
......@@ -2168,10 +2150,6 @@
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.dnom</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.lf</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.lf.zero</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.numr</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.osf</key>
......
......@@ -3,14 +3,6 @@
<advance width="600"/>
<unicode hex="0039"/>
<outline>
<component base="nine.lf"/>
<component base="six" xScale="-1" yScale="-1" xOffset="601" yOffset="694"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>nine.lf</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>nine.lf</string>
</dict>
</lib>
</glyph>
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="nine.lf" format="2">
<advance width="600"/>
<outline>
<component base="six.lf" xScale="-1" yScale="-1" xOffset="601" yOffset="694"/>
</outline>
</glyph>
......@@ -3,14 +3,21 @@
<advance width="492"/>
<unicode hex="0031"/>
<outline>
<component base="one.lf"/>
<contour>
<point x="178" y="131" type="line"/>
<point x="351" y="131" type="line"/>
<point x="351" y="694" type="line"/>
<point x="248" y="694" type="line"/>
<point x="9" y="556" type="line"/>
<point x="74" y="432" type="line"/>
<point x="232" y="514" type="line"/>
<point x="178" y="569" type="line"/>
</contour>
<contour>
<point x="44" y="0" type="line"/>
<point x="485" y="0" type="line"/>
<point x="485" y="148" type="line"/>
<point x="44" y="148" type="line"/>
</contour>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>one.lf</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>one.lf</string>
</dict>
</lib>
</glyph>
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one.lf" format="2">
<advance width="492"/>
<outline>
<contour>
<point x="178" y="131" type="line"/>
<point x="351" y="131" type="line"/>
<point x="351" y="694" type="line"/>
<point x="248" y="694" type="line"/>
<point x="9" y="556" type="line"/>
<point x="74" y="432" type="line"/>
<point x="232" y="514" type="line"/>
<point x="178" y="569" type="line"/>
</contour>
<contour>
<point x="44" y="0" type="line"/>
<point x="485" y="0" type="line"/>
<point x="485" y="148" type="line"/>
<point x="44" y="148" type="line"/>
</contour>
</outline>
</glyph>
......@@ -3,14 +3,15 @@
<advance width="531"/>
<unicode hex="0037"/>
<outline>
<component base="seven.lf"/>
<contour>
<point x="65" y="0" type="line"/>
<point x="247" y="0" type="line"/>
<point x="524" y="590" type="line"/>
<point x="524" y="694" type="line"/>
<point x="9" y="694" type="line"/>
<point x="9" y="544" type="line"/>
<point x="370" y="544" type="line"/>
<point x="344" y="587" type="line"/>
</contour>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>seven.lf</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>seven.lf</string>
</dict>
</lib>
</glyph>
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="seven.lf" format="2">
<advance width="531"/>
<outline>
<contour>
<point x="65" y="0" type="line"/>
<point x="247" y="0" type="line"/>
<point x="524" y="590" type="line"/>
<point x="524" y="694" type="line"/>
<point x="9" y="694" type="line"/>
<point x="9" y="544" type="line"/>
<point x="370" y="544" type="line"/>
<point x="344" y="587" type="line"/>
</contour>
</outline>
</glyph>
......@@ -3,14 +3,45 @@
<advance width="598"/>
<unicode hex="0036"/>
<outline>
<component base="six.lf"/>
<contour>
<point x="306" y="-10" type="curve" smooth="yes"/>
<point x="466" y="-10"/>
<point x="572" y="87"/>
<point x="572" y="232" type="curve" smooth="yes"/>
<point x="572" y="362"/>
<point x="489" y="446"/>
<point x="365" y="446" type="curve" smooth="yes"/>
<point x="273" y="446"/>
<point x="200" y="402"/>
<point x="157" y="315" type="curve"/>
<point x="200" y="255" type="line"/>
<point x="229" y="289"/>
<point x="270" y="309"/>
<point x="311" y="309" type="curve" smooth="yes"/>
<point x="367" y="309"/>
<point x="404" y="273"/>
<point x="404" y="219" type="curve" smooth="yes"/>
<point x="404" y="167"/>
<point x="370" y="133"/>
<point x="318" y="133" type="curve" smooth="yes"/>
<point x="242" y="133"/>
<point x="199" y="211"/>
<point x="199" y="344" type="curve" smooth="yes"/>
<point x="199" y="487"/>
<point x="260" y="564"/>
<point x="374" y="564" type="curve" smooth="yes"/>
<point x="419" y="564"/>
<point x="476" y="552"/>
<point x="517" y="534" type="curve"/>
<point x="561" y="663" type="line"/>
<point x="508" y="689"/>
<point x="442" y="704"/>
<point x="367" y="704" type="curve" smooth="yes"/>
<point x="146" y="704"/>
<point x="29" y="569"/>
<point x="29" y="330" type="curve" smooth="yes"/>
<point x="29" y="107"/>
<point x="130" y="-10"/>
</contour>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
<string>six.lf</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
<string>six.lf</string>
</dict>
</lib>
</glyph>
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="six.lf" format="2">
<advance width="598"/>
<outline>