From 26744f1c77feb7a3ea887b1f267f5e0f21f9a25d Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sat, 13 Jan 2018 19:02:32 -0800
Subject: [PATCH] Swap one <-> one.1 (one with bend is now th edefault, and
 straight-anchored-one is now in ss01

---
 src/Inter-UI-Black.ufo/glyphs/one.1.glif      |  22 ++-
 src/Inter-UI-Black.ufo/glyphs/one.glif        | 132 ++----------------
 src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif |   2 +-
 src/Inter-UI-Black.ufo/glyphs/one.tnum.glif   |   2 +-
 src/Inter-UI-Regular.ufo/glyphs/one.1.glif    |  14 +-
 src/Inter-UI-Regular.ufo/glyphs/one.glif      |  14 +-
 6 files changed, 38 insertions(+), 148 deletions(-)

diff --git a/src/Inter-UI-Black.ufo/glyphs/one.1.glif b/src/Inter-UI-Black.ufo/glyphs/one.1.glif
index c876c09d7..9becaba8a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.1.glif
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="one.1" format="1">
-  <advance width="1408"/>
+  <advance width="1364"/>
   <outline>
     <contour>
-      <point x="996" y="2048" type="line"/>
-      <point x="580" y="2048" type="line"/>
-      <point x="580" y="2032"/>
-      <point x="540" y="1704"/>
-      <point x="160" y="1704" type="curve"/>
-      <point x="160" y="1336" type="line"/>
-      <point x="376" y="1336"/>
-      <point x="512" y="1384"/>
-      <point x="560" y="1464" type="curve"/>
-      <point x="576" y="1464" type="line"/>
-      <point x="576" y="0" type="line"/>
-      <point x="996" y="0" type="line"/>
+      <point x="952" y="2048" type="line"/>
+      <point x="564" y="2048" type="line"/>
+      <point x="80" y="1764" type="line"/>
+      <point x="256" y="1456" type="line"/>
+      <point x="520" y="1608" type="line"/>
+      <point x="532" y="1608" type="line"/>
+      <point x="532" y="0" type="line"/>
+      <point x="952" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.glif b/src/Inter-UI-Black.ufo/glyphs/one.glif
index b7284c9c5..bed602989 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.glif
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="one" format="1">
-  <advance width="1364"/>
+  <advance width="1408"/>
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="952" y="2048" type="line"/>
-      <point x="564" y="2048" type="line"/>
-      <point x="80" y="1764" type="line"/>
-      <point x="256" y="1456" type="line"/>
-      <point x="520" y="1608" type="line"/>
-      <point x="532" y="1608" type="line"/>
-      <point x="532" y="0" type="line"/>
-      <point x="952" y="0" type="line"/>
+      <point x="996" y="2048" type="line"/>
+      <point x="580" y="2048" type="line"/>
+      <point x="580" y="2032"/>
+      <point x="540" y="1704"/>
+      <point x="160" y="1704" type="curve"/>
+      <point x="160" y="1336" type="line"/>
+      <point x="376" y="1336"/>
+      <point x="512" y="1384"/>
+      <point x="560" y="1464" type="curve"/>
+      <point x="576" y="1464" type="line"/>
+      <point x="576" y="0" type="line"/>
+      <point x="996" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -43,116 +47,6 @@
           <real>763.125</real>
         </dict>
       </array>
-      <key>com.typemytype.robofont.layerData</key>
-      <dict>
-        <key>reference</key>
-        <dict>
-          <key>anchors</key>
-          <array>
-          </array>
-          <key>components</key>
-          <array>
-          </array>
-          <key>contours</key>
-          <array>
-            <dict>
-              <key>points</key>
-              <array>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>768.0</real>
-                  <key>y</key>
-                  <integer>2048</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>532.0</real>
-                  <key>y</key>
-                  <integer>2048</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>20.0</real>
-                  <key>y</key>
-                  <integer>1748</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>124.0</real>
-                  <key>y</key>
-                  <integer>1564</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>520.0</real>
-                  <key>y</key>
-                  <integer>1796</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>532.0</real>
-                  <key>y</key>
-                  <integer>1796</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>532.0</real>
-                  <key>y</key>
-                  <integer>0</integer>
-                </dict>
-                <dict>
-                  <key>segmentType</key>
-                  <string>line</string>
-                  <key>smooth</key>
-                  <false/>
-                  <key>x</key>
-                  <real>768.0</real>
-                  <key>y</key>
-                  <integer>0</integer>
-                </dict>
-              </array>
-            </dict>
-          </array>
-          <key>lib</key>
-          <dict>
-          </dict>
-          <key>name</key>
-          <string>one</string>
-          <key>unicodes</key>
-          <array>
-          </array>
-          <key>width</key>
-          <integer>1364</integer>
-        </dict>
-      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.89</real>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif b/src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif
index e131774bc..6603a6987 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif
@@ -8,7 +8,7 @@
       <point x="1616" y="384" type="line"/>
       <point x="336" y="384" type="line"/>
     </contour>
-    <component base="one.1" xOffset="192"/>
+    <component base="one.1" xOffset="236"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif
index 084ce13c6..557d069a2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif
@@ -8,7 +8,7 @@
       <point x="1616" y="384" type="line"/>
       <point x="336" y="384" type="line"/>
     </contour>
-    <component base="one" xOffset="252"/>
+    <component base="one" xOffset="208"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/one.1.glif b/src/Inter-UI-Regular.ufo/glyphs/one.1.glif
index 4154cdceb..6b8e626d5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/one.1.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/one.1.glif
@@ -4,15 +4,11 @@
   <outline>
     <contour>
       <point x="860" y="2048" type="line"/>
-      <point x="652" y="2048" type="line"/>
-      <point x="628" y="2024"/>
-      <point x="496" y="1744"/>
-      <point x="176" y="1744" type="curve"/>
-      <point x="176" y="1536" type="line"/>
-      <point x="412" y="1536"/>
-      <point x="580" y="1632"/>
-      <point x="608" y="1688" type="curve"/>
-      <point x="624" y="1688" type="line"/>
+      <point x="624" y="2048" type="line"/>
+      <point x="112" y="1748" type="line"/>
+      <point x="216" y="1564" type="line"/>
+      <point x="612" y="1796" type="line"/>
+      <point x="624" y="1796" type="line"/>
       <point x="624" y="0" type="line"/>
       <point x="860" y="0" type="line"/>
     </contour>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/one.glif b/src/Inter-UI-Regular.ufo/glyphs/one.glif
index 482170ea1..ad2194419 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/one.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/one.glif
@@ -5,11 +5,15 @@
   <outline>
     <contour>
       <point x="860" y="2048" type="line"/>
-      <point x="624" y="2048" type="line"/>
-      <point x="112" y="1748" type="line"/>
-      <point x="216" y="1564" type="line"/>
-      <point x="612" y="1796" type="line"/>
-      <point x="624" y="1796" type="line"/>
+      <point x="652" y="2048" type="line"/>
+      <point x="628" y="2024"/>
+      <point x="496" y="1744"/>
+      <point x="176" y="1744" type="curve"/>
+      <point x="176" y="1536" type="line"/>
+      <point x="412" y="1536"/>
+      <point x="580" y="1632"/>
+      <point x="608" y="1688" type="curve"/>
+      <point x="624" y="1688" type="line"/>
       <point x="624" y="0" type="line"/>
       <point x="860" y="0" type="line"/>
     </contour>