[cantarell-fonts/tweak-numerals] More numeral tweaking
- From: Nikolaus Waxweiler <nwaxweiler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cantarell-fonts/tweak-numerals] More numeral tweaking
- Date: Sat, 4 May 2019 19:09:32 +0000 (UTC)
commit ed7161162fe836e6342e1e11c78bd23de91b6b68
Author: Nikolaus Waxweiler <madigens gmail com>
Date: Sat May 4 20:09:13 2019 +0100
More numeral tweaking
Some reverted back to previous forms and slightly tweaked
src/Cantarell-Bold.ufo/glyphs/eight.glif | 88 ++++++++---------
src/Cantarell-Bold.ufo/glyphs/five.glif | 58 ++++++------
src/Cantarell-Bold.ufo/glyphs/one.glif | 18 ++--
src/Cantarell-Bold.ufo/glyphs/six.glif | 78 +++++++--------
src/Cantarell-Bold.ufo/glyphs/three.glif | 10 +-
src/Cantarell-Bold.ufo/glyphs/two.glif | 50 +++++-----
src/Cantarell-Bold.ufo/lib.plist | 115 ++---------------------
src/Cantarell-Light.ufo/glyphs/five.glif | 26 ++---
src/Cantarell-Light.ufo/glyphs/layerinfo.plist | 2 +-
src/Cantarell-Light.ufo/glyphs/one.glif | 18 ++--
src/Cantarell-Light.ufo/glyphs/six.glif | 46 ++++-----
src/Cantarell-Light.ufo/glyphs/two.glif | 4 +-
src/Cantarell-Light.ufo/lib.plist | 115 ++---------------------
src/Cantarell-Regular.ufo/glyphs/layerinfo.plist | 2 +-
src/Cantarell-Regular.ufo/glyphs/one.glif | 18 ++--
src/Cantarell-Regular.ufo/glyphs/six.glif | 12 +--
src/Cantarell-Regular.ufo/glyphs/two.glif | 4 +-
src/Cantarell-Regular.ufo/lib.plist | 115 ++---------------------
src/Cantarell.designspace | 95 -------------------
19 files changed, 247 insertions(+), 627 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.glif b/src/Cantarell-Bold.ufo/glyphs/eight.glif
index d39a471d..79f1e552 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.glif
@@ -4,50 +4,50 @@
<unicode hex="0038"/>
<outline>
<contour>
- <point x="292" y="-10" type="curve" smooth="yes"/>
- <point x="460" y="-10"/>
- <point x="572" y="74"/>
- <point x="572" y="201" type="curve" smooth="yes"/>
- <point x="572" y="429"/>
- <point x="215" y="378"/>
- <point x="215" y="504" type="curve" smooth="yes"/>
- <point x="215" y="543"/>
- <point x="240" y="564"/>
- <point x="294" y="564" type="curve" smooth="yes"/>
- <point x="351" y="564"/>
- <point x="383" y="541"/>
- <point x="383" y="499" type="curve" smooth="yes"/>
- <point x="383" y="457"/>
- <point x="350" y="424"/>
- <point x="303" y="411" type="curve"/>
- <point x="403" y="371" type="line"/>
- <point x="492" y="391"/>
- <point x="548" y="453"/>
- <point x="548" y="531" type="curve" smooth="yes"/>
- <point x="548" y="634"/>
- <point x="450" y="704"/>
- <point x="303" y="704" type="curve" smooth="yes"/>
- <point x="145" y="704"/>
- <point x="43" y="620"/>
- <point x="43" y="495" type="curve" smooth="yes"/>
- <point x="43" y="262"/>
- <point x="402" y="313"/>
- <point x="402" y="191" type="curve" smooth="yes"/>
- <point x="402" y="152"/>
- <point x="367" y="132"/>
- <point x="303" y="132" type="curve" smooth="yes"/>
- <point x="232" y="132"/>
- <point x="192" y="159"/>
- <point x="192" y="213" type="curve" smooth="yes"/>
- <point x="192" y="260"/>
- <point x="221" y="293"/>
- <point x="278" y="305" type="curve"/>
- <point x="200" y="357" type="line"/>
- <point x="90" y="338"/>
- <point x="22" y="273"/>
- <point x="22" y="182" type="curve" smooth="yes"/>
- <point x="22" y="67"/>
- <point x="129" y="-10"/>
+ <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="429"/>
+ <point x="212" y="374"/>
+ <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="262"/>
+ <point x="412" y="316"/>
+ <point x="412" y="193" type="curve" smooth="yes"/>
+ <point x="412" y="155"/>
+ <point x="373" y="128"/>
+ <point x="309" y="128" type="curve" smooth="yes"/>
+ <point x="239" y="128"/>
+ <point x="193" y="162"/>
+ <point x="193" y="215" type="curve" smooth="yes"/>
+ <point x="193" y="264"/>
+ <point x="233" y="292"/>
+ <point x="303" y="294" type="curve"/>
+ <point x="204" y="357" type="line"/>
+ <point x="92" y="337"/>
+ <point x="25" y="273"/>
+ <point x="25" y="183" type="curve" smooth="yes"/>
+ <point x="25" y="68"/>
+ <point x="136" y="-10"/>
</contour>
</outline>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.glif b/src/Cantarell-Bold.ufo/glyphs/five.glif
index 373ec605..bbc67f60 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.glif
@@ -4,37 +4,37 @@
<unicode hex="0035"/>
<outline>
<contour>
- <point x="241" y="-10" type="curve" smooth="yes"/>
- <point x="423" y="-10"/>
- <point x="544" y="81"/>
- <point x="544" y="229" type="curve" smooth="yes"/>
- <point x="544" y="363"/>
- <point x="443" y="457"/>
- <point x="291" y="457" type="curve" smooth="yes"/>
- <point x="255" y="457"/>
- <point x="220" y="451"/>
- <point x="171" y="439" type="curve"/>
- <point x="230" y="422" type="line"/>
- <point x="236" y="544" type="line"/>
- <point x="506" y="544" type="line"/>
+ <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="234" y="365" type="line"/>
+ <point x="242" 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="59" y="298" type="line"/>
- <point x="112" y="310"/>
- <point x="170" y="320"/>
- <point x="216" y="320" type="curve" smooth="yes"/>
- <point x="311" y="320"/>
- <point x="367" y="279"/>
- <point x="367" y="223" type="curve" smooth="yes"/>
- <point x="367" y="171"/>
- <point x="321" y="142"/>
- <point x="238" y="142" type="curve" smooth="yes"/>
- <point x="181" y="142"/>
- <point x="112" y="158"/>
- <point x="62" y="182" type="curve"/>
- <point x="14" y="42" type="line"/>
- <point x="81" y="8"/>
- <point x="160" y="-10"/>
+ <point x="60" y="287" type="line"/>
+ <point x="103" y="295"/>
+ <point x="158" y="301"/>
+ <point x="199" y="301" type="curve" smooth="yes"/>
+ <point x="303" y="301"/>
+ <point x="363" y="268"/>
+ <point x="363" y="212" type="curve" smooth="yes"/>
+ <point x="363" y="165"/>
+ <point x="320" y="140"/>
+ <point x="242" y="140" type="curve" smooth="yes"/>
+ <point x="182" y="140"/>
+ <point x="115" y="154"/>
+ <point x="65" y="178" type="curve"/>
+ <point x="18" y="42" type="line"/>
+ <point x="85" y="8"/>
+ <point x="161" y="-10"/>
</contour>
</outline>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.glif b/src/Cantarell-Bold.ufo/glyphs/one.glif
index b988a259..d598c020 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.glif
@@ -1,17 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one" format="2">
- <advance width="432"/>
+ <advance width="447"/>
<unicode hex="0031"/>
<outline>
<contour>
- <point x="185" y="0" type="line"/>
- <point x="360" y="0" type="line"/>
- <point x="360" y="694" type="line"/>
- <point x="248" y="694" type="line"/>
- <point x="-15" y="499" type="line"/>
- <point x="64" y="380" type="line"/>
- <point x="237" y="507" type="line"/>
- <point x="185" y="551" type="line"/>
+ <point x="192" y="0" type="line"/>
+ <point x="365" y="0" type="line"/>
+ <point x="365" y="694" type="line"/>
+ <point x="253" y="694" type="line"/>
+ <point x="-10" y="499" type="line"/>
+ <point x="72" y="380" type="line"/>
+ <point x="245" y="505" type="line"/>
+ <point x="192" y="551" type="line"/>
</contour>
</outline>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.glif b/src/Cantarell-Bold.ufo/glyphs/six.glif
index 5624023a..31bf35b9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.glif
@@ -1,47 +1,47 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="six" format="2">
- <advance width="575"/>
+ <advance width="592"/>
<unicode hex="0036"/>
<outline>
<contour>
- <point x="295" y="-10" type="curve" smooth="yes"/>
- <point x="445" y="-10"/>
- <point x="552" y="85"/>
- <point x="552" y="231" type="curve" smooth="yes"/>
- <point x="552" y="361"/>
- <point x="467" y="445"/>
- <point x="348" y="445" type="curve" smooth="yes"/>
- <point x="244" y="445"/>
- <point x="175" y="393"/>
- <point x="148" y="294" type="curve"/>
- <point x="190" y="246" type="line"/>
- <point x="210" y="288"/>
- <point x="252" y="313"/>
- <point x="302" y="313" type="curve" smooth="yes"/>
- <point x="360" y="313"/>
- <point x="397" y="278"/>
- <point x="397" y="222" type="curve" smooth="yes"/>
- <point x="397" y="168"/>
- <point x="363" y="137"/>
- <point x="308" y="137" type="curve" smooth="yes"/>
- <point x="226" y="137"/>
- <point x="199" y="193"/>
- <point x="199" y="334" type="curve" smooth="yes"/>
- <point x="199" y="484"/>
- <point x="246" y="554"/>
- <point x="358" y="554" type="curve" smooth="yes"/>
- <point x="399" y="554"/>
- <point x="448" y="545"/>
- <point x="494" y="529" type="curve"/>
- <point x="540" y="663" type="line"/>
- <point x="490" y="690"/>
- <point x="423" y="704"/>
- <point x="362" y="704" type="curve" smooth="yes"/>
- <point x="157" y="704"/>
- <point x="25" y="555"/>
- <point x="25" y="317" type="curve" smooth="yes"/>
- <point x="25" y="109"/>
- <point x="125" y="-10"/>
+ <point x="302" y="-10" type="curve" smooth="yes"/>
+ <point x="461" y="-10"/>
+ <point x="567" y="87"/>
+ <point x="567" y="232" type="curve" smooth="yes"/>
+ <point x="567" y="362"/>
+ <point x="484" y="449"/>
+ <point x="361" y="449" type="curve" smooth="yes"/>
+ <point x="270" y="449"/>
+ <point x="197" y="402"/>
+ <point x="154" y="315" type="curve"/>
+ <point x="197" y="255" type="line"/>
+ <point x="228" y="292"/>
+ <point x="268" y="312"/>
+ <point x="307" y="312" type="curve" smooth="yes"/>
+ <point x="361" y="312"/>
+ <point x="399" y="274"/>
+ <point x="399" y="219" type="curve" smooth="yes"/>
+ <point x="399" y="167"/>
+ <point x="365" y="133"/>
+ <point x="314" y="133" type="curve" smooth="yes"/>
+ <point x="239" y="133"/>
+ <point x="196" y="211"/>
+ <point x="196" y="344" type="curve" smooth="yes"/>
+ <point x="196" y="487"/>
+ <point x="257" y="561"/>
+ <point x="374" y="561" type="curve" smooth="yes"/>
+ <point x="422" y="561"/>
+ <point x="477" y="548"/>
+ <point x="519" y="528" type="curve"/>
+ <point x="563" y="657" type="line"/>
+ <point x="504" y="689"/>
+ <point x="438" y="704"/>
+ <point x="363" y="704" type="curve" smooth="yes"/>
+ <point x="143" y="704"/>
+ <point x="26" y="569"/>
+ <point x="26" y="330" type="curve" smooth="yes"/>
+ <point x="26" y="107"/>
+ <point x="127" y="-10"/>
</contour>
</outline>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.glif b/src/Cantarell-Bold.ufo/glyphs/three.glif
index 799836ce..ffc43287 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.glif
@@ -29,13 +29,13 @@
<point x="336" y="528"/>
<point x="336" y="486" type="curve" smooth="yes"/>
<point x="336" y="443"/>
- <point x="292" y="419"/>
- <point x="218" y="419" type="curve" smooth="yes"/>
+ <point x="291" y="419"/>
+ <point x="208" y="419" type="curve" smooth="yes"/>
<point x="151" y="419" type="line"/>
<point x="151" y="281" type="line"/>
- <point x="230" y="281" type="line" smooth="yes"/>
- <point x="323" y="281"/>
- <point x="369" y="255"/>
+ <point x="220" y="281" type="line" smooth="yes"/>
+ <point x="319" y="281"/>
+ <point x="369" y="257"/>
<point x="369" y="209" type="curve" smooth="yes"/>
<point x="369" y="163"/>
<point x="323" y="140"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.glif b/src/Cantarell-Bold.ufo/glyphs/two.glif
index 3855ffb6..065d87b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.glif
@@ -1,33 +1,33 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="two" format="2">
- <advance width="564"/>
+ <advance width="550"/>
<unicode hex="0032"/>
<outline>
<contour>
- <point x="37" y="0" type="line"/>
- <point x="543" y="0" type="line"/>
- <point x="543" y="159" type="line"/>
- <point x="237" y="159" type="line"/>
- <point x="232" y="114" type="line"/>
- <point x="428" y="248"/>
- <point x="519" y="375"/>
- <point x="519" y="492" type="curve" smooth="yes"/>
- <point x="519" y="620"/>
- <point x="415" y="704"/>
- <point x="257" y="704" type="curve" smooth="yes"/>
- <point x="165" y="704"/>
- <point x="79" y="676"/>
- <point x="10" y="623" type="curve"/>
- <point x="55" y="497" type="line"/>
- <point x="112" y="529"/>
- <point x="171" y="548"/>
- <point x="223" y="548" type="curve" smooth="yes"/>
- <point x="294" y="548"/>
- <point x="338" y="514"/>
- <point x="338" y="461" type="curve" smooth="yes"/>
- <point x="338" y="388"/>
- <point x="255" y="294"/>
- <point x="37" y="123" type="curve"/>
+ <point x="36" y="0" type="line"/>
+ <point x="526" y="0" type="line"/>
+ <point x="526" y="150" type="line"/>
+ <point x="230" y="150" type="line"/>
+ <point x="231" y="114" type="line"/>
+ <point x="419" y="244"/>
+ <point x="508" y="368"/>
+ <point x="508" y="489" type="curve" smooth="yes"/>
+ <point x="508" y="619"/>
+ <point x="406" y="704"/>
+ <point x="249" y="704" type="curve" smooth="yes"/>
+ <point x="159" y="704"/>
+ <point x="77" y="676"/>
+ <point x="10" y="621" type="curve"/>
+ <point x="57" y="501" type="line"/>
+ <point x="112" y="535"/>
+ <point x="166" y="553"/>
+ <point x="215" y="553" type="curve" smooth="yes"/>
+ <point x="284" y="553"/>
+ <point x="328" y="516"/>
+ <point x="328" y="462" type="curve" smooth="yes"/>
+ <point x="328" y="376"/>
+ <point x="217" y="272"/>
+ <point x="36" y="122" type="curve"/>
</contour>
</outline>
</glyph>
diff --git a/src/Cantarell-Bold.ufo/lib.plist b/src/Cantarell-Bold.ufo/lib.plist
index a5f92341..2527399b 100644
--- a/src/Cantarell-Bold.ufo/lib.plist
+++ b/src/Cantarell-Bold.ufo/lib.plist
@@ -1277,16 +1277,6 @@
<string>seven</string>
<string>eight</string>
<string>nine</string>
- <string>zero.tf</string>
- <string>one.tf</string>
- <string>two.tf</string>
- <string>three.tf</string>
- <string>four.tf</string>
- <string>five.tf</string>
- <string>six.tf</string>
- <string>seven.tf</string>
- <string>eight.tf</string>
- <string>nine.tf</string>
<string>zero.osf</string>
<string>one.osf</string>
<string>two.osf</string>
@@ -1298,6 +1288,16 @@
<string>eight.osf</string>
<string>nine.osf</string>
<string>zero.osf.zero</string>
+ <string>zero.tf</string>
+ <string>one.tf</string>
+ <string>two.tf</string>
+ <string>three.tf</string>
+ <string>four.tf</string>
+ <string>five.tf</string>
+ <string>six.tf</string>
+ <string>seven.tf</string>
+ <string>eight.tf</string>
+ <string>nine.tf</string>
<string>zero.tf.zero</string>
<string>zero.tosf</string>
<string>one.tosf</string>
@@ -2928,104 +2928,9 @@
<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.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.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.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.subs</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.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.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.subs</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.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.tosf</string>
- <string>twofifths</string>
- <string>twoinferior</string>
- <string>twosuperior</string>
- <string>twothirds</string>
- <string>zero.dnom</string>
- <string>zero.numr</string>
- <string>zero.osf</string>
- <string>zero.osf.zero</string>
- <string>zero.subs</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/glyphs/five.glif b/src/Cantarell-Light.ufo/glyphs/five.glif
index 539c762d..8a3625b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.glif
@@ -8,23 +8,23 @@
<point x="370" y="-10"/>
<point x="460" y="75"/>
<point x="460" y="203" type="curve" smooth="yes"/>
- <point x="460" y="327"/>
- <point x="372" y="403"/>
- <point x="228" y="403" type="curve" smooth="yes"/>
- <point x="186" y="403"/>
- <point x="136" y="397"/>
- <point x="91" y="386" type="curve"/>
- <point x="103" y="382" type="line"/>
+ <point x="460" y="331"/>
+ <point x="368" y="413"/>
+ <point x="226" y="413" type="curve" smooth="yes"/>
+ <point x="187" y="413"/>
+ <point x="136" y="407"/>
+ <point x="91" y="396" type="curve"/>
+ <point x="103" y="392" type="line"/>
<point x="116" y="677" type="line"/>
<point x="431" y="677" type="line"/>
<point x="431" y="694" type="line"/>
<point x="98" y="694" type="line"/>
- <point x="82" y="367" type="line"/>
- <point x="125" y="378"/>
- <point x="177" y="385"/>
- <point x="221" y="385" type="curve" smooth="yes"/>
- <point x="358" y="385"/>
- <point x="439" y="316"/>
+ <point x="82" y="377" type="line"/>
+ <point x="125" y="388"/>
+ <point x="177" y="395"/>
+ <point x="219" y="395" type="curve" smooth="yes"/>
+ <point x="353" y="395"/>
+ <point x="439" y="320"/>
<point x="439" y="201" type="curve" smooth="yes"/>
<point x="439" y="86"/>
<point x="359" y="9"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index 3832e19c..aae12798 100644
--- a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
@@ -1853,7 +1853,7 @@
<key>com.schriftgestaltung.layerOrderInGlyph.shha-cy</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
<integer>2</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.glif b/src/Cantarell-Light.ufo/glyphs/one.glif
index 192edad2..142232ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.glif
@@ -1,17 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one" format="2">
- <advance width="340"/>
+ <advance width="375"/>
<unicode hex="0031"/>
<outline>
<contour>
- <point x="209" y="-2" type="line"/>
- <point x="229" y="-2" type="line"/>
- <point x="229" y="694" type="line"/>
- <point x="219" y="694" type="line"/>
- <point x="23" y="544" type="line"/>
- <point x="33" y="531" type="line"/>
- <point x="217" y="672" type="line"/>
- <point x="209" y="677" type="line"/>
+ <point x="224" y="-2" type="line"/>
+ <point x="244" y="-2" type="line"/>
+ <point x="244" y="694" type="line"/>
+ <point x="234" y="694" type="line"/>
+ <point x="38" y="544" type="line"/>
+ <point x="49" y="530" type="line"/>
+ <point x="233" y="671" type="line"/>
+ <point x="224" y="677" type="line"/>
</contour>
</outline>
</glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.glif b/src/Cantarell-Light.ufo/glyphs/six.glif
index 9ccd1f6e..31f86ad2 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.glif
@@ -1,42 +1,42 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="six" format="2">
- <advance width="561"/>
+ <advance width="559"/>
<unicode hex="0036"/>
<outline>
<contour>
- <point x="300" y="-10" type="curve" smooth="yes"/>
- <point x="421" y="-10"/>
- <point x="506" y="77"/>
- <point x="506" y="206" type="curve" smooth="yes"/>
- <point x="506" y="333"/>
- <point x="423" y="412"/>
- <point x="303" y="412" type="curve" smooth="yes"/>
+ <point x="299" y="-10" type="curve" smooth="yes"/>
+ <point x="419" y="-10"/>
+ <point x="504" y="77"/>
+ <point x="504" y="206" type="curve" smooth="yes"/>
+ <point x="504" y="333"/>
+ <point x="421" y="412"/>
+ <point x="302" y="412" type="curve" smooth="yes"/>
<point x="200" y="412"/>
<point x="126" y="357"/>
<point x="85" y="250" type="curve"/>
<point x="85" y="219" type="line"/>
<point x="126" y="336"/>
<point x="198" y="394"/>
- <point x="299" y="394" type="curve" smooth="yes"/>
- <point x="407" y="394"/>
- <point x="485" y="322"/>
- <point x="485" y="203" type="curve" smooth="yes"/>
- <point x="485" y="86"/>
- <point x="410" y="8"/>
- <point x="301" y="8" type="curve" smooth="yes"/>
+ <point x="298" y="394" type="curve" smooth="yes"/>
+ <point x="405" y="394"/>
+ <point x="483" y="322"/>
+ <point x="483" y="203" type="curve" smooth="yes"/>
+ <point x="483" y="86"/>
+ <point x="408" y="8"/>
+ <point x="300" y="8" type="curve" smooth="yes"/>
<point x="167" y="8"/>
<point x="90" y="125"/>
<point x="90" y="322" type="curve" smooth="yes"/>
<point x="90" y="559"/>
<point x="178" y="686"/>
- <point x="344" y="686" type="curve" smooth="yes"/>
- <point x="396" y="686"/>
- <point x="436" y="673"/>
- <point x="474" y="657" type="curve"/>
- <point x="481" y="674" type="line"/>
- <point x="440" y="691"/>
- <point x="401" y="704"/>
- <point x="346" y="704" type="curve" smooth="yes"/>
+ <point x="343" y="686" type="curve" smooth="yes"/>
+ <point x="394" y="686"/>
+ <point x="439" y="674"/>
+ <point x="480" y="650" type="curve"/>
+ <point x="487" y="667" type="line"/>
+ <point x="439" y="693"/>
+ <point x="396" y="704"/>
+ <point x="345" y="704" type="curve" smooth="yes"/>
<point x="165" y="704"/>
<point x="69" y="569"/>
<point x="69" y="319" type="curve" smooth="yes"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.glif b/src/Cantarell-Light.ufo/glyphs/two.glif
index 00bf7072..cc9cb803 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.glif
@@ -5,8 +5,8 @@
<outline>
<contour>
<point x="39" y="0" type="line"/>
- <point x="440" y="0" type="line"/>
- <point x="440" y="17" type="line"/>
+ <point x="442" y="0" type="line"/>
+ <point x="442" y="17" type="line"/>
<point x="59" y="17" type="line"/>
<point x="63" y="10" type="line"/>
<point x="357" y="310"/>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index e8196219..5cd5ba23 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -1277,16 +1277,6 @@
<string>seven</string>
<string>eight</string>
<string>nine</string>
- <string>zero.tf</string>
- <string>one.tf</string>
- <string>two.tf</string>
- <string>three.tf</string>
- <string>four.tf</string>
- <string>five.tf</string>
- <string>six.tf</string>
- <string>seven.tf</string>
- <string>eight.tf</string>
- <string>nine.tf</string>
<string>zero.osf</string>
<string>one.osf</string>
<string>two.osf</string>
@@ -1298,6 +1288,16 @@
<string>eight.osf</string>
<string>nine.osf</string>
<string>zero.osf.zero</string>
+ <string>zero.tf</string>
+ <string>one.tf</string>
+ <string>two.tf</string>
+ <string>three.tf</string>
+ <string>four.tf</string>
+ <string>five.tf</string>
+ <string>six.tf</string>
+ <string>seven.tf</string>
+ <string>eight.tf</string>
+ <string>nine.tf</string>
<string>zero.tf.zero</string>
<string>zero.tosf</string>
<string>one.tosf</string>
@@ -2928,104 +2928,9 @@
<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.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.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.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.subs</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.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.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.subs</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.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.tosf</string>
- <string>twofifths</string>
- <string>twoinferior</string>
- <string>twosuperior</string>
- <string>twothirds</string>
- <string>zero.dnom</string>
- <string>zero.numr</string>
- <string>zero.osf</string>
- <string>zero.osf.zero</string>
- <string>zero.subs</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/glyphs/layerinfo.plist
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index b40c75c3..2b2266d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
@@ -1853,7 +1853,7 @@
<key>com.schriftgestaltung.layerOrderInGlyph.shha-cy</key>
<integer>1</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
<integer>0</integer>
<key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.glif b/src/Cantarell-Regular.ufo/glyphs/one.glif
index 46b31692..5e5add2f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.glif
@@ -1,17 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<glyph name="one" format="2">
- <advance width="419"/>
+ <advance width="439"/>
<unicode hex="0031"/>
<outline>
<contour>
- <point x="216" y="-5" type="line"/>
- <point x="293" y="-5" type="line"/>
- <point x="293" y="694" type="line"/>
- <point x="247" y="694" type="line"/>
- <point x="19" y="526" type="line"/>
- <point x="56" y="472" type="line"/>
- <point x="244" y="611" type="line"/>
- <point x="216" y="632" type="line"/>
+ <point x="226" y="-5" type="line"/>
+ <point x="303" y="-5" type="line"/>
+ <point x="303" y="694" type="line"/>
+ <point x="257" y="694" type="line"/>
+ <point x="29" y="526" type="line"/>
+ <point x="69" y="469" type="line"/>
+ <point x="257" y="608" type="line"/>
+ <point x="226" y="632" type="line"/>
</contour>
</outline>
</glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.glif b/src/Cantarell-Regular.ufo/glyphs/six.glif
index 53507b49..77d18b9d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.glif
@@ -30,12 +30,12 @@
<point x="142" y="536"/>
<point x="212" y="633"/>
<point x="359" y="633" type="curve" smooth="yes"/>
- <point x="405" y="633"/>
- <point x="453" y="624"/>
- <point x="492" y="608" type="curve"/>
- <point x="516" y="672" type="line"/>
- <point x="468" y="693"/>
- <point x="418" y="704"/>
+ <point x="411" y="633"/>
+ <point x="459" y="621"/>
+ <point x="503" y="598" type="curve"/>
+ <point x="527" y="662" type="line"/>
+ <point x="471" y="691"/>
+ <point x="421" y="704"/>
<point x="364" y="704" type="curve" smooth="yes"/>
<point x="173" y="704"/>
<point x="62" y="565"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.glif b/src/Cantarell-Regular.ufo/glyphs/two.glif
index 01f848ba..7233d4ab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.glif
@@ -5,8 +5,8 @@
<outline>
<contour>
<point x="50" y="0" type="line"/>
- <point x="492" y="0" type="line"/>
- <point x="492" y="71" type="line"/>
+ <point x="489" y="0" type="line"/>
+ <point x="489" y="71" type="line"/>
<point x="132" y="71" type="line"/>
<point x="143" y="47" type="line"/>
<point x="383" y="273"/>
diff --git a/src/Cantarell-Regular.ufo/lib.plist b/src/Cantarell-Regular.ufo/lib.plist
index 4917f507..8a671cb8 100644
--- a/src/Cantarell-Regular.ufo/lib.plist
+++ b/src/Cantarell-Regular.ufo/lib.plist
@@ -2067,16 +2067,6 @@
<string>seven</string>
<string>eight</string>
<string>nine</string>
- <string>zero.tf</string>
- <string>one.tf</string>
- <string>two.tf</string>
- <string>three.tf</string>
- <string>four.tf</string>
- <string>five.tf</string>
- <string>six.tf</string>
- <string>seven.tf</string>
- <string>eight.tf</string>
- <string>nine.tf</string>
<string>zero.osf</string>
<string>one.osf</string>
<string>two.osf</string>
@@ -2088,6 +2078,16 @@
<string>eight.osf</string>
<string>nine.osf</string>
<string>zero.osf.zero</string>
+ <string>zero.tf</string>
+ <string>one.tf</string>
+ <string>two.tf</string>
+ <string>three.tf</string>
+ <string>four.tf</string>
+ <string>five.tf</string>
+ <string>six.tf</string>
+ <string>seven.tf</string>
+ <string>eight.tf</string>
+ <string>nine.tf</string>
<string>zero.tf.zero</string>
<string>zero.tosf</string>
<string>one.tosf</string>
@@ -3718,104 +3718,9 @@
<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.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.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.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.subs</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.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.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.subs</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.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.tosf</string>
- <string>twofifths</string>
- <string>twoinferior</string>
- <string>twosuperior</string>
- <string>twothirds</string>
- <string>zero.dnom</string>
- <string>zero.numr</string>
- <string>zero.osf</string>
- <string>zero.osf.zero</string>
- <string>zero.subs</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>
diff --git a/src/Cantarell.designspace b/src/Cantarell.designspace
index 231fe5b0..6bd0e92a 100644
--- a/src/Cantarell.designspace
+++ b/src/Cantarell.designspace
@@ -272,104 +272,9 @@
<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.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.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.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.subs</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.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.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.subs</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.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.tosf</string>
- <string>twofifths</string>
- <string>twoinferior</string>
- <string>twosuperior</string>
- <string>twothirds</string>
- <string>zero.dnom</string>
- <string>zero.numr</string>
- <string>zero.osf</string>
- <string>zero.osf.zero</string>
- <string>zero.subs</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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]