[cantarell-fonts/tweak-numerals] First round of numerals tweaking
- From: Nikolaus Waxweiler <nwaxweiler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cantarell-fonts/tweak-numerals] First round of numerals tweaking
- Date: Sat, 6 Apr 2019 19:01:55 +0000 (UTC)
commit bbcd8e2b532a596eea286833bc08bc554467b0cb
Author: Nikolaus Waxweiler <madigens gmail com>
Date: Sat Apr 6 20:01:28 2019 +0100
First round of numerals tweaking
- Lightened Rg numerals
- Made proportional numbers the default
- Temporarily disabled other numerals
- /one lost its feet
- Wider /two
- Curve tweaking on /three
- Stem tweaking on /four
- Curve tweaking on /five
- Curve tweaks on /six and /nine
- Thinner /seven and /eight
src/Cantarell-Bold.ufo/features.fea | 236 ---------------------
src/Cantarell-Bold.ufo/glyphs/_bar-cy.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/_bottomhook.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/_commaaccent.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif | 6 -
.../glyphs/_descender-cy.case.straight.glif | 6 -
.../glyphs/_descenderreverse-cy.case.glif | 6 -
.../glyphs/_descenderreversed-cy.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/_o.numero.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/_slash.zero.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/_slash.zero.osf.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/_typoquote.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/contents.plist | 20 --
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/hryvnia.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/layerinfo.plist | 20 --
src/Cantarell-Bold.ufo/glyphs/nine.glif | 10 +-
src/Cantarell-Bold.ufo/glyphs/nine.lf.glif | 7 -
src/Cantarell-Bold.ufo/glyphs/one.glif | 21 +-
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/tenge.glif | 6 -
src/Cantarell-Bold.ufo/glyphs/three.glif | 53 ++++-
src/Cantarell-Bold.ufo/glyphs/three.lf.glif | 50 -----
src/Cantarell-Bold.ufo/glyphs/tugrik.glif | 6 -
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 | 2 +-
src/Cantarell-Bold.ufo/lib.plist | 137 ++++++++++--
src/Cantarell-Light.ufo/features.fea | 236 ---------------------
src/Cantarell-Light.ufo/glyphs/_bar-cy.glif | 6 -
src/Cantarell-Light.ufo/glyphs/_bottomhook.glif | 6 -
src/Cantarell-Light.ufo/glyphs/_commaaccent.glif | 6 -
src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif | 6 -
.../glyphs/_descender-cy.case.straight.glif | 6 -
.../glyphs/_descenderreverse-cy.case.glif | 6 -
.../glyphs/_descenderreversed-cy.glif | 6 -
src/Cantarell-Light.ufo/glyphs/_o.numero.glif | 2 -
src/Cantarell-Light.ufo/glyphs/_slash.zero.glif | 6 -
.../glyphs/_slash.zero.osf.glif | 6 -
src/Cantarell-Light.ufo/glyphs/_typoquote.glif | 6 -
src/Cantarell-Light.ufo/glyphs/contents.plist | 20 --
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/hryvnia.glif | 6 -
src/Cantarell-Light.ufo/glyphs/layerinfo.plist | 20 --
src/Cantarell-Light.ufo/glyphs/nine.glif | 10 +-
src/Cantarell-Light.ufo/glyphs/nine.lf.glif | 7 -
src/Cantarell-Light.ufo/glyphs/one.glif | 21 +-
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/tenge.glif | 6 -
src/Cantarell-Light.ufo/glyphs/three.glif | 53 ++++-
src/Cantarell-Light.ufo/glyphs/three.lf.glif | 50 -----
src/Cantarell-Light.ufo/glyphs/tugrik.glif | 6 -
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 | 2 +-
src/Cantarell-Light.ufo/lib.plist | 137 ++++++++++--
src/Cantarell-Regular.ufo/features.fea | 236 ---------------------
src/Cantarell-Regular.ufo/glyphs/_bar-cy.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/_bottomhook.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/_commaaccent.glif | 6 -
.../glyphs/_currencyvstem.glif | 6 -
.../glyphs/_descender-cy.case.straight.glif | 6 -
.../glyphs/_descenderreverse-cy.case.glif | 6 -
.../glyphs/_descenderreversed-cy.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/_o.numero.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/_slash.zero.glif | 6 -
.../glyphs/_slash.zero.osf.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/_typoquote.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/contents.plist | 20 --
src/Cantarell-Regular.ufo/glyphs/eight.glif | 57 ++++-
src/Cantarell-Regular.ufo/glyphs/eight.lf.glif | 52 -----
src/Cantarell-Regular.ufo/glyphs/five.glif | 44 +++-
src/Cantarell-Regular.ufo/glyphs/five.lf.glif | 39 ----
src/Cantarell-Regular.ufo/glyphs/four.glif | 25 ++-
src/Cantarell-Regular.ufo/glyphs/four.lf.glif | 20 --
src/Cantarell-Regular.ufo/glyphs/hryvnia.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/layerinfo.plist | 20 --
src/Cantarell-Regular.ufo/glyphs/nine.glif | 12 +-
src/Cantarell-Regular.ufo/glyphs/nine.lf.glif | 7 -
src/Cantarell-Regular.ufo/glyphs/one.glif | 21 +-
src/Cantarell-Regular.ufo/glyphs/one.lf.glif | 22 --
src/Cantarell-Regular.ufo/glyphs/seven.glif | 21 +-
src/Cantarell-Regular.ufo/glyphs/seven.lf.glif | 16 --
src/Cantarell-Regular.ufo/glyphs/six.glif | 51 ++++-
src/Cantarell-Regular.ufo/glyphs/six.lf.glif | 46 ----
src/Cantarell-Regular.ufo/glyphs/tenge.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/three.glif | 55 ++++-
src/Cantarell-Regular.ufo/glyphs/three.lf.glif | 50 -----
src/Cantarell-Regular.ufo/glyphs/tugrik.glif | 6 -
src/Cantarell-Regular.ufo/glyphs/two.glif | 37 +++-
src/Cantarell-Regular.ufo/glyphs/two.lf.glif | 32 ---
src/Cantarell-Regular.ufo/glyphs/zero.glif | 40 +++-
src/Cantarell-Regular.ufo/glyphs/zero.lf.glif | 35 ---
src/Cantarell-Regular.ufo/glyphs/zero.lf.zero.glif | 2 +-
src/Cantarell-Regular.ufo/lib.plist | 137 ++++++++++--
src/Cantarell.designspace | 108 ++++++++++
src/Cantarell_autospace.py | 2 +-
119 files changed, 1258 insertions(+), 2355 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/features.fea b/src/Cantarell-Bold.ufo/features.fea
index da527abc..67e5350f 100644
--- a/src/Cantarell-Bold.ufo/features.fea
+++ b/src/Cantarell-Bold.ufo/features.fea
@@ -25,25 +25,13 @@ table GDEF {
;
} GDEF;
-
feature aalt {
# automatic
feature locl;
-feature subs;
-feature sinf;
-feature sups;
-feature numr;
-feature dnom;
-feature frac;
feature ordn;
-feature lnum;
feature pnum;
feature tnum;
-feature onum;
feature case;
-feature zero;
-feature salt;
-feature ss01;
} aalt;
@@ -179,96 +167,6 @@ sub i by idotaccent;
} locl;
-feature subs {
-# automatic
-sub zero by zeroinferior;
-sub one by oneinferior;
-sub two by twoinferior;
-sub three by threeinferior;
-sub four by fourinferior;
-sub five by fiveinferior;
-sub six by sixinferior;
-sub seven by seveninferior;
-sub eight by eightinferior;
-sub nine by nineinferior;
-
-} subs;
-
-feature sinf {
-# automatic
-sub zero by zero.subs;
-sub one by one.subs;
-sub two by two.subs;
-sub three by three.subs;
-sub four by four.subs;
-sub five by five.subs;
-sub six by six.subs;
-sub seven by seven.subs;
-sub eight by eight.subs;
-sub nine by nine.subs;
-
-} sinf;
-
-feature sups {
-# automatic
-sub zero by zerosuperior;
-sub one by onesuperior;
-sub two by twosuperior;
-sub three by threesuperior;
-sub four by foursuperior;
-sub five by fivesuperior;
-sub six by sixsuperior;
-sub seven by sevensuperior;
-sub eight by eightsuperior;
-sub nine by ninesuperior;
-
-} sups;
-
-feature numr {
-# automatic
-sub zero by zero.numr;
-sub one by one.numr;
-sub two by two.numr;
-sub three by three.numr;
-sub four by four.numr;
-sub five by five.numr;
-sub six by six.numr;
-sub seven by seven.numr;
-sub eight by eight.numr;
-sub nine by nine.numr;
-
-} numr;
-
-feature dnom {
-# automatic
-sub zero by zero.dnom;
-sub one by one.dnom;
-sub two by two.dnom;
-sub three by three.dnom;
-sub four by four.dnom;
-sub five by five.dnom;
-sub six by six.dnom;
-sub seven by seven.dnom;
-sub eight by eight.dnom;
-sub nine by nine.dnom;
-
-} dnom;
-
-feature frac {
-# automatic
-lookup FRAC {
- sub slash by fraction;
-} FRAC;
-lookup UP {
- sub [zero one two three four five six seven eight nine] by [zero.numr one.numr two.numr three.numr
four.numr five.numr six.numr seven.numr eight.numr nine.numr];
-} UP;
-lookup DOWN {
- sub fraction [zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr
eight.numr nine.numr]' by [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom
eight.dnom nine.dnom];
- sub [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom
nine.dnom] [zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr
nine.numr]' by [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom
nine.dnom];
-} DOWN;
-
-} frac;
-
feature ordn {
# automatic
sub [zero one two three four five six seven eight nine] [A a]' by ordfeminine;
@@ -277,33 +175,8 @@ sub N o period by numero;
} ordn;
-feature lnum {
-# automatic
-sub zero.osf by zero;
-sub one.osf by one;
-sub two.osf by two;
-sub three.osf by three;
-sub four.osf by four;
-sub five.osf by five;
-sub six.osf by six;
-sub seven.osf by seven;
-sub eight.osf by eight;
-sub nine.osf by nine;
-
-} lnum;
-
feature pnum {
# automatic
-sub zero.tf by zero;
-sub one.tf by one;
-sub two.tf by two;
-sub three.tf by three;
-sub four.tf by four;
-sub five.tf by five;
-sub six.tf by six;
-sub seven.tf by seven;
-sub eight.tf by eight;
-sub nine.tf by nine;
sub bulletoperator.tf by bulletoperator;
sub commercialMinusSign.tf by commercialMinusSign;
sub divisionslash.tf by divisionslash;
@@ -322,31 +195,11 @@ sub lessequal.tf by lessequal;
sub plusminus.tf by plusminus;
sub approxequal.tf by approxequal;
sub logicalnot.tf by logicalnot;
-sub zero.tosf by zero.osf;
-sub one.tosf by one.osf;
-sub two.tosf by two.osf;
-sub three.tosf by three.osf;
-sub four.tosf by four.osf;
-sub five.tosf by five.osf;
-sub six.tosf by six.osf;
-sub seven.tosf by seven.osf;
-sub eight.tosf by eight.osf;
-sub nine.tosf by nine.osf;
} pnum;
feature tnum {
# automatic
-sub zero by zero.tf;
-sub one by one.tf;
-sub two by two.tf;
-sub three by three.tf;
-sub four by four.tf;
-sub five by five.tf;
-sub six by six.tf;
-sub seven by seven.tf;
-sub eight by eight.tf;
-sub nine by nine.tf;
sub bulletoperator by bulletoperator.tf;
sub commercialMinusSign by commercialMinusSign.tf;
sub divisionslash by divisionslash.tf;
@@ -365,44 +218,9 @@ sub lessequal by lessequal.tf;
sub plusminus by plusminus.tf;
sub approxequal by approxequal.tf;
sub logicalnot by logicalnot.tf;
-sub zero.osf by zero.tosf;
-sub one.osf by one.tosf;
-sub two.osf by two.tosf;
-sub three.osf by three.tosf;
-sub four.osf by four.tosf;
-sub five.osf by five.tosf;
-sub six.osf by six.tosf;
-sub seven.osf by seven.tosf;
-sub eight.osf by eight.tosf;
-sub nine.osf by nine.tosf;
} tnum;
-feature onum {
-# automatic
-sub zero.tf by zero.tosf;
-sub one.tf by one.tosf;
-sub two.tf by two.tosf;
-sub three.tf by three.tosf;
-sub four.tf by four.tosf;
-sub five.tf by five.tosf;
-sub six.tf by six.tosf;
-sub seven.tf by seven.tosf;
-sub eight.tf by eight.tosf;
-sub nine.tf by nine.tosf;
-sub zero by zero.osf;
-sub one by one.osf;
-sub two by two.osf;
-sub three by three.osf;
-sub four by four.osf;
-sub five by five.osf;
-sub six by six.osf;
-sub seven by seven.osf;
-sub eight by eight.osf;
-sub nine by nine.osf;
-
-} onum;
-
feature case {
# automatic
sub periodcentered.loclCAT by periodcentered.loclCAT.case;
@@ -436,36 +254,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;
@@ -478,27 +266,3 @@ sub f i by fi;
sub f l by fl;
} liga;
-
-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;
-sub zero by zero.zero;
-
-} zero;
-
-feature salt {
-# automatic
-sub six by six.ss01;
-sub nine by nine.ss01;
-
-} salt;
-
-feature ss01 {
-# automatic
-sub six by six.ss01;
-sub nine by nine.ss01;
-
-} ss01;
diff --git a/src/Cantarell-Bold.ufo/glyphs/_bar-cy.glif b/src/Cantarell-Bold.ufo/glyphs/_bar-cy.glif
index 1b5ac7c1..35d13af2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_bar-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_bar-cy.glif
@@ -10,10 +10,4 @@
<point x="133" y="410" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_bottomhook.glif b/src/Cantarell-Bold.ufo/glyphs/_bottomhook.glif
index b4f23760..d3ff1489 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_bottomhook.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_bottomhook.glif
@@ -16,10 +16,4 @@
<point x="362" y="-131" type="curve"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_commaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/_commaaccent.glif
index 080085aa..7e774410 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_commaaccent.glif
@@ -13,10 +13,4 @@
<point x="76" y="-187"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
b/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
index 2b11bd8f..e990aaab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
@@ -9,10 +9,4 @@
<point x="102" y="842" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_descender-cy.case.straight.glif
b/src/Cantarell-Bold.ufo/glyphs/_descender-cy.case.straight.glif
index 1b2fcd13..4a1315a7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_descender-cy.case.straight.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_descender-cy.case.straight.glif
@@ -10,10 +10,4 @@
<point x="96" y="131" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
b/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
index 9d42717a..db38c7c0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -12,10 +12,4 @@
<point x="-20" y="151" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
b/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
index 75643712..7c9103bc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_descenderreversed-cy.glif
@@ -12,10 +12,4 @@
<point x="47" y="123" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_o.numero.glif b/src/Cantarell-Bold.ufo/glyphs/_o.numero.glif
index e66e8efc..f77b335c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_o.numero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_o.numero.glif
@@ -13,10 +13,4 @@ o
</contour>
<component base="o" yOffset="204"/>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_slash.zero.glif b/src/Cantarell-Bold.ufo/glyphs/_slash.zero.glif
index fdb25ac9..5b36e8e9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_slash.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_slash.zero.glif
@@ -10,10 +10,4 @@
<point x="45" y="49" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_slash.zero.osf.glif
b/src/Cantarell-Bold.ufo/glyphs/_slash.zero.osf.glif
index 0e67edd9..a47d2d46 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_slash.zero.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_slash.zero.osf.glif
@@ -10,10 +10,4 @@
<point x="77" y="96" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif b/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif
index 8db12f68..dccf1d1b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_typoquote.glif
@@ -13,10 +13,4 @@
<point x="102" y="-82"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/contents.plist b/src/Cantarell-Bold.ufo/glyphs/contents.plist
index 9388164c..fe882767 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>
@@ -1628,8 +1620,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>
@@ -1838,8 +1828,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>
@@ -1866,8 +1854,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>
@@ -1938,8 +1924,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>
@@ -1992,8 +1976,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>
@@ -2168,8 +2150,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>
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/hryvnia.glif b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
index 6f67c701..b02df3ed 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
@@ -4,10 +4,4 @@
<unicode hex="20B4"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
index a880a192..9d318851 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>
@@ -1632,8 +1624,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>
@@ -1842,8 +1832,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>
@@ -1870,8 +1858,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>
@@ -1942,8 +1928,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>
@@ -1996,8 +1980,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>
@@ -2172,8 +2154,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>
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..b49ae343 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.glif
@@ -1,16 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one" format="2">
- <advance width="492"/>
+ <advance width="405"/>
<unicode hex="0031"/>
<outline>
- <component base="one.lf"/>
+ <contour>
+ <point x="168" y="0" type="line"/>
+ <point x="341" y="0" type="line"/>
+ <point x="341" y="694" type="line"/>
+ <point x="238" y="694" type="line"/>
+ <point x="-1" y="556" type="line"/>
+ <point x="64" y="432" type="line"/>
+ <point x="222" y="514" type="line"/>
+ <point x="168" y="569" 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/tenge.glif b/src/Cantarell-Bold.ufo/glyphs/tenge.glif
index 90731167..a067c2d7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tenge.glif
@@ -4,10 +4,4 @@
<unicode hex="20B8"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </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/tugrik.glif b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
index 88cf1fac..f5d41ab5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
@@ -4,10 +4,4 @@
<unicode hex="20AE"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </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.lf.zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.lf.zero.glif
index ac4be755..bb82f004 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.lf.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.lf.zero.glif
@@ -2,7 +2,7 @@
<glyph name="zero.lf.zero" format="2">
<advance width="640"/>
<outline>
- <component base="zero.lf"/>
+ <component base="zero"/>
<component base="_slash.zero" xOffset="99" yOffset="104"/>
</outline>
<lib>
diff --git a/src/Cantarell-Bold.ufo/lib.plist b/src/Cantarell-Bold.ufo/lib.plist
index abaab4e3..9f06b09f 100644
--- a/src/Cantarell-Bold.ufo/lib.plist
+++ b/src/Cantarell-Bold.ufo/lib.plist
@@ -538,8 +538,6 @@
</dict>
<key>com.schriftgestaltung.appVersion</key>
<string>1192</string>
- <key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
- <string></string>
<key>com.schriftgestaltung.customParameter.GSFont.Family Alignment Zones</key>
<array>
<string>{739, 10}</string>
@@ -1279,16 +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>
@@ -2930,5 +2918,130 @@
<key>zhedieresis-cy</key>
<string>uni04DD</string>
</dict>
+ <key>public.skipExportGlyphs</key>
+ <array>
+ <string>_bar-cy</string>
+ <string>_bottomhook</string>
+ <string>_commaaccent</string>
+ <string>_currencyvstem</string>
+ <string>_descender-cy.case.straight</string>
+ <string>_descenderreverse-cy.case</string>
+ <string>_descenderreversed-cy</string>
+ <string>_o.numero</string>
+ <string>_slash.zero</string>
+ <string>_slash.zero.osf</string>
+ <string>_typoquote</string>
+ <string>eight.dnom</string>
+ <string>eight.numr</string>
+ <string>eight.osf</string>
+ <string>eight.subs</string>
+ <string>eight.tf</string>
+ <string>eight.tosf</string>
+ <string>eightinferior</string>
+ <string>eightsuperior</string>
+ <string>five.dnom</string>
+ <string>five.numr</string>
+ <string>five.osf</string>
+ <string>five.subs</string>
+ <string>five.tf</string>
+ <string>five.tosf</string>
+ <string>fiveeighths</string>
+ <string>fiveinferior</string>
+ <string>fivesixths</string>
+ <string>fivesuperior</string>
+ <string>four.dnom</string>
+ <string>four.numr</string>
+ <string>four.osf</string>
+ <string>four.subs</string>
+ <string>four.tf</string>
+ <string>four.tosf</string>
+ <string>fourfifths</string>
+ <string>fourinferior</string>
+ <string>foursuperior</string>
+ <string>fraction</string>
+ <string>hryvnia</string>
+ <string>nine.dnom</string>
+ <string>nine.numr</string>
+ <string>nine.osf</string>
+ <string>nine.ss01</string>
+ <string>nine.subs</string>
+ <string>nine.tf</string>
+ <string>nine.tosf</string>
+ <string>nineinferior</string>
+ <string>ninesuperior</string>
+ <string>one.dnom</string>
+ <string>one.numr</string>
+ <string>one.osf</string>
+ <string>one.subs</string>
+ <string>one.tf</string>
+ <string>one.tosf</string>
+ <string>oneeighth</string>
+ <string>onefifth</string>
+ <string>onefraction</string>
+ <string>onehalf</string>
+ <string>oneinferior</string>
+ <string>oneninth</string>
+ <string>onequarter</string>
+ <string>oneseventh</string>
+ <string>onesixth</string>
+ <string>onesuperior</string>
+ <string>onetenth</string>
+ <string>onethird</string>
+ <string>seven.dnom</string>
+ <string>seven.numr</string>
+ <string>seven.osf</string>
+ <string>seven.subs</string>
+ <string>seven.tf</string>
+ <string>seven.tosf</string>
+ <string>seveneighths</string>
+ <string>seveninferior</string>
+ <string>sevensuperior</string>
+ <string>six.dnom</string>
+ <string>six.numr</string>
+ <string>six.osf</string>
+ <string>six.ss01</string>
+ <string>six.subs</string>
+ <string>six.tf</string>
+ <string>six.tosf</string>
+ <string>sixinferior</string>
+ <string>sixsuperior</string>
+ <string>tenge</string>
+ <string>three.dnom</string>
+ <string>three.numr</string>
+ <string>three.osf</string>
+ <string>three.subs</string>
+ <string>three.tf</string>
+ <string>three.tosf</string>
+ <string>threeeighths</string>
+ <string>threefifths</string>
+ <string>threeinferior</string>
+ <string>threequarters</string>
+ <string>threesuperior</string>
+ <string>tugrik</string>
+ <string>two.dnom</string>
+ <string>two.numr</string>
+ <string>two.osf</string>
+ <string>two.subs</string>
+ <string>two.tf</string>
+ <string>two.tosf</string>
+ <string>twofifths</string>
+ <string>twoinferior</string>
+ <string>twosuperior</string>
+ <string>twothirds</string>
+ <string>zero.dnom</string>
+ <string>zero.lf.zero</string>
+ <string>zero.numr</string>
+ <string>zero.osf</string>
+ <string>zero.osf.zero</string>
+ <string>zero.subs</string>
+ <string>zero.tf</string>
+ <string>zero.tf.zero</string>
+ <string>zero.tosf</string>
+ <string>zero.tosf.zero</string>
+ <string>zero.zero</string>
+ <string>zeroinferior</string>
+ <string>zerosuperior</string>
+ <string>zerothird</string>
+ </array>
</dict>
</plist>
diff --git a/src/Cantarell-Light.ufo/features.fea b/src/Cantarell-Light.ufo/features.fea
index da527abc..67e5350f 100644
--- a/src/Cantarell-Light.ufo/features.fea
+++ b/src/Cantarell-Light.ufo/features.fea
@@ -25,25 +25,13 @@ table GDEF {
;
} GDEF;
-
feature aalt {
# automatic
feature locl;
-feature subs;
-feature sinf;
-feature sups;
-feature numr;
-feature dnom;
-feature frac;
feature ordn;
-feature lnum;
feature pnum;
feature tnum;
-feature onum;
feature case;
-feature zero;
-feature salt;
-feature ss01;
} aalt;
@@ -179,96 +167,6 @@ sub i by idotaccent;
} locl;
-feature subs {
-# automatic
-sub zero by zeroinferior;
-sub one by oneinferior;
-sub two by twoinferior;
-sub three by threeinferior;
-sub four by fourinferior;
-sub five by fiveinferior;
-sub six by sixinferior;
-sub seven by seveninferior;
-sub eight by eightinferior;
-sub nine by nineinferior;
-
-} subs;
-
-feature sinf {
-# automatic
-sub zero by zero.subs;
-sub one by one.subs;
-sub two by two.subs;
-sub three by three.subs;
-sub four by four.subs;
-sub five by five.subs;
-sub six by six.subs;
-sub seven by seven.subs;
-sub eight by eight.subs;
-sub nine by nine.subs;
-
-} sinf;
-
-feature sups {
-# automatic
-sub zero by zerosuperior;
-sub one by onesuperior;
-sub two by twosuperior;
-sub three by threesuperior;
-sub four by foursuperior;
-sub five by fivesuperior;
-sub six by sixsuperior;
-sub seven by sevensuperior;
-sub eight by eightsuperior;
-sub nine by ninesuperior;
-
-} sups;
-
-feature numr {
-# automatic
-sub zero by zero.numr;
-sub one by one.numr;
-sub two by two.numr;
-sub three by three.numr;
-sub four by four.numr;
-sub five by five.numr;
-sub six by six.numr;
-sub seven by seven.numr;
-sub eight by eight.numr;
-sub nine by nine.numr;
-
-} numr;
-
-feature dnom {
-# automatic
-sub zero by zero.dnom;
-sub one by one.dnom;
-sub two by two.dnom;
-sub three by three.dnom;
-sub four by four.dnom;
-sub five by five.dnom;
-sub six by six.dnom;
-sub seven by seven.dnom;
-sub eight by eight.dnom;
-sub nine by nine.dnom;
-
-} dnom;
-
-feature frac {
-# automatic
-lookup FRAC {
- sub slash by fraction;
-} FRAC;
-lookup UP {
- sub [zero one two three four five six seven eight nine] by [zero.numr one.numr two.numr three.numr
four.numr five.numr six.numr seven.numr eight.numr nine.numr];
-} UP;
-lookup DOWN {
- sub fraction [zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr
eight.numr nine.numr]' by [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom
eight.dnom nine.dnom];
- sub [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom
nine.dnom] [zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr
nine.numr]' by [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom
nine.dnom];
-} DOWN;
-
-} frac;
-
feature ordn {
# automatic
sub [zero one two three four five six seven eight nine] [A a]' by ordfeminine;
@@ -277,33 +175,8 @@ sub N o period by numero;
} ordn;
-feature lnum {
-# automatic
-sub zero.osf by zero;
-sub one.osf by one;
-sub two.osf by two;
-sub three.osf by three;
-sub four.osf by four;
-sub five.osf by five;
-sub six.osf by six;
-sub seven.osf by seven;
-sub eight.osf by eight;
-sub nine.osf by nine;
-
-} lnum;
-
feature pnum {
# automatic
-sub zero.tf by zero;
-sub one.tf by one;
-sub two.tf by two;
-sub three.tf by three;
-sub four.tf by four;
-sub five.tf by five;
-sub six.tf by six;
-sub seven.tf by seven;
-sub eight.tf by eight;
-sub nine.tf by nine;
sub bulletoperator.tf by bulletoperator;
sub commercialMinusSign.tf by commercialMinusSign;
sub divisionslash.tf by divisionslash;
@@ -322,31 +195,11 @@ sub lessequal.tf by lessequal;
sub plusminus.tf by plusminus;
sub approxequal.tf by approxequal;
sub logicalnot.tf by logicalnot;
-sub zero.tosf by zero.osf;
-sub one.tosf by one.osf;
-sub two.tosf by two.osf;
-sub three.tosf by three.osf;
-sub four.tosf by four.osf;
-sub five.tosf by five.osf;
-sub six.tosf by six.osf;
-sub seven.tosf by seven.osf;
-sub eight.tosf by eight.osf;
-sub nine.tosf by nine.osf;
} pnum;
feature tnum {
# automatic
-sub zero by zero.tf;
-sub one by one.tf;
-sub two by two.tf;
-sub three by three.tf;
-sub four by four.tf;
-sub five by five.tf;
-sub six by six.tf;
-sub seven by seven.tf;
-sub eight by eight.tf;
-sub nine by nine.tf;
sub bulletoperator by bulletoperator.tf;
sub commercialMinusSign by commercialMinusSign.tf;
sub divisionslash by divisionslash.tf;
@@ -365,44 +218,9 @@ sub lessequal by lessequal.tf;
sub plusminus by plusminus.tf;
sub approxequal by approxequal.tf;
sub logicalnot by logicalnot.tf;
-sub zero.osf by zero.tosf;
-sub one.osf by one.tosf;
-sub two.osf by two.tosf;
-sub three.osf by three.tosf;
-sub four.osf by four.tosf;
-sub five.osf by five.tosf;
-sub six.osf by six.tosf;
-sub seven.osf by seven.tosf;
-sub eight.osf by eight.tosf;
-sub nine.osf by nine.tosf;
} tnum;
-feature onum {
-# automatic
-sub zero.tf by zero.tosf;
-sub one.tf by one.tosf;
-sub two.tf by two.tosf;
-sub three.tf by three.tosf;
-sub four.tf by four.tosf;
-sub five.tf by five.tosf;
-sub six.tf by six.tosf;
-sub seven.tf by seven.tosf;
-sub eight.tf by eight.tosf;
-sub nine.tf by nine.tosf;
-sub zero by zero.osf;
-sub one by one.osf;
-sub two by two.osf;
-sub three by three.osf;
-sub four by four.osf;
-sub five by five.osf;
-sub six by six.osf;
-sub seven by seven.osf;
-sub eight by eight.osf;
-sub nine by nine.osf;
-
-} onum;
-
feature case {
# automatic
sub periodcentered.loclCAT by periodcentered.loclCAT.case;
@@ -436,36 +254,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;
@@ -478,27 +266,3 @@ sub f i by fi;
sub f l by fl;
} liga;
-
-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;
-sub zero by zero.zero;
-
-} zero;
-
-feature salt {
-# automatic
-sub six by six.ss01;
-sub nine by nine.ss01;
-
-} salt;
-
-feature ss01 {
-# automatic
-sub six by six.ss01;
-sub nine by nine.ss01;
-
-} ss01;
diff --git a/src/Cantarell-Light.ufo/glyphs/_bar-cy.glif b/src/Cantarell-Light.ufo/glyphs/_bar-cy.glif
index daf5ef76..bafac1c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/_bar-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_bar-cy.glif
@@ -10,10 +10,4 @@
<point x="160" y="351" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_bottomhook.glif b/src/Cantarell-Light.ufo/glyphs/_bottomhook.glif
index 0138b0da..363313ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/_bottomhook.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_bottomhook.glif
@@ -16,10 +16,4 @@
<point x="350" y="-207" type="curve"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_commaaccent.glif
b/src/Cantarell-Light.ufo/glyphs/_commaaccent.glif
index 2cd605a1..8d101461 100644
--- a/src/Cantarell-Light.ufo/glyphs/_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_commaaccent.glif
@@ -13,10 +13,4 @@
<point x="123" y="-193"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
b/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
index d6f66d74..3a90ad4a 100644
--- a/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
@@ -9,10 +9,4 @@
<point x="408" y="840" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_descender-cy.case.straight.glif
b/src/Cantarell-Light.ufo/glyphs/_descender-cy.case.straight.glif
index 0d2cb105..3d9333ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/_descender-cy.case.straight.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_descender-cy.case.straight.glif
@@ -10,10 +10,4 @@
<point x="96" y="9" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
b/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
index 9ae7ea44..e2135177 100644
--- a/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -12,10 +12,4 @@
<point x="10" y="19" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
b/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
index 1d1e6d74..c07e0e5c 100644
--- a/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_descenderreversed-cy.glif
@@ -12,10 +12,4 @@
<point x="44" y="19" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_o.numero.glif b/src/Cantarell-Light.ufo/glyphs/_o.numero.glif
index 29d75b79..3338fd9a 100644
--- a/src/Cantarell-Light.ufo/glyphs/_o.numero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_o.numero.glif
@@ -15,8 +15,6 @@ o
</outline>
<lib>
<dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
<key>com.schriftgestaltung.componentsAlignment</key>
<array>
<integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/_slash.zero.glif b/src/Cantarell-Light.ufo/glyphs/_slash.zero.glif
index 2b07ef73..65b3a2fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/_slash.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_slash.zero.glif
@@ -10,10 +10,4 @@
<point x="48" y="-2" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_slash.zero.osf.glif
b/src/Cantarell-Light.ufo/glyphs/_slash.zero.osf.glif
index 7f435380..da9d537d 100644
--- a/src/Cantarell-Light.ufo/glyphs/_slash.zero.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_slash.zero.osf.glif
@@ -10,10 +10,4 @@
<point x="66" y="29" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/_typoquote.glif b/src/Cantarell-Light.ufo/glyphs/_typoquote.glif
index 2c0699c3..5187e624 100644
--- a/src/Cantarell-Light.ufo/glyphs/_typoquote.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_typoquote.glif
@@ -13,10 +13,4 @@
<point x="120" y="-93"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/contents.plist b/src/Cantarell-Light.ufo/glyphs/contents.plist
index 9388164c..fe882767 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>
@@ -1628,8 +1620,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>
@@ -1838,8 +1828,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>
@@ -1866,8 +1854,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>
@@ -1938,8 +1924,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>
@@ -1992,8 +1976,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>
@@ -2168,8 +2150,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>
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/hryvnia.glif b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
index 6f67c701..b02df3ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
@@ -4,10 +4,4 @@
<unicode hex="20B4"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index 14eeb55b..2adf7148 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>
@@ -1632,8 +1624,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>
@@ -1842,8 +1832,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>
@@ -1870,8 +1858,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>
@@ -1942,8 +1928,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>
@@ -1996,8 +1980,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>
@@ -2172,8 +2154,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>
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..10e26fbb 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.glif
@@ -1,16 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one" format="2">
- <advance width="379"/>
+ <advance width="306"/>
<unicode hex="0031"/>
<outline>
- <component base="one.lf"/>
+ <contour>
+ <point x="181" y="0" type="line"/>
+ <point x="201" y="0" type="line"/>
+ <point x="201" y="694" type="line"/>
+ <point x="189" y="694" type="line"/>
+ <point x="38" y="581" type="line"/>
+ <point x="46" y="569" type="line"/>
+ <point x="189" y="672" type="line"/>
+ <point x="181" y="677" 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/tenge.glif b/src/Cantarell-Light.ufo/glyphs/tenge.glif
index 90731167..a067c2d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tenge.glif
@@ -4,10 +4,4 @@
<unicode hex="20B8"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </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/tugrik.glif b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
index 88cf1fac..f5d41ab5 100644
--- a/src/Cantarell-Light.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
@@ -4,10 +4,4 @@
<unicode hex="20AE"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </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.lf.zero.glif
b/src/Cantarell-Light.ufo/glyphs/zero.lf.zero.glif
index 8635936e..48e79e9d 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.lf.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.lf.zero.glif
@@ -2,7 +2,7 @@
<glyph name="zero.lf.zero" format="2">
<advance width="601"/>
<outline>
- <component base="zero.lf"/>
+ <component base="zero"/>
<component base="_slash.zero" xOffset="86" yOffset="109"/>
</outline>
<lib>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index c84514e5..2355f7a9 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -538,8 +538,6 @@
</dict>
<key>com.schriftgestaltung.appVersion</key>
<string>1192</string>
- <key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
- <string></string>
<key>com.schriftgestaltung.customParameter.GSFont.Family Alignment Zones</key>
<array>
<string>{739, 10}</string>
@@ -1279,16 +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>
@@ -2930,5 +2918,130 @@
<key>zhedieresis-cy</key>
<string>uni04DD</string>
</dict>
+ <key>public.skipExportGlyphs</key>
+ <array>
+ <string>_bar-cy</string>
+ <string>_bottomhook</string>
+ <string>_commaaccent</string>
+ <string>_currencyvstem</string>
+ <string>_descender-cy.case.straight</string>
+ <string>_descenderreverse-cy.case</string>
+ <string>_descenderreversed-cy</string>
+ <string>_o.numero</string>
+ <string>_slash.zero</string>
+ <string>_slash.zero.osf</string>
+ <string>_typoquote</string>
+ <string>eight.dnom</string>
+ <string>eight.numr</string>
+ <string>eight.osf</string>
+ <string>eight.subs</string>
+ <string>eight.tf</string>
+ <string>eight.tosf</string>
+ <string>eightinferior</string>
+ <string>eightsuperior</string>
+ <string>five.dnom</string>
+ <string>five.numr</string>
+ <string>five.osf</string>
+ <string>five.subs</string>
+ <string>five.tf</string>
+ <string>five.tosf</string>
+ <string>fiveeighths</string>
+ <string>fiveinferior</string>
+ <string>fivesixths</string>
+ <string>fivesuperior</string>
+ <string>four.dnom</string>
+ <string>four.numr</string>
+ <string>four.osf</string>
+ <string>four.subs</string>
+ <string>four.tf</string>
+ <string>four.tosf</string>
+ <string>fourfifths</string>
+ <string>fourinferior</string>
+ <string>foursuperior</string>
+ <string>fraction</string>
+ <string>hryvnia</string>
+ <string>nine.dnom</string>
+ <string>nine.numr</string>
+ <string>nine.osf</string>
+ <string>nine.ss01</string>
+ <string>nine.subs</string>
+ <string>nine.tf</string>
+ <string>nine.tosf</string>
+ <string>nineinferior</string>
+ <string>ninesuperior</string>
+ <string>one.dnom</string>
+ <string>one.numr</string>
+ <string>one.osf</string>
+ <string>one.subs</string>
+ <string>one.tf</string>
+ <string>one.tosf</string>
+ <string>oneeighth</string>
+ <string>onefifth</string>
+ <string>onefraction</string>
+ <string>onehalf</string>
+ <string>oneinferior</string>
+ <string>oneninth</string>
+ <string>onequarter</string>
+ <string>oneseventh</string>
+ <string>onesixth</string>
+ <string>onesuperior</string>
+ <string>onetenth</string>
+ <string>onethird</string>
+ <string>seven.dnom</string>
+ <string>seven.numr</string>
+ <string>seven.osf</string>
+ <string>seven.subs</string>
+ <string>seven.tf</string>
+ <string>seven.tosf</string>
+ <string>seveneighths</string>
+ <string>seveninferior</string>
+ <string>sevensuperior</string>
+ <string>six.dnom</string>
+ <string>six.numr</string>
+ <string>six.osf</string>
+ <string>six.ss01</string>
+ <string>six.subs</string>
+ <string>six.tf</string>
+ <string>six.tosf</string>
+ <string>sixinferior</string>
+ <string>sixsuperior</string>
+ <string>tenge</string>
+ <string>three.dnom</string>
+ <string>three.numr</string>
+ <string>three.osf</string>
+ <string>three.subs</string>
+ <string>three.tf</string>
+ <string>three.tosf</string>
+ <string>threeeighths</string>
+ <string>threefifths</string>
+ <string>threeinferior</string>
+ <string>threequarters</string>
+ <string>threesuperior</string>
+ <string>tugrik</string>
+ <string>two.dnom</string>
+ <string>two.numr</string>
+ <string>two.osf</string>
+ <string>two.subs</string>
+ <string>two.tf</string>
+ <string>two.tosf</string>
+ <string>twofifths</string>
+ <string>twoinferior</string>
+ <string>twosuperior</string>
+ <string>twothirds</string>
+ <string>zero.dnom</string>
+ <string>zero.lf.zero</string>
+ <string>zero.numr</string>
+ <string>zero.osf</string>
+ <string>zero.osf.zero</string>
+ <string>zero.subs</string>
+ <string>zero.tf</string>
+ <string>zero.tf.zero</string>
+ <string>zero.tosf</string>
+ <string>zero.tosf.zero</string>
+ <string>zero.zero</string>
+ <string>zeroinferior</string>
+ <string>zerosuperior</string>
+ <string>zerothird</string>
+ </array>
</dict>
</plist>
diff --git a/src/Cantarell-Regular.ufo/features.fea b/src/Cantarell-Regular.ufo/features.fea
index da527abc..67e5350f 100644
--- a/src/Cantarell-Regular.ufo/features.fea
+++ b/src/Cantarell-Regular.ufo/features.fea
@@ -25,25 +25,13 @@ table GDEF {
;
} GDEF;
-
feature aalt {
# automatic
feature locl;
-feature subs;
-feature sinf;
-feature sups;
-feature numr;
-feature dnom;
-feature frac;
feature ordn;
-feature lnum;
feature pnum;
feature tnum;
-feature onum;
feature case;
-feature zero;
-feature salt;
-feature ss01;
} aalt;
@@ -179,96 +167,6 @@ sub i by idotaccent;
} locl;
-feature subs {
-# automatic
-sub zero by zeroinferior;
-sub one by oneinferior;
-sub two by twoinferior;
-sub three by threeinferior;
-sub four by fourinferior;
-sub five by fiveinferior;
-sub six by sixinferior;
-sub seven by seveninferior;
-sub eight by eightinferior;
-sub nine by nineinferior;
-
-} subs;
-
-feature sinf {
-# automatic
-sub zero by zero.subs;
-sub one by one.subs;
-sub two by two.subs;
-sub three by three.subs;
-sub four by four.subs;
-sub five by five.subs;
-sub six by six.subs;
-sub seven by seven.subs;
-sub eight by eight.subs;
-sub nine by nine.subs;
-
-} sinf;
-
-feature sups {
-# automatic
-sub zero by zerosuperior;
-sub one by onesuperior;
-sub two by twosuperior;
-sub three by threesuperior;
-sub four by foursuperior;
-sub five by fivesuperior;
-sub six by sixsuperior;
-sub seven by sevensuperior;
-sub eight by eightsuperior;
-sub nine by ninesuperior;
-
-} sups;
-
-feature numr {
-# automatic
-sub zero by zero.numr;
-sub one by one.numr;
-sub two by two.numr;
-sub three by three.numr;
-sub four by four.numr;
-sub five by five.numr;
-sub six by six.numr;
-sub seven by seven.numr;
-sub eight by eight.numr;
-sub nine by nine.numr;
-
-} numr;
-
-feature dnom {
-# automatic
-sub zero by zero.dnom;
-sub one by one.dnom;
-sub two by two.dnom;
-sub three by three.dnom;
-sub four by four.dnom;
-sub five by five.dnom;
-sub six by six.dnom;
-sub seven by seven.dnom;
-sub eight by eight.dnom;
-sub nine by nine.dnom;
-
-} dnom;
-
-feature frac {
-# automatic
-lookup FRAC {
- sub slash by fraction;
-} FRAC;
-lookup UP {
- sub [zero one two three four five six seven eight nine] by [zero.numr one.numr two.numr three.numr
four.numr five.numr six.numr seven.numr eight.numr nine.numr];
-} UP;
-lookup DOWN {
- sub fraction [zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr
eight.numr nine.numr]' by [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom
eight.dnom nine.dnom];
- sub [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom
nine.dnom] [zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr
nine.numr]' by [zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom
nine.dnom];
-} DOWN;
-
-} frac;
-
feature ordn {
# automatic
sub [zero one two three four five six seven eight nine] [A a]' by ordfeminine;
@@ -277,33 +175,8 @@ sub N o period by numero;
} ordn;
-feature lnum {
-# automatic
-sub zero.osf by zero;
-sub one.osf by one;
-sub two.osf by two;
-sub three.osf by three;
-sub four.osf by four;
-sub five.osf by five;
-sub six.osf by six;
-sub seven.osf by seven;
-sub eight.osf by eight;
-sub nine.osf by nine;
-
-} lnum;
-
feature pnum {
# automatic
-sub zero.tf by zero;
-sub one.tf by one;
-sub two.tf by two;
-sub three.tf by three;
-sub four.tf by four;
-sub five.tf by five;
-sub six.tf by six;
-sub seven.tf by seven;
-sub eight.tf by eight;
-sub nine.tf by nine;
sub bulletoperator.tf by bulletoperator;
sub commercialMinusSign.tf by commercialMinusSign;
sub divisionslash.tf by divisionslash;
@@ -322,31 +195,11 @@ sub lessequal.tf by lessequal;
sub plusminus.tf by plusminus;
sub approxequal.tf by approxequal;
sub logicalnot.tf by logicalnot;
-sub zero.tosf by zero.osf;
-sub one.tosf by one.osf;
-sub two.tosf by two.osf;
-sub three.tosf by three.osf;
-sub four.tosf by four.osf;
-sub five.tosf by five.osf;
-sub six.tosf by six.osf;
-sub seven.tosf by seven.osf;
-sub eight.tosf by eight.osf;
-sub nine.tosf by nine.osf;
} pnum;
feature tnum {
# automatic
-sub zero by zero.tf;
-sub one by one.tf;
-sub two by two.tf;
-sub three by three.tf;
-sub four by four.tf;
-sub five by five.tf;
-sub six by six.tf;
-sub seven by seven.tf;
-sub eight by eight.tf;
-sub nine by nine.tf;
sub bulletoperator by bulletoperator.tf;
sub commercialMinusSign by commercialMinusSign.tf;
sub divisionslash by divisionslash.tf;
@@ -365,44 +218,9 @@ sub lessequal by lessequal.tf;
sub plusminus by plusminus.tf;
sub approxequal by approxequal.tf;
sub logicalnot by logicalnot.tf;
-sub zero.osf by zero.tosf;
-sub one.osf by one.tosf;
-sub two.osf by two.tosf;
-sub three.osf by three.tosf;
-sub four.osf by four.tosf;
-sub five.osf by five.tosf;
-sub six.osf by six.tosf;
-sub seven.osf by seven.tosf;
-sub eight.osf by eight.tosf;
-sub nine.osf by nine.tosf;
} tnum;
-feature onum {
-# automatic
-sub zero.tf by zero.tosf;
-sub one.tf by one.tosf;
-sub two.tf by two.tosf;
-sub three.tf by three.tosf;
-sub four.tf by four.tosf;
-sub five.tf by five.tosf;
-sub six.tf by six.tosf;
-sub seven.tf by seven.tosf;
-sub eight.tf by eight.tosf;
-sub nine.tf by nine.tosf;
-sub zero by zero.osf;
-sub one by one.osf;
-sub two by two.osf;
-sub three by three.osf;
-sub four by four.osf;
-sub five by five.osf;
-sub six by six.osf;
-sub seven by seven.osf;
-sub eight by eight.osf;
-sub nine by nine.osf;
-
-} onum;
-
feature case {
# automatic
sub periodcentered.loclCAT by periodcentered.loclCAT.case;
@@ -436,36 +254,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;
@@ -478,27 +266,3 @@ sub f i by fi;
sub f l by fl;
} liga;
-
-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;
-sub zero by zero.zero;
-
-} zero;
-
-feature salt {
-# automatic
-sub six by six.ss01;
-sub nine by nine.ss01;
-
-} salt;
-
-feature ss01 {
-# automatic
-sub six by six.ss01;
-sub nine by nine.ss01;
-
-} ss01;
diff --git a/src/Cantarell-Regular.ufo/glyphs/_bar-cy.glif b/src/Cantarell-Regular.ufo/glyphs/_bar-cy.glif
index 079259e4..d75a01d4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_bar-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_bar-cy.glif
@@ -10,10 +10,4 @@
<point x="128" y="372" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_bottomhook.glif
b/src/Cantarell-Regular.ufo/glyphs/_bottomhook.glif
index 734ba7f4..df738139 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_bottomhook.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_bottomhook.glif
@@ -16,10 +16,4 @@
<point x="352" y="-179" type="curve"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_commaaccent.glif
b/src/Cantarell-Regular.ufo/glyphs/_commaaccent.glif
index f3d16e39..105c792f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_commaaccent.glif
@@ -13,10 +13,4 @@
<point x="117" y="-194"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
b/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
index bf36e45e..72774cc5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
@@ -9,10 +9,4 @@
<point x="382" y="840" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_descender-cy.case.straight.glif
b/src/Cantarell-Regular.ufo/glyphs/_descender-cy.case.straight.glif
index 87d9a270..967503aa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_descender-cy.case.straight.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_descender-cy.case.straight.glif
@@ -10,10 +10,4 @@
<point x="107" y="52" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
b/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
index 0522fb20..e162e361 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_descenderreverse-cy.case.glif
@@ -12,10 +12,4 @@
<point x="10" y="72" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
b/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
index 2e2b7c07..4c9240fd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_descenderreversed-cy.glif
@@ -12,10 +12,4 @@
<point x="45" y="72" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_o.numero.glif b/src/Cantarell-Regular.ufo/glyphs/_o.numero.glif
index fcc4a23e..6b51d2b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_o.numero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_o.numero.glif
@@ -13,10 +13,4 @@ o
</contour>
<component base="o" yOffset="212"/>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_slash.zero.glif
b/src/Cantarell-Regular.ufo/glyphs/_slash.zero.glif
index 75d6602f..dc9395b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_slash.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_slash.zero.glif
@@ -10,10 +10,4 @@
<point x="58" y="40" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_slash.zero.osf.glif
b/src/Cantarell-Regular.ufo/glyphs/_slash.zero.osf.glif
index c7973de8..721ba9f8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_slash.zero.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_slash.zero.osf.glif
@@ -10,10 +10,4 @@
<point x="78" y="69" type="line"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif
b/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif
index 44c841ce..2fc46b86 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_typoquote.glif
@@ -13,10 +13,4 @@
<point x="104" y="-88"/>
</contour>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/contents.plist b/src/Cantarell-Regular.ufo/glyphs/contents.plist
index 9388164c..fe882767 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>
@@ -1628,8 +1620,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>
@@ -1838,8 +1828,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>
@@ -1866,8 +1854,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>
@@ -1938,8 +1924,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>
@@ -1992,8 +1976,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>
@@ -2168,8 +2150,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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.glif b/src/Cantarell-Regular.ufo/glyphs/eight.glif
index e2958e09..1921f3ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.glif
@@ -1,16 +1,53 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="eight" format="2">
- <advance width="595"/>
+ <advance width="602"/>
<unicode hex="0038"/>
<outline>
- <component base="eight.lf"/>
+ <contour>
+ <point x="302" y="-10" type="curve" smooth="yes"/>
+ <point x="447" y="-10"/>
+ <point x="542" y="64"/>
+ <point x="542" y="173" type="curve" smooth="yes"/>
+ <point x="542" y="395"/>
+ <point x="166" y="353"/>
+ <point x="166" y="532" type="curve" smooth="yes"/>
+ <point x="166" y="596"/>
+ <point x="214" y="636"/>
+ <point x="292" y="636" type="curve" smooth="yes"/>
+ <point x="376" y="636"/>
+ <point x="435" y="591"/>
+ <point x="435" y="524" type="curve" smooth="yes"/>
+ <point x="435" y="459"/>
+ <point x="379" y="402"/>
+ <point x="296" y="386" type="curve"/>
+ <point x="357" y="356" type="line"/>
+ <point x="452" y="384"/>
+ <point x="510" y="453"/>
+ <point x="510" y="537" type="curve" smooth="yes"/>
+ <point x="510" y="637"/>
+ <point x="427" y="704"/>
+ <point x="303" y="704" type="curve" smooth="yes"/>
+ <point x="172" y="704"/>
+ <point x="88" y="630"/>
+ <point x="88" y="524" type="curve" smooth="yes"/>
+ <point x="88" y="297"/>
+ <point x="460" y="350"/>
+ <point x="460" y="169" type="curve" smooth="yes"/>
+ <point x="460" y="101"/>
+ <point x="408" y="60"/>
+ <point x="315" y="60" type="curve" smooth="yes"/>
+ <point x="213" y="60"/>
+ <point x="144" y="110"/>
+ <point x="144" y="184" type="curve" smooth="yes"/>
+ <point x="144" y="255"/>
+ <point x="205" y="315"/>
+ <point x="300" y="329" type="curve"/>
+ <point x="248" y="361" type="line"/>
+ <point x="136" y="346"/>
+ <point x="62" y="269"/>
+ <point x="62" y="173" type="curve" smooth="yes"/>
+ <point x="62" y="64"/>
+ <point x="158" 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..0ff3d485 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.glif
@@ -1,16 +1,40 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="five" format="2">
- <advance width="565"/>
+ <advance width="571"/>
<unicode hex="0035"/>
<outline>
- <component base="five.lf"/>
+ <contour>
+ <point x="255" y="-10" type="curve" smooth="yes"/>
+ <point x="410" y="-10"/>
+ <point x="512" y="78"/>
+ <point x="512" y="215" type="curve" smooth="yes"/>
+ <point x="512" y="345"/>
+ <point x="419" y="426"/>
+ <point x="264" y="426" type="curve" smooth="yes"/>
+ <point x="228" y="426"/>
+ <point x="190" y="422"/>
+ <point x="152" y="414" type="curve"/>
+ <point x="171" y="389" type="line"/>
+ <point x="182" y="624" type="line"/>
+ <point x="479" y="624" type="line"/>
+ <point x="479" y="694" type="line"/>
+ <point x="109" y="694" type="line"/>
+ <point x="92" y="341" type="line"/>
+ <point x="149" y="353"/>
+ <point x="205" y="360"/>
+ <point x="244" y="360" type="curve" smooth="yes"/>
+ <point x="359" y="360"/>
+ <point x="429" y="303"/>
+ <point x="429" y="207" type="curve" smooth="yes"/>
+ <point x="429" y="115"/>
+ <point x="364" y="62"/>
+ <point x="260" y="62" type="curve" smooth="yes"/>
+ <point x="204" y="62"/>
+ <point x="137" y="78"/>
+ <point x="82" y="106" type="curve"/>
+ <point x="59" y="42" type="line"/>
+ <point x="122" y="9"/>
+ <point x="185" 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..775c0ab8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.glif
@@ -1,16 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="four" format="2">
- <advance width="619"/>
+ <advance width="625"/>
<unicode hex="0034"/>
<outline>
- <component base="four.lf"/>
+ <contour>
+ <point x="382" y="-10" type="line"/>
+ <point x="457" y="-10" type="line"/>
+ <point x="457" y="694" type="line"/>
+ <point x="384" y="694" type="line"/>
+ <point x="42" y="206" type="line"/>
+ <point x="42" y="165" type="line"/>
+ <point x="582" y="165" type="line"/>
+ <point x="582" y="230" type="line"/>
+ <point x="123" y="230" type="line"/>
+ <point x="123" y="216" type="line"/>
+ <point x="397" y="613" type="line"/>
+ <point x="383" y="613" 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/hryvnia.glif b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
index 6f67c701..b02df3ed 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
@@ -4,10 +4,4 @@
<unicode hex="20B4"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index 56369e6d..e9ff89f8 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>
@@ -1632,8 +1624,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>
@@ -1842,8 +1832,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>
@@ -1870,8 +1858,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>
@@ -1942,8 +1928,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>
@@ -1996,8 +1980,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>
@@ -2172,8 +2154,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>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.glif b/src/Cantarell-Regular.ufo/glyphs/nine.glif
index 30d5c7d1..8199916e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.glif
@@ -1,16 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="nine" format="2">
- <advance width="598"/>
+ <advance width="601"/>
<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-Regular.ufo/glyphs/one.glif b/src/Cantarell-Regular.ufo/glyphs/one.glif
index 60277635..d0766161 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.glif
@@ -1,16 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one" format="2">
- <advance width="451"/>
+ <advance width="408"/>
<unicode hex="0031"/>
<outline>
- <component base="one.lf"/>
+ <contour>
+ <point x="226" y="-2" type="line"/>
+ <point x="304" y="-2" type="line"/>
+ <point x="304" y="694" type="line"/>
+ <point x="259" y="694" type="line"/>
+ <point x="38" y="581" type="line"/>
+ <point x="66" y="522" type="line"/>
+ <point x="256" y="612" type="line"/>
+ <point x="226" y="636" 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..3baf2285 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.glif
@@ -1,16 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="seven" format="2">
- <advance width="537"/>
+ <advance width="544"/>
<unicode hex="0037"/>
<outline>
- <component base="seven.lf"/>
+ <contour>
+ <point x="132" y="0" type="line"/>
+ <point x="215" y="0" type="line"/>
+ <point x="503" y="655" type="line"/>
+ <point x="503" y="694" type="line"/>
+ <point x="39" y="694" type="line"/>
+ <point x="39" y="622" type="line"/>
+ <point x="439" y="622" type="line"/>
+ <point x="421" y="653" 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..e9d9a9f3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.glif
@@ -1,16 +1,47 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="six" format="2">
- <advance width="597"/>
+ <advance width="602"/>
<unicode hex="0036"/>
<outline>
- <component base="six.lf"/>
+ <contour>
+ <point x="313" y="-10" type="curve" smooth="yes"/>
+ <point x="448" y="-10"/>
+ <point x="539" y="84"/>
+ <point x="539" y="220" type="curve" smooth="yes"/>
+ <point x="539" y="346"/>
+ <point x="460" y="428"/>
+ <point x="340" y="428" type="curve" smooth="yes"/>
+ <point x="235" y="428"/>
+ <point x="154" y="365"/>
+ <point x="133" y="266" type="curve"/>
+ <point x="149" y="224" type="line"/>
+ <point x="171" y="315"/>
+ <point x="225" y="360"/>
+ <point x="311" y="360" type="curve" smooth="yes"/>
+ <point x="407" y="360"/>
+ <point x="462" y="304"/>
+ <point x="462" y="209" type="curve" smooth="yes"/>
+ <point x="462" y="117"/>
+ <point x="410" y="61"/>
+ <point x="323" y="61" type="curve" smooth="yes"/>
+ <point x="210" y="61"/>
+ <point x="152" y="156"/>
+ <point x="152" y="339" type="curve" smooth="yes"/>
+ <point x="152" y="536"/>
+ <point x="219" y="632"/>
+ <point x="357" y="632" type="curve" smooth="yes"/>
+ <point x="406" y="632"/>
+ <point x="464" y="620"/>
+ <point x="500" y="597" type="curve"/>
+ <point x="524" y="660" type="line"/>
+ <point x="490" y="686"/>
+ <point x="432" y="704"/>
+ <point x="366" y="704" type="curve" smooth="yes"/>
+ <point x="180" y="704"/>
+ <point x="71" y="566"/>
+ <point x="71" y="327" type="curve" smooth="yes"/>
+ <point x="71" y="111"/>
+ <point x="160" 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/tenge.glif b/src/Cantarell-Regular.ufo/glyphs/tenge.glif
index 90731167..a067c2d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tenge.glif
@@ -4,10 +4,4 @@
<unicode hex="20B8"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.glif b/src/Cantarell-Regular.ufo/glyphs/three.glif
index 152a1637..dfbf6103 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.glif
@@ -1,16 +1,51 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="three" format="2">
- <advance width="574"/>
+ <advance width="583"/>
<unicode hex="0033"/>
<outline>
- <component base="three.lf"/>
+ <contour>
+ <point x="266" y="-10" type="curve" smooth="yes"/>
+ <point x="418" y="-10"/>
+ <point x="523" y="68"/>
+ <point x="523" y="183" type="curve" smooth="yes"/>
+ <point x="523" y="284"/>
+ <point x="441" y="357"/>
+ <point x="319" y="369" type="curve"/>
+ <point x="318" y="350" type="line"/>
+ <point x="419" y="353"/>
+ <point x="490" y="429"/>
+ <point x="490" y="526" type="curve" smooth="yes"/>
+ <point x="490" y="634"/>
+ <point x="403" y="704"/>
+ <point x="272" y="704" type="curve" smooth="yes"/>
+ <point x="201" y="704"/>
+ <point x="125" y="683"/>
+ <point x="62" y="647" type="curve"/>
+ <point x="81" y="587" type="line"/>
+ <point x="141" y="616"/>
+ <point x="204" y="633"/>
+ <point x="257" y="633" type="curve" smooth="yes"/>
+ <point x="349" y="633"/>
+ <point x="412" y="585"/>
+ <point x="412" y="514" type="curve" smooth="yes"/>
+ <point x="412" y="440"/>
+ <point x="340" y="387"/>
+ <point x="241" y="387" type="curve" smooth="yes"/>
+ <point x="182" y="387" type="line"/>
+ <point x="182" y="317" type="line"/>
+ <point x="239" y="317" type="line" smooth="yes"/>
+ <point x="363" y="317"/>
+ <point x="440" y="266"/>
+ <point x="440" y="181" type="curve" smooth="yes"/>
+ <point x="440" y="105"/>
+ <point x="379" y="61"/>
+ <point x="274" y="61" type="curve" smooth="yes"/>
+ <point x="206" y="61"/>
+ <point x="128" y="79"/>
+ <point x="67" y="109" type="curve"/>
+ <point x="48" y="44" type="line"/>
+ <point x="114" y="10"/>
+ <point x="190" 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/tugrik.glif b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
index 88cf1fac..f5d41ab5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
@@ -4,10 +4,4 @@
<unicode hex="20AE"/>
<outline>
</outline>
- <lib>
- <dict>
- <key>com.schriftgestaltung.Glyphs.Export</key>
- <false/>
- </dict>
- </lib>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.glif b/src/Cantarell-Regular.ufo/glyphs/two.glif
index b73d13ca..b785a77d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.glif
@@ -1,16 +1,33 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="two" format="2">
- <advance width="539"/>
+ <advance width="555"/>
<unicode hex="0032"/>
<outline>
- <component base="two.lf"/>
+ <contour>
+ <point x="59" y="0" type="line"/>
+ <point x="502" y="0" type="line"/>
+ <point x="502" y="72" type="line"/>
+ <point x="141" y="72" type="line"/>
+ <point x="152" y="47" type="line"/>
+ <point x="390" y="271"/>
+ <point x="472" y="386"/>
+ <point x="472" y="510" type="curve" smooth="yes"/>
+ <point x="472" y="630"/>
+ <point x="391" y="704"/>
+ <point x="260" y="704" type="curve" smooth="yes"/>
+ <point x="178" y="704"/>
+ <point x="98" y="674"/>
+ <point x="47" y="625" type="curve"/>
+ <point x="71" y="569" type="line"/>
+ <point x="121" y="609"/>
+ <point x="187" y="633"/>
+ <point x="244" y="633" type="curve" smooth="yes"/>
+ <point x="333" y="633"/>
+ <point x="389" y="580"/>
+ <point x="389" y="496" type="curve" smooth="yes"/>
+ <point x="389" y="396"/>
+ <point x="311" y="292"/>
+ <point x="59" y="53" 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..4de888ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.glif
@@ -1,16 +1,36 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="zero" format="2">
- <advance width="631"/>
+ <advance width="638"/>
<unicode hex="0030"/>
+ <anchor x="320" y="350" name="slash"/>
<outline>
- <component base="zero.lf"/>
+ <contour>
+ <point x="317" y="-10" type="curve" smooth="yes"/>
+ <point x="473" y="-10"/>
+ <point x="567" y="126"/>
+ <point x="567" y="352" type="curve" smooth="yes"/>
+ <point x="567" y="571"/>
+ <point x="476" y="704"/>
+ <point x="324" y="704" type="curve" smooth="yes"/>
+ <point x="166" y="704"/>
+ <point x="71" y="568"/>
+ <point x="71" y="342" type="curve" smooth="yes"/>
+ <point x="71" y="123"/>
+ <point x="163" y="-10"/>
+ </contour>
+ <contour>
+ <point x="323" y="59" type="curve" smooth="yes"/>
+ <point x="217" y="59"/>
+ <point x="153" y="169"/>
+ <point x="153" y="352" type="curve" smooth="yes"/>
+ <point x="153" y="528"/>
+ <point x="215" y="635"/>
+ <point x="318" y="635" type="curve" smooth="yes"/>
+ <point x="422" y="635"/>
+ <point x="485" y="524"/>
+ <point x="485" y="342" type="curve" smooth="yes"/>
+ <point x="485" y="166"/>
+ <point x="425" y="59"/>
+ </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.lf.zero.glif
b/src/Cantarell-Regular.ufo/glyphs/zero.lf.zero.glif
index 1d0a668e..d585d945 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.lf.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.lf.zero.glif
@@ -2,7 +2,7 @@
<glyph name="zero.lf.zero" format="2">
<advance width="631"/>
<outline>
- <component base="zero.lf"/>
+ <component base="zero"/>
<component base="_slash.zero" xOffset="93" yOffset="109"/>
</outline>
<lib>
diff --git a/src/Cantarell-Regular.ufo/lib.plist b/src/Cantarell-Regular.ufo/lib.plist
index 5a19a2f5..e57d991e 100644
--- a/src/Cantarell-Regular.ufo/lib.plist
+++ b/src/Cantarell-Regular.ufo/lib.plist
@@ -1326,8 +1326,6 @@
</dict>
<key>com.schriftgestaltung.appVersion</key>
<string>1192</string>
- <key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
- <string></string>
<key>com.schriftgestaltung.customParameter.GSFont.Family Alignment Zones</key>
<array>
<string>{739, 10}</string>
@@ -2069,16 +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>
@@ -3720,6 +3708,131 @@
<key>zhedieresis-cy</key>
<string>uni04DD</string>
</dict>
+ <key>public.skipExportGlyphs</key>
+ <array>
+ <string>_bar-cy</string>
+ <string>_bottomhook</string>
+ <string>_commaaccent</string>
+ <string>_currencyvstem</string>
+ <string>_descender-cy.case.straight</string>
+ <string>_descenderreverse-cy.case</string>
+ <string>_descenderreversed-cy</string>
+ <string>_o.numero</string>
+ <string>_slash.zero</string>
+ <string>_slash.zero.osf</string>
+ <string>_typoquote</string>
+ <string>eight.dnom</string>
+ <string>eight.numr</string>
+ <string>eight.osf</string>
+ <string>eight.subs</string>
+ <string>eight.tf</string>
+ <string>eight.tosf</string>
+ <string>eightinferior</string>
+ <string>eightsuperior</string>
+ <string>five.dnom</string>
+ <string>five.numr</string>
+ <string>five.osf</string>
+ <string>five.subs</string>
+ <string>five.tf</string>
+ <string>five.tosf</string>
+ <string>fiveeighths</string>
+ <string>fiveinferior</string>
+ <string>fivesixths</string>
+ <string>fivesuperior</string>
+ <string>four.dnom</string>
+ <string>four.numr</string>
+ <string>four.osf</string>
+ <string>four.subs</string>
+ <string>four.tf</string>
+ <string>four.tosf</string>
+ <string>fourfifths</string>
+ <string>fourinferior</string>
+ <string>foursuperior</string>
+ <string>fraction</string>
+ <string>hryvnia</string>
+ <string>nine.dnom</string>
+ <string>nine.numr</string>
+ <string>nine.osf</string>
+ <string>nine.ss01</string>
+ <string>nine.subs</string>
+ <string>nine.tf</string>
+ <string>nine.tosf</string>
+ <string>nineinferior</string>
+ <string>ninesuperior</string>
+ <string>one.dnom</string>
+ <string>one.numr</string>
+ <string>one.osf</string>
+ <string>one.subs</string>
+ <string>one.tf</string>
+ <string>one.tosf</string>
+ <string>oneeighth</string>
+ <string>onefifth</string>
+ <string>onefraction</string>
+ <string>onehalf</string>
+ <string>oneinferior</string>
+ <string>oneninth</string>
+ <string>onequarter</string>
+ <string>oneseventh</string>
+ <string>onesixth</string>
+ <string>onesuperior</string>
+ <string>onetenth</string>
+ <string>onethird</string>
+ <string>seven.dnom</string>
+ <string>seven.numr</string>
+ <string>seven.osf</string>
+ <string>seven.subs</string>
+ <string>seven.tf</string>
+ <string>seven.tosf</string>
+ <string>seveneighths</string>
+ <string>seveninferior</string>
+ <string>sevensuperior</string>
+ <string>six.dnom</string>
+ <string>six.numr</string>
+ <string>six.osf</string>
+ <string>six.ss01</string>
+ <string>six.subs</string>
+ <string>six.tf</string>
+ <string>six.tosf</string>
+ <string>sixinferior</string>
+ <string>sixsuperior</string>
+ <string>tenge</string>
+ <string>three.dnom</string>
+ <string>three.numr</string>
+ <string>three.osf</string>
+ <string>three.subs</string>
+ <string>three.tf</string>
+ <string>three.tosf</string>
+ <string>threeeighths</string>
+ <string>threefifths</string>
+ <string>threeinferior</string>
+ <string>threequarters</string>
+ <string>threesuperior</string>
+ <string>tugrik</string>
+ <string>two.dnom</string>
+ <string>two.numr</string>
+ <string>two.osf</string>
+ <string>two.subs</string>
+ <string>two.tf</string>
+ <string>two.tosf</string>
+ <string>twofifths</string>
+ <string>twoinferior</string>
+ <string>twosuperior</string>
+ <string>twothirds</string>
+ <string>zero.dnom</string>
+ <string>zero.lf.zero</string>
+ <string>zero.numr</string>
+ <string>zero.osf</string>
+ <string>zero.osf.zero</string>
+ <string>zero.subs</string>
+ <string>zero.tf</string>
+ <string>zero.tf.zero</string>
+ <string>zero.tosf</string>
+ <string>zero.tosf.zero</string>
+ <string>zero.zero</string>
+ <string>zeroinferior</string>
+ <string>zerosuperior</string>
+ <string>zerothird</string>
+ </array>
<key>width</key>
<integer>30</integer>
</dict>
diff --git a/src/Cantarell.designspace b/src/Cantarell.designspace
index 6bd0e92a..b819f5b4 100644
--- a/src/Cantarell.designspace
+++ b/src/Cantarell.designspace
@@ -272,9 +272,117 @@
<string>_slash.zero</string>
<string>_slash.zero.osf</string>
<string>_typoquote</string>
+ <string>eight.dnom</string>
+ <string>eight.numr</string>
+ <string>eight.osf</string>
+ <string>eight.subs</string>
+ <string>eight.tf</string>
+ <string>eight.tosf</string>
+ <string>eightinferior</string>
+ <string>eightsuperior</string>
+ <string>five.dnom</string>
+ <string>five.numr</string>
+ <string>five.osf</string>
+ <string>five.subs</string>
+ <string>five.tf</string>
+ <string>five.tosf</string>
+ <string>fiveeighths</string>
+ <string>fiveinferior</string>
+ <string>fivesixths</string>
+ <string>fivesuperior</string>
+ <string>four.dnom</string>
+ <string>four.numr</string>
+ <string>four.osf</string>
+ <string>four.subs</string>
+ <string>four.tf</string>
+ <string>four.tosf</string>
+ <string>fourfifths</string>
+ <string>fourinferior</string>
+ <string>foursuperior</string>
+ <string>fraction</string>
<string>hryvnia</string>
+ <string>nine.dnom</string>
+ <string>nine.numr</string>
+ <string>nine.osf</string>
+ <string>nine.ss01</string>
+ <string>nine.subs</string>
+ <string>nine.tf</string>
+ <string>nine.tosf</string>
+ <string>nineinferior</string>
+ <string>ninesuperior</string>
+ <string>one.dnom</string>
+ <string>one.numr</string>
+ <string>one.osf</string>
+ <string>one.subs</string>
+ <string>one.tf</string>
+ <string>one.tosf</string>
+ <string>oneeighth</string>
+ <string>onefifth</string>
+ <string>onefraction</string>
+ <string>onehalf</string>
+ <string>oneinferior</string>
+ <string>oneninth</string>
+ <string>onequarter</string>
+ <string>oneseventh</string>
+ <string>onesixth</string>
+ <string>onesuperior</string>
+ <string>onetenth</string>
+ <string>onethird</string>
+ <string>seven.dnom</string>
+ <string>seven.numr</string>
+ <string>seven.osf</string>
+ <string>seven.subs</string>
+ <string>seven.tf</string>
+ <string>seven.tosf</string>
+ <string>seveneighths</string>
+ <string>seveninferior</string>
+ <string>sevensuperior</string>
+ <string>six.dnom</string>
+ <string>six.numr</string>
+ <string>six.osf</string>
+ <string>six.ss01</string>
+ <string>six.subs</string>
+ <string>six.tf</string>
+ <string>six.tosf</string>
+ <string>sixinferior</string>
+ <string>sixsuperior</string>
<string>tenge</string>
+ <string>three.dnom</string>
+ <string>three.numr</string>
+ <string>three.osf</string>
+ <string>three.subs</string>
+ <string>three.tf</string>
+ <string>three.tosf</string>
+ <string>threeeighths</string>
+ <string>threefifths</string>
+ <string>threeinferior</string>
+ <string>threequarters</string>
+ <string>threesuperior</string>
<string>tugrik</string>
+ <string>two.dnom</string>
+ <string>two.numr</string>
+ <string>two.osf</string>
+ <string>two.subs</string>
+ <string>two.tf</string>
+ <string>two.tosf</string>
+ <string>twofifths</string>
+ <string>twoinferior</string>
+ <string>twosuperior</string>
+ <string>twothirds</string>
+ <string>zero.dnom</string>
+ <string>zero.lf.zero</string>
+ <string>zero.numr</string>
+ <string>zero.osf</string>
+ <string>zero.osf.zero</string>
+ <string>zero.subs</string>
+ <string>zero.tf</string>
+ <string>zero.tf.zero</string>
+ <string>zero.tosf</string>
+ <string>zero.tosf.zero</string>
+ <string>zero.zero</string>
+ <string>zeroinferior</string>
+ <string>zerosuperior</string>
+ <string>zerothird</string>
</array>
</dict>
</lib>
diff --git a/src/Cantarell_autospace.py b/src/Cantarell_autospace.py
index 970a05f4..e1d2ef1b 100644
--- a/src/Cantarell_autospace.py
+++ b/src/Cantarell_autospace.py
@@ -10,7 +10,7 @@
*,Letter,Lowercase,0.7,m.sups,.sups,
# Numbers
-*,Number,Decimal Digit,1.2,one,*,
+*,Number,Decimal Digit,1.25,one,*,
*,Number,Decimal Digit,1.2,zero.osf,.osf,
*,Number,Fraction,1.3,*,*,
*,Number,*,1.0,*,.dnom,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
