[cantarell-fonts] Remove .lf indirection of proportional numerals
- From: Nikolaus Waxweiler <nwaxweiler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cantarell-fonts] Remove .lf indirection of proportional numerals
- Date: Sat, 4 May 2019 23:27:51 +0000 (UTC)
commit 54d9fe21cc1ee64f3427f0f63781998570851b79
Author: Nikolaus Waxweiler <madigens gmail com>
Date: Sat May 4 23:39:19 2019 +0100
Remove .lf indirection of proportional numerals
src/Cantarell-Bold.ufo/features.fea | 31 ------------
src/Cantarell-Bold.ufo/glyphs/contents.plist | 22 ---------
src/Cantarell-Bold.ufo/glyphs/eight.glif | 55 ++++++++++++++++++----
src/Cantarell-Bold.ufo/glyphs/eight.lf.glif | 52 --------------------
src/Cantarell-Bold.ufo/glyphs/five.glif | 42 +++++++++++++----
src/Cantarell-Bold.ufo/glyphs/five.lf.glif | 39 ---------------
src/Cantarell-Bold.ufo/glyphs/four.glif | 23 +++++----
src/Cantarell-Bold.ufo/glyphs/four.lf.glif | 20 --------
src/Cantarell-Bold.ufo/glyphs/layerinfo.plist | 22 ---------
src/Cantarell-Bold.ufo/glyphs/nine.glif | 10 +---
src/Cantarell-Bold.ufo/glyphs/nine.lf.glif | 7 ---
src/Cantarell-Bold.ufo/glyphs/one.glif | 25 ++++++----
src/Cantarell-Bold.ufo/glyphs/one.lf.glif | 22 ---------
src/Cantarell-Bold.ufo/glyphs/seven.glif | 19 ++++----
src/Cantarell-Bold.ufo/glyphs/seven.lf.glif | 16 -------
src/Cantarell-Bold.ufo/glyphs/six.glif | 49 +++++++++++++++----
src/Cantarell-Bold.ufo/glyphs/six.lf.glif | 46 ------------------
src/Cantarell-Bold.ufo/glyphs/three.glif | 53 +++++++++++++++++----
src/Cantarell-Bold.ufo/glyphs/three.lf.glif | 50 --------------------
src/Cantarell-Bold.ufo/glyphs/two.glif | 35 ++++++++++----
src/Cantarell-Bold.ufo/glyphs/two.lf.glif | 32 -------------
src/Cantarell-Bold.ufo/glyphs/zero.glif | 38 +++++++++++----
src/Cantarell-Bold.ufo/glyphs/zero.lf.glif | 35 --------------
src/Cantarell-Bold.ufo/glyphs/zero.lf.zero.glif | 16 -------
src/Cantarell-Bold.ufo/glyphs/zero.zero.glif | 7 +--
src/Cantarell-Bold.ufo/lib.plist | 11 -----
src/Cantarell-Light.ufo/features.fea | 31 ------------
src/Cantarell-Light.ufo/glyphs/contents.plist | 22 ---------
src/Cantarell-Light.ufo/glyphs/eight.glif | 55 ++++++++++++++++++----
src/Cantarell-Light.ufo/glyphs/eight.lf.glif | 52 --------------------
src/Cantarell-Light.ufo/glyphs/five.glif | 42 +++++++++++++----
src/Cantarell-Light.ufo/glyphs/five.lf.glif | 39 ---------------
src/Cantarell-Light.ufo/glyphs/four.glif | 23 +++++----
src/Cantarell-Light.ufo/glyphs/four.lf.glif | 20 --------
src/Cantarell-Light.ufo/glyphs/layerinfo.plist | 22 ---------
src/Cantarell-Light.ufo/glyphs/nine.glif | 10 +---
src/Cantarell-Light.ufo/glyphs/nine.lf.glif | 7 ---
src/Cantarell-Light.ufo/glyphs/one.glif | 25 ++++++----
src/Cantarell-Light.ufo/glyphs/one.lf.glif | 22 ---------
src/Cantarell-Light.ufo/glyphs/seven.glif | 19 ++++----
src/Cantarell-Light.ufo/glyphs/seven.lf.glif | 16 -------
src/Cantarell-Light.ufo/glyphs/six.glif | 49 +++++++++++++++----
src/Cantarell-Light.ufo/glyphs/six.lf.glif | 46 ------------------
src/Cantarell-Light.ufo/glyphs/three.glif | 53 +++++++++++++++++----
src/Cantarell-Light.ufo/glyphs/three.lf.glif | 50 --------------------
src/Cantarell-Light.ufo/glyphs/two.glif | 35 ++++++++++----
src/Cantarell-Light.ufo/glyphs/two.lf.glif | 32 -------------
src/Cantarell-Light.ufo/glyphs/zero.glif | 38 +++++++++++----
src/Cantarell-Light.ufo/glyphs/zero.lf.glif | 35 --------------
src/Cantarell-Light.ufo/glyphs/zero.lf.zero.glif | 16 -------
src/Cantarell-Light.ufo/glyphs/zero.zero.glif | 7 +--
src/Cantarell-Light.ufo/lib.plist | 11 -----
src/Cantarell-Regular.ufo/features.fea | 31 ------------
src/Cantarell-Regular.ufo/glyphs/contents.plist | 22 ---------
src/Cantarell-Regular.ufo/glyphs/eight.glif | 55 ++++++++++++++++++----
src/Cantarell-Regular.ufo/glyphs/eight.lf.glif | 52 --------------------
src/Cantarell-Regular.ufo/glyphs/five.glif | 42 +++++++++++++----
src/Cantarell-Regular.ufo/glyphs/five.lf.glif | 39 ---------------
src/Cantarell-Regular.ufo/glyphs/four.glif | 23 +++++----
src/Cantarell-Regular.ufo/glyphs/four.lf.glif | 20 --------
src/Cantarell-Regular.ufo/glyphs/layerinfo.plist | 22 ---------
src/Cantarell-Regular.ufo/glyphs/nine.glif | 10 +---
src/Cantarell-Regular.ufo/glyphs/nine.lf.glif | 7 ---
src/Cantarell-Regular.ufo/glyphs/one.glif | 25 ++++++----
src/Cantarell-Regular.ufo/glyphs/one.lf.glif | 22 ---------
src/Cantarell-Regular.ufo/glyphs/seven.glif | 19 ++++----
src/Cantarell-Regular.ufo/glyphs/seven.lf.glif | 16 -------
src/Cantarell-Regular.ufo/glyphs/six.glif | 49 +++++++++++++++----
src/Cantarell-Regular.ufo/glyphs/six.lf.glif | 46 ------------------
src/Cantarell-Regular.ufo/glyphs/three.glif | 53 +++++++++++++++++----
src/Cantarell-Regular.ufo/glyphs/three.lf.glif | 50 --------------------
src/Cantarell-Regular.ufo/glyphs/two.glif | 35 ++++++++++----
src/Cantarell-Regular.ufo/glyphs/two.lf.glif | 32 -------------
src/Cantarell-Regular.ufo/glyphs/zero.glif | 38 +++++++++++----
src/Cantarell-Regular.ufo/glyphs/zero.lf.glif | 35 --------------
src/Cantarell-Regular.ufo/glyphs/zero.lf.zero.glif | 16 -------
src/Cantarell-Regular.ufo/glyphs/zero.zero.glif | 7 +--
src/Cantarell-Regular.ufo/lib.plist | 11 -----
78 files changed, 789 insertions(+), 1542 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/features.fea b/src/Cantarell-Bold.ufo/features.fea
index f1f60f8f..67b72685 100644
--- a/src/Cantarell-Bold.ufo/features.fea
+++ b/src/Cantarell-Bold.ufo/features.fea
@@ -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;
diff --git a/src/Cantarell-Bold.ufo/glyphs/contents.plist b/src/Cantarell-Bold.ufo/glyphs/contents.plist
index 5b123c4d..fde25576 100644
--- a/src/Cantarell-Bold.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/contents.plist
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.glif b/src/Cantarell-Bold.ufo/glyphs/eight.glif
index b8c6ce1f..cfae2555 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.glif
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.glif b/src/Cantarell-Bold.ufo/glyphs/five.glif
index 94010c43..d56797ba 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.glif
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.glif b/src/Cantarell-Bold.ufo/glyphs/four.glif
index 37784459..cb39c6cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.glif
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
index 3273f055..a3e54c9b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.glif b/src/Cantarell-Bold.ufo/glyphs/nine.glif
index 85f92342..e1d42fa5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.glif
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.glif b/src/Cantarell-Bold.ufo/glyphs/one.glif
index a56c53f4..fd323d2e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.glif
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.glif b/src/Cantarell-Bold.ufo/glyphs/seven.glif
index 46b72dbf..43badede 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.glif
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.glif b/src/Cantarell-Bold.ufo/glyphs/six.glif
index fbdd7dbe..e6184737 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.glif
@@ -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>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.glif b/src/Cantarell-Bold.ufo/glyphs/three.glif
index 9e2b6b95..eae0c533 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.glif
@@ -3,14 +3,49 @@
<advance width="564"/>
<unicode hex="0033"/>
<outline>
- <component base="three.lf"/>
+ <contour>
+ <point x="236" y="-10" type="curve" smooth="yes"/>
+ <point x="423" y="-10"/>
+ <point x="546" y="71"/>
+ <point x="546" y="194" type="curve" smooth="yes"/>
+ <point x="546" y="290"/>
+ <point x="475" y="360"/>
+ <point x="368" y="370" type="curve"/>
+ <point x="342" y="360" type="line"/>
+ <point x="442" y="359"/>
+ <point x="507" y="422"/>
+ <point x="507" y="518" type="curve" smooth="yes"/>
+ <point x="507" y="634"/>
+ <point x="415" y="704"/>
+ <point x="261" y="704" type="curve" smooth="yes"/>
+ <point x="179" y="704"/>
+ <point x="97" y="684"/>
+ <point x="21" y="643" type="curve"/>
+ <point x="60" y="514" type="line"/>
+ <point x="122" y="541"/>
+ <point x="176" y="556"/>
+ <point x="225" y="556" type="curve" smooth="yes"/>
+ <point x="287" y="556"/>
+ <point x="327" y="532"/>
+ <point x="327" y="492" type="curve" smooth="yes"/>
+ <point x="327" y="444"/>
+ <point x="272" y="415"/>
+ <point x="180" y="415" type="curve" smooth="yes"/>
+ <point x="152" y="415" type="line"/>
+ <point x="152" y="285" type="line"/>
+ <point x="180" y="285" type="line" smooth="yes"/>
+ <point x="296" y="285"/>
+ <point x="366" y="253"/>
+ <point x="366" y="200" type="curve" smooth="yes"/>
+ <point x="366" y="159"/>
+ <point x="321" y="138"/>
+ <point x="243" y="138" type="curve" smooth="yes"/>
+ <point x="182" y="138"/>
+ <point x="114" y="151"/>
+ <point x="56" y="175" type="curve"/>
+ <point x="16" y="40" type="line"/>
+ <point x="90" y="5"/>
+ <point x="154" y="-10"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>three.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>three.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.glif b/src/Cantarell-Bold.ufo/glyphs/two.glif
index 403d8394..008b0ba1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.glif
@@ -3,14 +3,31 @@
<advance width="554"/>
<unicode hex="0032"/>
<outline>
- <component base="two.lf"/>
+ <contour>
+ <point x="38" y="0" type="line"/>
+ <point x="528" y="0" type="line"/>
+ <point x="528" y="150" type="line"/>
+ <point x="242" y="150" type="line"/>
+ <point x="243" y="114" type="line"/>
+ <point x="421" y="244"/>
+ <point x="510" y="368"/>
+ <point x="510" y="489" type="curve" smooth="yes"/>
+ <point x="510" y="619"/>
+ <point x="408" y="704"/>
+ <point x="251" y="704" type="curve" smooth="yes"/>
+ <point x="161" y="704"/>
+ <point x="79" y="676"/>
+ <point x="12" y="621" type="curve"/>
+ <point x="56" y="494" type="line"/>
+ <point x="112" y="533"/>
+ <point x="167" y="553"/>
+ <point x="217" y="553" type="curve" smooth="yes"/>
+ <point x="286" y="553"/>
+ <point x="330" y="516"/>
+ <point x="330" y="462" type="curve" smooth="yes"/>
+ <point x="330" y="376"/>
+ <point x="219" y="272"/>
+ <point x="38" y="122" type="curve"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>two.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>two.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.glif
index 9b0becf6..6d53a0f7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.glif
@@ -2,15 +2,35 @@
<glyph name="zero" format="2">
<advance width="640"/>
<unicode hex="0030"/>
+ <anchor x="322" y="345" name="slash"/>
<outline>
- <component base="zero.lf"/>
+ <contour>
+ <point x="318" y="-10" type="curve" smooth="yes"/>
+ <point x="494" y="-10"/>
+ <point x="613" y="134"/>
+ <point x="613" y="351" type="curve" smooth="yes"/>
+ <point x="613" y="563"/>
+ <point x="496" y="704"/>
+ <point x="323" y="704" type="curve" smooth="yes"/>
+ <point x="146" y="704"/>
+ <point x="27" y="560"/>
+ <point x="27" y="344" type="curve" smooth="yes"/>
+ <point x="27" y="132"/>
+ <point x="144" y="-10"/>
+ </contour>
+ <contour>
+ <point x="322" y="138" type="curve" smooth="yes"/>
+ <point x="251" y="138"/>
+ <point x="205" y="223"/>
+ <point x="205" y="350" type="curve" smooth="yes"/>
+ <point x="205" y="474"/>
+ <point x="251" y="556"/>
+ <point x="319" y="556" type="curve" smooth="yes"/>
+ <point x="388" y="556"/>
+ <point x="435" y="471"/>
+ <point x="435" y="343" type="curve" smooth="yes"/>
+ <point x="435" y="220"/>
+ <point x="389" y="138"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>zero.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>zero.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif
index 36a95257..7fa8c27e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif
@@ -2,14 +2,15 @@
<glyph name="zero.zero" format="2">
<advance width="640"/>
<outline>
- <component base="zero.lf.zero"/>
+ <component base="zero"/>
+ <component base="_slash.zero" xOffset="99" yOffset="104"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>zero.lf.zero</string>
+ <string>zero</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>zero.lf.zero</string>
+ <string>zero</string>
</dict>
</lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/lib.plist b/src/Cantarell-Bold.ufo/lib.plist
index b5162b8b..aa1433e9 100644
--- a/src/Cantarell-Bold.ufo/lib.plist
+++ b/src/Cantarell-Bold.ufo/lib.plist
@@ -1277,17 +1277,6 @@
<string>seven</string>
<string>eight</string>
<string>nine</string>
- <string>zero.lf</string>
- <string>one.lf</string>
- <string>two.lf</string>
- <string>three.lf</string>
- <string>four.lf</string>
- <string>five.lf</string>
- <string>six.lf</string>
- <string>seven.lf</string>
- <string>eight.lf</string>
- <string>nine.lf</string>
- <string>zero.lf.zero</string>
<string>zero.osf</string>
<string>one.osf</string>
<string>two.osf</string>
diff --git a/src/Cantarell-Light.ufo/features.fea b/src/Cantarell-Light.ufo/features.fea
index f1f60f8f..67b72685 100644
--- a/src/Cantarell-Light.ufo/features.fea
+++ b/src/Cantarell-Light.ufo/features.fea
@@ -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;
diff --git a/src/Cantarell-Light.ufo/glyphs/contents.plist b/src/Cantarell-Light.ufo/glyphs/contents.plist
index 5b123c4d..fde25576 100644
--- a/src/Cantarell-Light.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Light.ufo/glyphs/contents.plist
@@ -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>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.glif b/src/Cantarell-Light.ufo/glyphs/eight.glif
index 9ab9855c..59fc7f67 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.glif
@@ -3,14 +3,51 @@
<advance width="582"/>
<unicode hex="0038"/>
<outline>
- <component base="eight.lf"/>
+ <contour>
+ <point x="296" y="-10" type="curve" smooth="yes"/>
+ <point x="426" y="-10"/>
+ <point x="513" y="57"/>
+ <point x="513" y="163" type="curve" smooth="yes"/>
+ <point x="513" y="389"/>
+ <point x="118" y="324"/>
+ <point x="118" y="540" type="curve" smooth="yes"/>
+ <point x="118" y="629"/>
+ <point x="185" y="687"/>
+ <point x="283" y="687" type="curve" smooth="yes"/>
+ <point x="381" y="687"/>
+ <point x="456" y="628"/>
+ <point x="456" y="543" type="curve" smooth="yes"/>
+ <point x="456" y="460"/>
+ <point x="384" y="397"/>
+ <point x="275" y="369" type="curve"/>
+ <point x="291" y="358" type="line"/>
+ <point x="404" y="385"/>
+ <point x="475" y="454"/>
+ <point x="475" y="543" type="curve" smooth="yes"/>
+ <point x="475" y="639"/>
+ <point x="394" y="704"/>
+ <point x="285" y="704" type="curve" smooth="yes"/>
+ <point x="175" y="704"/>
+ <point x="99" y="639"/>
+ <point x="99" y="538" type="curve" smooth="yes"/>
+ <point x="99" y="307"/>
+ <point x="493" y="372"/>
+ <point x="493" y="161" type="curve" smooth="yes"/>
+ <point x="493" y="67"/>
+ <point x="416" y="7"/>
+ <point x="298" y="7" type="curve" smooth="yes"/>
+ <point x="177" y="7"/>
+ <point x="94" y="71"/>
+ <point x="94" y="166" type="curve" smooth="yes"/>
+ <point x="94" y="254"/>
+ <point x="166" y="325"/>
+ <point x="275" y="352" type="curve"/>
+ <point x="259" y="363" type="line"/>
+ <point x="148" y="338"/>
+ <point x="74" y="260"/>
+ <point x="74" y="164" type="curve" smooth="yes"/>
+ <point x="74" y="60"/>
+ <point x="163" 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>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.glif b/src/Cantarell-Light.ufo/glyphs/five.glif
index 40c84163..23cb4f36 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.glif
@@ -3,14 +3,38 @@
<advance width="542"/>
<unicode hex="0035"/>
<outline>
- <component base="five.lf"/>
+ <contour>
+ <point x="251" y="-10" type="curve" smooth="yes"/>
+ <point x="389" y="-10"/>
+ <point x="475" y="80"/>
+ <point x="475" y="203" type="curve" smooth="yes"/>
+ <point x="475" y="326"/>
+ <point x="388" y="403"/>
+ <point x="243" y="403" type="curve" smooth="yes"/>
+ <point x="206" y="403"/>
+ <point x="156" y="398"/>
+ <point x="106" y="388" type="curve"/>
+ <point x="118" y="384" type="line"/>
+ <point x="131" y="677" type="line"/>
+ <point x="446" y="677" type="line"/>
+ <point x="446" y="694" type="line"/>
+ <point x="113" y="694" type="line"/>
+ <point x="97" y="369" type="line"/>
+ <point x="143" y="379"/>
+ <point x="195" y="385"/>
+ <point x="236" y="385" type="curve" smooth="yes"/>
+ <point x="380" y="385"/>
+ <point x="454" y="310"/>
+ <point x="454" y="201" type="curve" smooth="yes"/>
+ <point x="454" y="88"/>
+ <point x="376" y="9"/>
+ <point x="255" y="9" type="curve" smooth="yes"/>
+ <point x="193" y="9"/>
+ <point x="121" y="29"/>
+ <point x="76" y="58" type="curve"/>
+ <point x="70" y="41" type="line"/>
+ <point x="120" y="9"/>
+ <point x="187" 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>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.glif b/src/Cantarell-Light.ufo/glyphs/four.glif
index e2a1917d..75c060f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.glif
@@ -3,14 +3,19 @@
<advance width="568"/>
<unicode hex="0034"/>
<outline>
- <component base="four.lf"/>
+ <contour>
+ <point x="393" y="-10" type="line"/>
+ <point x="411" y="-10" type="line"/>
+ <point x="411" y="694" type="line"/>
+ <point x="394" y="694" type="line"/>
+ <point x="37" y="200" type="line"/>
+ <point x="37" y="190" type="line"/>
+ <point x="533" y="190" type="line"/>
+ <point x="533" y="207" type="line"/>
+ <point x="59" y="207" type="line"/>
+ <point x="59" y="202" type="line"/>
+ <point x="393" y="667" type="line"/>
+ <point x="393" y="665" 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>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index 9e3d1b5a..3832e19c 100644
--- a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
@@ -1062,8 +1062,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.eight.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.osf</key>
@@ -1166,8 +1164,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.five.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.osf</key>
@@ -1194,8 +1190,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.four.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.osf</key>
@@ -1514,8 +1508,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.nine.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.osf</key>
@@ -1630,8 +1622,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.one.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
@@ -1840,8 +1830,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.seven.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.osf</key>
@@ -1868,8 +1856,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.six.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.osf</key>
@@ -1938,8 +1924,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.three.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.osf</key>
@@ -1992,8 +1976,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.two.lf</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.osf</key>
@@ -2168,10 +2150,6 @@
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.dnom</key>
<integer>2</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.zero.lf</key>
- <integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.zero.lf.zero</key>
- <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.numr</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.osf</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.glif b/src/Cantarell-Light.ufo/glyphs/nine.glif
index 913b2ce2..3a48e78e 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.glif
@@ -3,14 +3,6 @@
<advance width="585"/>
<unicode hex="0039"/>
<outline>
- <component base="nine.lf"/>
+ <component base="six" xScale="-1" yScale="-1" xOffset="598" 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>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.glif b/src/Cantarell-Light.ufo/glyphs/one.glif
index 77d52da2..a945596f 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.glif
@@ -3,14 +3,21 @@
<advance width="379"/>
<unicode hex="0031"/>
<outline>
- <component base="one.lf"/>
+ <contour>
+ <point x="187" y="7" type="line"/>
+ <point x="207" y="7" type="line"/>
+ <point x="207" y="694" type="line"/>
+ <point x="195" y="694" type="line"/>
+ <point x="44" y="581" type="line"/>
+ <point x="52" y="569" type="line"/>
+ <point x="195" y="672" type="line"/>
+ <point x="187" y="677" type="line"/>
+ </contour>
+ <contour>
+ <point x="45" y="0" type="line"/>
+ <point x="344" y="0" type="line"/>
+ <point x="344" y="17" type="line"/>
+ <point x="45" y="17" 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>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.glif b/src/Cantarell-Light.ufo/glyphs/seven.glif
index 54f58eab..efd890a0 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.glif
@@ -3,14 +3,15 @@
<advance width="521"/>
<unicode hex="0037"/>
<outline>
- <component base="seven.lf"/>
+ <contour>
+ <point x="157" y="0" type="line"/>
+ <point x="180" y="0" type="line"/>
+ <point x="471" y="682" type="line"/>
+ <point x="471" y="694" type="line"/>
+ <point x="44" y="694" type="line"/>
+ <point x="44" y="676" type="line"/>
+ <point x="454" y="676" type="line"/>
+ <point x="451" y="685" 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>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.glif b/src/Cantarell-Light.ufo/glyphs/six.glif
index ebe6cb4b..b897efbb 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.glif
@@ -3,14 +3,45 @@
<advance width="586"/>
<unicode hex="0036"/>
<outline>
- <component base="six.lf"/>
+ <contour>
+ <point x="312" y="-10" type="curve" smooth="yes"/>
+ <point x="432" y="-10"/>
+ <point x="514" y="77"/>
+ <point x="514" y="206" type="curve" smooth="yes"/>
+ <point x="514" y="333"/>
+ <point x="434" y="410"/>
+ <point x="315" y="410" type="curve" smooth="yes"/>
+ <point x="218" y="410"/>
+ <point x="142" y="361"/>
+ <point x="96" y="270" type="curve"/>
+ <point x="96" y="239" type="line"/>
+ <point x="140" y="337"/>
+ <point x="217" y="392"/>
+ <point x="313" y="392" type="curve" smooth="yes"/>
+ <point x="419" y="392"/>
+ <point x="493" y="322"/>
+ <point x="493" y="203" type="curve" smooth="yes"/>
+ <point x="493" y="86"/>
+ <point x="421" y="8"/>
+ <point x="313" y="8" type="curve" smooth="yes"/>
+ <point x="181" y="8"/>
+ <point x="105" y="125"/>
+ <point x="105" y="322" type="curve" smooth="yes"/>
+ <point x="105" y="560"/>
+ <point x="192" y="686"/>
+ <point x="356" y="686" type="curve" smooth="yes"/>
+ <point x="407" y="686"/>
+ <point x="457" y="673"/>
+ <point x="495" y="650" type="curve"/>
+ <point x="502" y="667" type="line"/>
+ <point x="461" y="691"/>
+ <point x="412" y="704"/>
+ <point x="358" y="704" type="curve" smooth="yes"/>
+ <point x="179" y="704"/>
+ <point x="84" y="570"/>
+ <point x="84" y="319" type="curve" smooth="yes"/>
+ <point x="84" y="113"/>
+ <point x="168" 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>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.glif b/src/Cantarell-Light.ufo/glyphs/three.glif
index 01c05c36..0d0e22a0 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.glif
@@ -3,14 +3,49 @@
<advance width="566"/>
<unicode hex="0033"/>
<outline>
- <component base="three.lf"/>
+ <contour>
+ <point x="268" y="-10" type="curve" smooth="yes"/>
+ <point x="407" y="-10"/>
+ <point x="496" y="60"/>
+ <point x="496" y="170" type="curve" smooth="yes"/>
+ <point x="496" y="280"/>
+ <point x="411" y="350"/>
+ <point x="267" y="360" type="curve"/>
+ <point x="267" y="352" type="line"/>
+ <point x="382" y="359"/>
+ <point x="458" y="429"/>
+ <point x="458" y="528" type="curve" smooth="yes"/>
+ <point x="458" y="632"/>
+ <point x="376" y="704"/>
+ <point x="257" y="704" type="curve" smooth="yes"/>
+ <point x="191" y="704"/>
+ <point x="126" y="683"/>
+ <point x="72" y="645" type="curve"/>
+ <point x="77" y="629" type="line"/>
+ <point x="139" y="668"/>
+ <point x="195" y="686"/>
+ <point x="253" y="686" type="curve" smooth="yes"/>
+ <point x="363" y="686"/>
+ <point x="437" y="624"/>
+ <point x="437" y="524" type="curve" smooth="yes"/>
+ <point x="437" y="418"/>
+ <point x="356" y="361"/>
+ <point x="207" y="361" type="curve" smooth="yes"/>
+ <point x="188" y="361" type="line"/>
+ <point x="188" y="344" type="line"/>
+ <point x="207" y="344" type="line" smooth="yes"/>
+ <point x="378" y="344"/>
+ <point x="476" y="280"/>
+ <point x="476" y="168" type="curve" smooth="yes"/>
+ <point x="476" y="69"/>
+ <point x="397" y="9"/>
+ <point x="269" y="9" type="curve" smooth="yes"/>
+ <point x="197" y="9"/>
+ <point x="119" y="29"/>
+ <point x="58" y="63" type="curve"/>
+ <point x="53" y="45" type="line"/>
+ <point x="112" y="11"/>
+ <point x="193" y="-10"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>three.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>three.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.glif b/src/Cantarell-Light.ufo/glyphs/two.glif
index 5824c182..ee7f0fd8 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.glif
@@ -3,14 +3,31 @@
<advance width="508"/>
<unicode hex="0032"/>
<outline>
- <component base="two.lf"/>
+ <contour>
+ <point x="53" y="0" type="line"/>
+ <point x="449" y="0" type="line"/>
+ <point x="449" y="17" type="line"/>
+ <point x="73" y="17" type="line"/>
+ <point x="77" y="10" type="line"/>
+ <point x="367" y="310"/>
+ <point x="423" y="406"/>
+ <point x="423" y="509" type="curve" smooth="yes"/>
+ <point x="423" y="630"/>
+ <point x="348" y="704"/>
+ <point x="230" y="704" type="curve" smooth="yes"/>
+ <point x="159" y="704"/>
+ <point x="98" y="678"/>
+ <point x="53" y="629" type="curve"/>
+ <point x="62" y="616" type="line"/>
+ <point x="111" y="663"/>
+ <point x="164" y="686"/>
+ <point x="226" y="686" type="curve" smooth="yes"/>
+ <point x="333" y="686"/>
+ <point x="402" y="617"/>
+ <point x="402" y="507" type="curve" smooth="yes"/>
+ <point x="402" y="407"/>
+ <point x="345" y="311"/>
+ <point x="53" y="8" type="curve"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>two.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>two.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.glif
index ebac4f0f..71a7d13d 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.glif
@@ -2,15 +2,35 @@
<glyph name="zero" format="2">
<advance width="601"/>
<unicode hex="0030"/>
+ <anchor x="309" y="350" name="slash"/>
<outline>
- <component base="zero.lf"/>
+ <contour>
+ <point x="300" y="-10" type="curve" smooth="yes"/>
+ <point x="431" y="-10"/>
+ <point x="518" y="131"/>
+ <point x="518" y="343" type="curve" smooth="yes"/>
+ <point x="518" y="556"/>
+ <point x="432" y="699"/>
+ <point x="304" y="699" type="curve" smooth="yes"/>
+ <point x="171" y="699"/>
+ <point x="83" y="555"/>
+ <point x="83" y="340" type="curve" smooth="yes"/>
+ <point x="83" y="130"/>
+ <point x="170" y="-10"/>
+ </contour>
+ <contour>
+ <point x="303" y="8" type="curve" smooth="yes"/>
+ <point x="184" y="8"/>
+ <point x="104" y="142"/>
+ <point x="104" y="343" type="curve" smooth="yes"/>
+ <point x="104" y="546"/>
+ <point x="183" y="681"/>
+ <point x="301" y="681" type="curve" smooth="yes"/>
+ <point x="419" y="681"/>
+ <point x="497" y="544"/>
+ <point x="497" y="340" type="curve" smooth="yes"/>
+ <point x="497" y="141"/>
+ <point x="419" y="8"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>zero.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>zero.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
index 959430a7..6e4b9a66 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
@@ -2,14 +2,15 @@
<glyph name="zero.zero" format="2">
<advance width="601"/>
<outline>
- <component base="zero.lf.zero"/>
+ <component base="zero"/>
+ <component base="_slash.zero" xOffset="86" yOffset="109"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>zero.lf.zero</string>
+ <string>zero</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>zero.lf.zero</string>
+ <string>zero</string>
</dict>
</lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index acc6f33c..3007a62e 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -1277,17 +1277,6 @@
<string>seven</string>
<string>eight</string>
<string>nine</string>
- <string>zero.lf</string>
- <string>one.lf</string>
- <string>two.lf</string>
- <string>three.lf</string>
- <string>four.lf</string>
- <string>five.lf</string>
- <string>six.lf</string>
- <string>seven.lf</string>
- <string>eight.lf</string>
- <string>nine.lf</string>
- <string>zero.lf.zero</string>
<string>zero.osf</string>
<string>one.osf</string>
<string>two.osf</string>
diff --git a/src/Cantarell-Regular.ufo/features.fea b/src/Cantarell-Regular.ufo/features.fea
index f1f60f8f..67b72685 100644
--- a/src/Cantarell-Regular.ufo/features.fea
+++ b/src/Cantarell-Regular.ufo/features.fea
@@ -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;
diff --git a/src/Cantarell-Regular.ufo/glyphs/contents.plist b/src/Cantarell-Regular.ufo/glyphs/contents.plist
index 5b123c4d..fde25576 100644
--- a/src/Cantarell-Regular.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/contents.plist
@@ -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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.glif b/src/Cantarell-Regular.ufo/glyphs/eight.glif
index e2958e09..6233aea8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.glif
@@ -3,14 +3,51 @@
<advance width="595"/>
<unicode hex="0038"/>
<outline>
- <component base="eight.lf"/>
+ <contour>
+ <point x="299" y="-10" type="curve" smooth="yes"/>
+ <point x="445" y="-10"/>
+ <point x="540" y="63"/>
+ <point x="540" y="176" type="curve" smooth="yes"/>
+ <point x="540" y="401"/>
+ <point x="165" y="359"/>
+ <point x="165" y="534" type="curve" smooth="yes"/>
+ <point x="165" y="595"/>
+ <point x="212" y="633"/>
+ <point x="289" y="633" type="curve" smooth="yes"/>
+ <point x="373" y="633"/>
+ <point x="430" y="589"/>
+ <point x="430" y="523" type="curve" smooth="yes"/>
+ <point x="430" y="458"/>
+ <point x="375" y="402"/>
+ <point x="294" y="387" type="curve"/>
+ <point x="357" y="356" type="line"/>
+ <point x="451" y="384"/>
+ <point x="509" y="453"/>
+ <point x="509" y="537" type="curve" smooth="yes"/>
+ <point x="509" y="637"/>
+ <point x="426" y="704"/>
+ <point x="301" y="704" type="curve" smooth="yes"/>
+ <point x="169" y="704"/>
+ <point x="82" y="631"/>
+ <point x="82" y="521" type="curve" smooth="yes"/>
+ <point x="82" y="290"/>
+ <point x="455" y="344"/>
+ <point x="455" y="169" type="curve" smooth="yes"/>
+ <point x="455" y="102"/>
+ <point x="404" y="63"/>
+ <point x="313" y="63" type="curve" smooth="yes"/>
+ <point x="211" y="63"/>
+ <point x="143" y="112"/>
+ <point x="143" y="185" type="curve" smooth="yes"/>
+ <point x="143" y="257"/>
+ <point x="206" y="315"/>
+ <point x="298" y="328" type="curve"/>
+ <point x="244" y="361" type="line"/>
+ <point x="132" y="346"/>
+ <point x="58" y="271"/>
+ <point x="58" y="174" type="curve" smooth="yes"/>
+ <point x="58" y="64"/>
+ <point x="154" 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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.glif b/src/Cantarell-Regular.ufo/glyphs/five.glif
index 9cd7491e..24900aaf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.glif
@@ -3,14 +3,38 @@
<advance width="565"/>
<unicode hex="0035"/>
<outline>
- <component base="five.lf"/>
+ <contour>
+ <point x="251" y="-10" type="curve" smooth="yes"/>
+ <point x="407" y="-10"/>
+ <point x="510" y="77"/>
+ <point x="510" y="215" type="curve" smooth="yes"/>
+ <point x="510" y="346"/>
+ <point x="417" y="427"/>
+ <point x="261" y="427" type="curve" smooth="yes"/>
+ <point x="226" y="427"/>
+ <point x="188" y="423"/>
+ <point x="150" y="415" type="curve"/>
+ <point x="169" y="389" type="line"/>
+ <point x="180" y="622" type="line"/>
+ <point x="477" y="622" type="line"/>
+ <point x="477" y="694" type="line"/>
+ <point x="105" y="694" type="line"/>
+ <point x="88" y="338" type="line"/>
+ <point x="139" y="349"/>
+ <point x="194" y="355"/>
+ <point x="233" y="355" type="curve" smooth="yes"/>
+ <point x="355" y="355"/>
+ <point x="425" y="298"/>
+ <point x="425" y="205" type="curve" smooth="yes"/>
+ <point x="425" y="116"/>
+ <point x="361" y="63"/>
+ <point x="259" y="63" type="curve" smooth="yes"/>
+ <point x="199" y="63"/>
+ <point x="134" y="79"/>
+ <point x="79" y="107" type="curve"/>
+ <point x="55" y="42" type="line"/>
+ <point x="118" y="9"/>
+ <point x="182" 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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.glif b/src/Cantarell-Regular.ufo/glyphs/four.glif
index 9bce62d5..caf32a39 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.glif
@@ -3,14 +3,19 @@
<advance width="619"/>
<unicode hex="0034"/>
<outline>
- <component base="four.lf"/>
+ <contour>
+ <point x="377" y="-10" type="line"/>
+ <point x="455" y="-10" type="line"/>
+ <point x="455" y="694" type="line"/>
+ <point x="379" y="694" type="line"/>
+ <point x="38" y="206" type="line"/>
+ <point x="38" y="164" type="line"/>
+ <point x="580" y="164" type="line"/>
+ <point x="580" y="232" type="line"/>
+ <point x="124" y="232" type="line"/>
+ <point x="119" y="214" type="line"/>
+ <point x="377" y="584" type="line"/>
+ <point x="377" y="567" 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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index f703c483..b40c75c3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
@@ -1062,8 +1062,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.eight.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.eight.osf</key>
@@ -1166,8 +1164,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.five.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.five.osf</key>
@@ -1194,8 +1190,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.four.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.four.osf</key>
@@ -1514,8 +1508,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.nine.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.nine.osf</key>
@@ -1630,8 +1622,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.one.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
@@ -1840,8 +1830,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.seven.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.seven.osf</key>
@@ -1868,8 +1856,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.six.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.osf</key>
@@ -1938,8 +1924,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.three.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.three.osf</key>
@@ -1992,8 +1976,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.two.lf</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.two.osf</key>
@@ -2168,10 +2150,6 @@
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.dnom</key>
<integer>0</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.zero.lf</key>
- <integer>1</integer>
- <key>com.schriftgestaltung.layerOrderInGlyph.zero.lf.zero</key>
- <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.numr</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.zero.osf</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.glif b/src/Cantarell-Regular.ufo/glyphs/nine.glif
index 30d5c7d1..0375c689 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.glif
@@ -3,14 +3,6 @@
<advance width="598"/>
<unicode hex="0039"/>
<outline>
- <component base="nine.lf"/>
+ <component base="six" xScale="-1" yScale="-1" xOffset="597" 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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.glif b/src/Cantarell-Regular.ufo/glyphs/one.glif
index 60277635..c42cc877 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.glif
@@ -3,14 +3,21 @@
<advance width="451"/>
<unicode hex="0031"/>
<outline>
- <component base="one.lf"/>
+ <contour>
+ <point x="198" y="55" type="line"/>
+ <point x="282" y="55" type="line"/>
+ <point x="282" y="694" type="line"/>
+ <point x="231" y="694" type="line"/>
+ <point x="42" y="571" type="line"/>
+ <point x="73" y="515" type="line"/>
+ <point x="228" y="610" type="line"/>
+ <point x="198" y="635" type="line"/>
+ </contour>
+ <contour>
+ <point x="61" y="0" type="line"/>
+ <point x="416" y="0" type="line"/>
+ <point x="416" y="71" type="line"/>
+ <point x="61" y="71" 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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.glif b/src/Cantarell-Regular.ufo/glyphs/seven.glif
index 780a874c..a0e5709d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.glif
@@ -3,14 +3,15 @@
<advance width="537"/>
<unicode hex="0037"/>
<outline>
- <component base="seven.lf"/>
+ <contour>
+ <point x="125" y="0" type="line"/>
+ <point x="212" y="0" type="line"/>
+ <point x="500" y="654" type="line"/>
+ <point x="500" y="694" type="line"/>
+ <point x="35" y="694" type="line"/>
+ <point x="35" y="622" type="line"/>
+ <point x="435" y="622" type="line"/>
+ <point x="414" y="652" 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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.glif b/src/Cantarell-Regular.ufo/glyphs/six.glif
index 56a63780..6f6af3ab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.glif
@@ -3,14 +3,45 @@
<advance width="597"/>
<unicode hex="0036"/>
<outline>
- <component base="six.lf"/>
+ <contour>
+ <point x="313" y="-10" type="curve" smooth="yes"/>
+ <point x="445" y="-10"/>
+ <point x="538" y="80"/>
+ <point x="538" y="213" type="curve" smooth="yes"/>
+ <point x="538" y="338"/>
+ <point x="456" y="424"/>
+ <point x="336" y="424" type="curve" smooth="yes"/>
+ <point x="235" y="424"/>
+ <point x="155" y="364"/>
+ <point x="109" y="256" type="curve"/>
+ <point x="131" y="213" type="line"/>
+ <point x="165" y="302"/>
+ <point x="228" y="352"/>
+ <point x="307" y="352" type="curve" smooth="yes"/>
+ <point x="394" y="352"/>
+ <point x="453" y="291"/>
+ <point x="453" y="199" type="curve" smooth="yes"/>
+ <point x="453" y="115"/>
+ <point x="404" y="63"/>
+ <point x="323" y="63" type="curve" smooth="yes"/>
+ <point x="214" y="63"/>
+ <point x="154" y="159"/>
+ <point x="154" y="334" type="curve" smooth="yes"/>
+ <point x="154" y="535"/>
+ <point x="231" y="631"/>
+ <point x="360" y="631" type="curve" smooth="yes"/>
+ <point x="411" y="631"/>
+ <point x="467" y="618"/>
+ <point x="504" y="595" type="curve"/>
+ <point x="528" y="660" type="line"/>
+ <point x="493" y="687"/>
+ <point x="434" y="704"/>
+ <point x="369" y="704" type="curve" smooth="yes"/>
+ <point x="180" y="704"/>
+ <point x="64" y="567"/>
+ <point x="64" y="328" type="curve" smooth="yes"/>
+ <point x="64" y="110"/>
+ <point x="161" 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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.glif b/src/Cantarell-Regular.ufo/glyphs/three.glif
index 152a1637..95208bb1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.glif
@@ -3,14 +3,49 @@
<advance width="574"/>
<unicode hex="0033"/>
<outline>
- <component base="three.lf"/>
+ <contour>
+ <point x="262" y="-10" type="curve" smooth="yes"/>
+ <point x="415" y="-10"/>
+ <point x="520" y="68"/>
+ <point x="520" y="183" type="curve" smooth="yes"/>
+ <point x="520" y="285"/>
+ <point x="438" y="361"/>
+ <point x="317" y="373" type="curve"/>
+ <point x="316" y="358" type="line"/>
+ <point x="414" y="361"/>
+ <point x="482" y="436"/>
+ <point x="482" y="527" type="curve" smooth="yes"/>
+ <point x="482" y="632"/>
+ <point x="394" y="704"/>
+ <point x="267" y="704" type="curve" smooth="yes"/>
+ <point x="197" y="704"/>
+ <point x="121" y="683"/>
+ <point x="58" y="647" type="curve"/>
+ <point x="77" y="586" type="line"/>
+ <point x="137" y="614"/>
+ <point x="199" y="631"/>
+ <point x="250" y="631" type="curve" smooth="yes"/>
+ <point x="339" y="631"/>
+ <point x="397" y="585"/>
+ <point x="397" y="514" type="curve" smooth="yes"/>
+ <point x="397" y="436"/>
+ <point x="329" y="388"/>
+ <point x="218" y="388" type="curve" smooth="yes"/>
+ <point x="178" y="388" type="line"/>
+ <point x="178" y="316" type="line"/>
+ <point x="216" y="316" type="line" smooth="yes"/>
+ <point x="349" y="316"/>
+ <point x="435" y="261"/>
+ <point x="435" y="176" type="curve" smooth="yes"/>
+ <point x="435" y="105"/>
+ <point x="374" y="63"/>
+ <point x="270" y="63" type="curve" smooth="yes"/>
+ <point x="204" y="63"/>
+ <point x="126" y="80"/>
+ <point x="63" y="111" type="curve"/>
+ <point x="44" y="44" type="line"/>
+ <point x="110" y="10"/>
+ <point x="187" y="-10"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>three.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>three.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.glif b/src/Cantarell-Regular.ufo/glyphs/two.glif
index b73d13ca..2807520f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.glif
@@ -3,14 +3,31 @@
<advance width="539"/>
<unicode hex="0032"/>
<outline>
- <component base="two.lf"/>
+ <contour>
+ <point x="55" y="0" type="line"/>
+ <point x="490" y="0" type="line"/>
+ <point x="490" y="72" type="line"/>
+ <point x="140" y="72" type="line"/>
+ <point x="147" y="48" type="line"/>
+ <point x="371" y="266"/>
+ <point x="461" y="383"/>
+ <point x="461" y="510" type="curve" smooth="yes"/>
+ <point x="461" y="630"/>
+ <point x="382" y="704"/>
+ <point x="253" y="704" type="curve" smooth="yes"/>
+ <point x="172" y="704"/>
+ <point x="93" y="674"/>
+ <point x="43" y="625" type="curve"/>
+ <point x="68" y="567" type="line"/>
+ <point x="117" y="607"/>
+ <point x="180" y="631"/>
+ <point x="237" y="631" type="curve" smooth="yes"/>
+ <point x="322" y="631"/>
+ <point x="376" y="579"/>
+ <point x="376" y="496" type="curve" smooth="yes"/>
+ <point x="376" y="396"/>
+ <point x="298" y="291"/>
+ <point x="55" y="55" type="curve"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>two.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>two.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.glif b/src/Cantarell-Regular.ufo/glyphs/zero.glif
index bccb5d5b..1f899159 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.glif
@@ -2,15 +2,35 @@
<glyph name="zero" format="2">
<advance width="631"/>
<unicode hex="0030"/>
+ <anchor x="316" y="350" name="slash"/>
<outline>
- <component base="zero.lf"/>
+ <contour>
+ <point x="313" y="-10" type="curve" smooth="yes"/>
+ <point x="471" y="-10"/>
+ <point x="565" y="125"/>
+ <point x="565" y="352" type="curve" smooth="yes"/>
+ <point x="565" y="573"/>
+ <point x="474" y="704"/>
+ <point x="321" y="704" type="curve" smooth="yes"/>
+ <point x="161" y="704"/>
+ <point x="66" y="570"/>
+ <point x="66" y="342" type="curve" smooth="yes"/>
+ <point x="66" y="121"/>
+ <point x="158" y="-10"/>
+ </contour>
+ <contour>
+ <point x="320" y="62" type="curve" smooth="yes"/>
+ <point x="214" y="62"/>
+ <point x="151" y="170"/>
+ <point x="151" y="352" type="curve" smooth="yes"/>
+ <point x="151" y="528"/>
+ <point x="212" y="632"/>
+ <point x="314" y="632" type="curve" smooth="yes"/>
+ <point x="418" y="632"/>
+ <point x="480" y="524"/>
+ <point x="480" y="342" type="curve" smooth="yes"/>
+ <point x="480" y="166"/>
+ <point x="421" y="62"/>
+ </contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>zero.lf</string>
- <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>zero.lf</string>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif b/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif
index afd25649..781c00b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.zero.glif
@@ -2,14 +2,15 @@
<glyph name="zero.zero" format="2">
<advance width="631"/>
<outline>
- <component base="zero.lf.zero"/>
+ <component base="zero"/>
+ <component base="_slash.zero" xOffset="93" yOffset="109"/>
</outline>
<lib>
<dict>
<key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
- <string>zero.lf.zero</string>
+ <string>zero</string>
<key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
- <string>zero.lf.zero</string>
+ <string>zero</string>
</dict>
</lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/lib.plist b/src/Cantarell-Regular.ufo/lib.plist
index 5c3f97f7..67cad7ae 100644
--- a/src/Cantarell-Regular.ufo/lib.plist
+++ b/src/Cantarell-Regular.ufo/lib.plist
@@ -2067,17 +2067,6 @@
<string>seven</string>
<string>eight</string>
<string>nine</string>
- <string>zero.lf</string>
- <string>one.lf</string>
- <string>two.lf</string>
- <string>three.lf</string>
- <string>four.lf</string>
- <string>five.lf</string>
- <string>six.lf</string>
- <string>seven.lf</string>
- <string>eight.lf</string>
- <string>nine.lf</string>
- <string>zero.lf.zero</string>
<string>zero.osf</string>
<string>one.osf</string>
<string>two.osf</string>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
