[cantarell-fonts/tweak-numerals: 6/6] Yet more tweaking

From: Nikolaus Waxweiler <nwaxweiler src gnome org>
To: commits-list gnome org
Cc:
Subject: [cantarell-fonts/tweak-numerals: 6/6] Yet more tweaking
Date: Mon, 6 May 2019 23:10:51 +0000 (UTC)
commit e934646de6c82181cd3eaa314dce4e7c89b19ab1
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun May 5 21:19:39 2019 +0100

    Yet more tweaking

 .../glyphs.M_ay 5 19, 13_08/layerinfo.plist        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/five.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/layerinfo.plist      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/six.glif             | 42 +++++++--------
 .../glyphs.M_ay 5 19, 13_08/layerinfo.plist        |  2 +-
 .../glyphs.M_ay 5 19, 13_08/contents.plist         |  2 -
 .../glyphs.M_ay 5 19, 13_08/layerinfo.plist        |  2 -
 .../glyphs.M_ay 5 19, 18_34/contents.plist         |  8 +++
 .../glyphs.M_ay 5 19, 18_34/layerinfo.plist        | 13 +++++
 .../six.glif                                       |  0
 src/Cantarell-Regular.ufo/glyphs/layerinfo.plist   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/one.glif          |  4 +-
 src/Cantarell-Regular.ufo/glyphs/six.glif          | 40 +++++++--------
 src/Cantarell-Regular.ufo/glyphs/three.glif        | 60 +++++++++++-----------
 src/Cantarell-Regular.ufo/layercontents.plist      |  4 ++
 15 files changed, 104 insertions(+), 83 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist
index 172f6803..931f8ebc 100644
--- a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist    
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist    
@@ -19,7 +19,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.seven</key>
       <integer>5</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
-      <integer>5</integer>
+      <integer>3</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
       <integer>5</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.glif b/src/Cantarell-Bold.ufo/glyphs/five.glif
index bbc67f60..5eb1775c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.glif
@@ -14,8 +14,8 @@
       <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="224" y="365" type="line"/>
+      <point x="232" 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"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
index da272fcf..a79a3415 100644
--- a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
@@ -1841,7 +1841,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.shha-cy</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
-      <integer>2</integer>
+      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six.numr</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.glif b/src/Cantarell-Bold.ufo/glyphs/six.glif
index 31bf35b9..43824343 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.glif
@@ -9,26 +9,26 @@
       <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="485" 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="269" y="449"/>
+      <point x="198" y="399"/>
+      <point x="156" y="303" type="curve"/>
+      <point x="195" y="257" type="line"/>
+      <point x="224" y="292"/>
+      <point x="265" y="314"/>
+      <point x="307" y="314" type="curve" smooth="yes"/>
+      <point x="362" y="314"/>
+      <point x="403" y="273"/>
+      <point x="403" y="219" type="curve" smooth="yes"/>
+      <point x="403" y="168"/>
+      <point x="366" y="131"/>
+      <point x="314" y="131" type="curve" smooth="yes"/>
+      <point x="237" y="131"/>
+      <point x="186" y="215"/>
+      <point x="186" y="344" type="curve" smooth="yes"/>
+      <point x="186" y="483"/>
+      <point x="254" y="561"/>
       <point x="374" y="561" type="curve" smooth="yes"/>
       <point x="422" y="561"/>
       <point x="477" y="548"/>
@@ -37,8 +37,8 @@
       <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="150" y="704"/>
+      <point x="26" y="562"/>
       <point x="26" y="330" type="curve" smooth="yes"/>
       <point x="26" y="107"/>
       <point x="127" y="-10"/>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist
index bc4a0f70..f4704e53 100644
--- a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist   
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist   
@@ -19,7 +19,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.seven</key>
       <integer>3</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
-      <integer>3</integer>
+      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
       <integer>3</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/contents.plist
index 679c3008..6bc8bbc7 100644
--- a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/contents.plist  
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/contents.plist  
@@ -14,8 +14,6 @@
     <string>one.glif</string>
     <key>seven</key>
     <string>seven.glif</string>
-    <key>six</key>
-    <string>six.glif</string>
     <key>three</key>
     <string>three.glif</string>
     <key>two</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist
index 2c1988b0..ae5b19a9 100644
--- a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/layerinfo.plist 
@@ -18,8 +18,6 @@
       <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.seven</key>
       <integer>4</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
-      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
       <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/contents.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/contents.plist
new file mode 100644
index 00000000..bbfa3e7f
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/contents.plist  
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>six</key>
+    <string>six.glif</string>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/layerinfo.plist
new file mode 100644
index 00000000..17bad2f1
--- /dev/null
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/layerinfo.plist 
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+  <dict>
+    <key>lib</key>
+    <dict>
+      <key>com.schriftgestaltung.layerId</key>
+      <string>3EF3DB61-A7B2-4A4B-8391-2A58E7C4D230</string>
+      <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
+      <integer>4</integer>
+    </dict>
+  </dict>
+</plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/six.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/six.glif
similarity index 100%
rename from src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/six.glif
rename to src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 18_34/six.glif
diff --git a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index 35e86bd1..0e739259 100644
--- a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
@@ -1841,7 +1841,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.shha-cy</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.six</key>
-      <integer>1</integer>
+      <integer>5</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 5e5add2f..35d23985 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.glif
@@ -9,8 +9,8 @@
       <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="70" y="470" type="line"/>
+      <point x="258" y="609" type="line"/>
       <point x="226" y="632" type="line"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.glif b/src/Cantarell-Regular.ufo/glyphs/six.glif
index 77d18b9d..c14a3b7a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.glif
@@ -5,42 +5,42 @@
   <outline>
     <contour>
       <point x="307" y="-10" type="curve" smooth="yes"/>
-      <point x="442" y="-10"/>
+      <point x="441" y="-10"/>
       <point x="535" y="84"/>
       <point x="535" y="219" type="curve" smooth="yes"/>
       <point x="535" y="344"/>
-      <point x="455" y="427"/>
+      <point x="454" y="427"/>
       <point x="334" y="427" type="curve" smooth="yes"/>
       <point x="229" y="427"/>
-      <point x="147" y="366"/>
-      <point x="124" y="267" type="curve"/>
-      <point x="139" y="226" type="line"/>
-      <point x="160" y="309"/>
-      <point x="225" y="361"/>
-      <point x="311" y="361" type="curve" smooth="yes"/>
-      <point x="402" y="361"/>
-      <point x="459" y="302"/>
-      <point x="459" y="209" type="curve" smooth="yes"/>
-      <point x="459" y="118"/>
+      <point x="147" y="365"/>
+      <point x="124" y="268" type="curve"/>
+      <point x="140" y="226" type="line"/>
+      <point x="162" y="312"/>
+      <point x="229" y="359"/>
+      <point x="311" y="359" type="curve" smooth="yes"/>
+      <point x="402" y="359"/>
+      <point x="458" y="301"/>
+      <point x="458" y="209" type="curve" smooth="yes"/>
+      <point x="458" y="119"/>
       <point x="405" y="60"/>
       <point x="317" y="60" type="curve" smooth="yes"/>
       <point x="202" y="60"/>
-      <point x="142" y="156"/>
-      <point x="142" y="338" type="curve" smooth="yes"/>
-      <point x="142" y="536"/>
+      <point x="141" y="157"/>
+      <point x="141" y="338" type="curve" smooth="yes"/>
+      <point x="141" y="534"/>
       <point x="212" y="633"/>
-      <point x="359" y="633" type="curve" smooth="yes"/>
-      <point x="411" y="633"/>
-      <point x="459" y="621"/>
+      <point x="360" y="633" type="curve" smooth="yes"/>
+      <point x="407" y="633"/>
+      <point x="458" y="622"/>
       <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"/>
+      <point x="62" y="564"/>
       <point x="62" y="327" type="curve" smooth="yes"/>
-      <point x="62" y="112"/>
+      <point x="62" y="113"/>
       <point x="152" y="-10"/>
     </contour>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.glif b/src/Cantarell-Regular.ufo/glyphs/three.glif
index ddedcc89..2ade41cf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.glif
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three" format="2">
-  <advance width="567"/>
+  <advance width="568"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="257" y="-11" type="curve" smooth="yes"/>
-      <point x="408" y="-11"/>
-      <point x="515" y="68"/>
-      <point x="515" y="183" type="curve" smooth="yes"/>
-      <point x="515" y="286"/>
-      <point x="433" y="362"/>
-      <point x="310" y="368" type="curve"/>
-      <point x="306" y="349" type="line"/>
-      <point x="407" y="352"/>
-      <point x="481" y="422"/>
-      <point x="481" y="522" type="curve" smooth="yes"/>
-      <point x="481" y="632"/>
+      <point x="262" y="-11" type="curve" smooth="yes"/>
+      <point x="414" y="-11"/>
+      <point x="518" y="69"/>
+      <point x="518" y="189" type="curve" smooth="yes"/>
+      <point x="518" y="291"/>
+      <point x="440" y="362"/>
+      <point x="321" y="365" type="curve"/>
+      <point x="307" y="353" type="line"/>
+      <point x="411" y="356"/>
+      <point x="482" y="426"/>
+      <point x="482" y="522" type="curve" smooth="yes"/>
+      <point x="482" y="632"/>
       <point x="393" y="703"/>
       <point x="265" y="703" type="curve" smooth="yes"/>
-      <point x="192" y="703"/>
+      <point x="193" y="703"/>
       <point x="113" y="680"/>
       <point x="54" y="646" type="curve"/>
-      <point x="73" y="587" type="line"/>
-      <point x="135" y="618"/>
-      <point x="201" y="634"/>
-      <point x="251" y="634" type="curve" smooth="yes"/>
-      <point x="341" y="634"/>
-      <point x="406" y="587"/>
+      <point x="73" y="586" type="line"/>
+      <point x="135" y="617"/>
+      <point x="201" y="633"/>
+      <point x="251" y="633" type="curve" smooth="yes"/>
+      <point x="341" y="633"/>
+      <point x="406" y="586"/>
       <point x="406" y="515" type="curve" smooth="yes"/>
       <point x="406" y="438"/>
-      <point x="333" y="386"/>
+      <point x="332" y="386"/>
       <point x="229" y="386" type="curve" smooth="yes"/>
       <point x="175" y="386" type="line"/>
       <point x="175" y="317" type="line"/>
       <point x="248" y="317" type="line" smooth="yes"/>
-      <point x="366" y="317"/>
+      <point x="365" y="317"/>
       <point x="437" y="266"/>
       <point x="437" y="184" type="curve" smooth="yes"/>
-      <point x="437" y="104"/>
-      <point x="369" y="59"/>
-      <point x="265" y="59" type="curve" smooth="yes"/>
-      <point x="205" y="59"/>
-      <point x="123" y="75"/>
-      <point x="58" y="108" type="curve"/>
+      <point x="437" y="105"/>
+      <point x="369" y="61"/>
+      <point x="265" y="61" type="curve" smooth="yes"/>
+      <point x="205" y="61"/>
+      <point x="123" y="76"/>
+      <point x="58" y="109" type="curve"/>
       <point x="40" y="43" type="line"/>
-      <point x="106" y="9"/>
-      <point x="187" y="-11"/>
+      <point x="107" y="9"/>
+      <point x="189" y="-11"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/layercontents.plist b/src/Cantarell-Regular.ufo/layercontents.plist
index 1ef24ea2..507ce589 100644
--- a/src/Cantarell-Regular.ufo/layercontents.plist
+++ b/src/Cantarell-Regular.ufo/layercontents.plist
@@ -14,5 +14,9 @@
       <string>May 5 19, 13:08</string>
       <string>glyphs.M_ay 5 19, 13_08</string>
     </array>
+    <array>
+      <string>May 5 19, 18:34</string>
+      <string>glyphs.M_ay 5 19, 18_34</string>
+    </array>
   </array>
 </plist>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]