Reworked "one", improved tnum, improved digit kerning, new ss01 "one" with bendt hook

26 files changed, 541 insertions, 184 deletions

diff --git a/src/Inter-UI-Black.ufo/features.fea b/src/Inter-UI-Black.ufo/features.fea
index 2a42fb476..c1a3a4541 100644
--- a/src/Inter-UI-Black.ufo/features.fea
+++ b/src/Inter-UI-Black.ufo/features.fea
@@ -1,13 +1,13 @@
 include(../features.fea);
 
 @TNUM_L = [
-  zero one two three five six seven
-  four.1 six.1 nine.1
+  zero one two three five six seven eight nine
+  one.1 four.1 six.1 nine.1
   period comma
 ];
 @TNUM_R = [
-  zero.tnum one.tnum two.tnum three.tnum five.tnum six.tnum seven.tnum
-  four.tnum.1 six.tnum.1 nine.tnum.1
+  zero.tnum one.tnum two.tnum three.tnum five.tnum six.tnum seven.tnum eight.tnum nine.tnum
+  one.tnum.1 four.tnum.1 six.tnum.1 nine.tnum.1
   period.tnum comma.tnum
 ];
 
diff --git a/src/Inter-UI-Black.ufo/glyphs/contents.plist b/src/Inter-UI-Black.ufo/glyphs/contents.plist
index 2bf1fd079..9764f6108 100644
--- a/src/Inter-UI-Black.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Black.ufo/glyphs/contents.plist
@@ -784,6 +784,8 @@
 	<string>eight.frac.glif</string>
 	<key>eight.sup</key>
 	<string>eight.sup.glif</string>
+	<key>eight.tnum</key>
+	<string>eight.tnum.glif</string>
 	<key>eightroman</key>
 	<string>eightroman.glif</string>
 	<key>eightsub</key>
@@ -1250,6 +1252,8 @@
 	<string>nine.frac.glif</string>
 	<key>nine.sup</key>
 	<string>nine.sup.glif</string>
+	<key>nine.tnum</key>
+	<string>nine.tnum.glif</string>
 	<key>nine.tnum.1</key>
 	<string>nine.tnum.1.glif</string>
 	<key>nineinferior</key>
@@ -1306,10 +1310,14 @@
 	<string>omegatitlocyrillic.glif</string>
 	<key>one</key>
 	<string>one.glif</string>
+	<key>one.1</key>
+	<string>one.1.glif</string>
 	<key>one.sup</key>
 	<string>one.sup.glif</string>
 	<key>one.tnum</key>
 	<string>one.tnum.glif</string>
+	<key>one.tnum.1</key>
+	<string>one.tnum.1.glif</string>
 	<key>onedotleader</key>
 	<string>onedotleader.glif</string>
 	<key>oneeighth</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/eight.glif b/src/Inter-UI-Black.ufo/glyphs/eight.glif
index 223555c62..c0fd5122f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/eight.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/eight.glif
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="eight" format="1">
-  <advance width="1792"/>
+  <advance width="1640"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="1588" y="564" type="curve" smooth="yes"/>
-      <point x="1588" y="920"/>
-      <point x="1296" y="1136"/>
-      <point x="896" y="1136" type="curve" smooth="yes"/>
-      <point x="504" y="1136"/>
-      <point x="204" y="920"/>
-      <point x="204" y="564" type="curve" smooth="yes"/>
-      <point x="204" y="172"/>
-      <point x="504" y="-28"/>
-      <point x="900" y="-28" type="curve" smooth="yes"/>
-      <point x="1296" y="-28"/>
-      <point x="1588" y="172"/>
+      <point x="1512" y="564" type="curve" smooth="yes"/>
+      <point x="1512" y="920"/>
+      <point x="1220" y="1136"/>
+      <point x="820" y="1136" type="curve" smooth="yes"/>
+      <point x="428" y="1136"/>
+      <point x="128" y="920"/>
+      <point x="128" y="564" type="curve" smooth="yes"/>
+      <point x="128" y="172"/>
+      <point x="428" y="-28"/>
+      <point x="824" y="-28" type="curve" smooth="yes"/>
+      <point x="1220" y="-28"/>
+      <point x="1512" y="172"/>
     </contour>
     <contour>
-      <point x="1144" y="600" type="curve" smooth="yes"/>
-      <point x="1144" y="436"/>
-      <point x="1048" y="340"/>
-      <point x="900" y="340" type="curve" smooth="yes"/>
-      <point x="752" y="340"/>
-      <point x="648" y="436"/>
-      <point x="648" y="600" type="curve" smooth="yes"/>
-      <point x="648" y="768"/>
-      <point x="752" y="868"/>
-      <point x="896" y="868" type="curve" smooth="yes"/>
-      <point x="1044" y="868"/>
-      <point x="1144" y="768"/>
+      <point x="1068" y="600" type="curve" smooth="yes"/>
+      <point x="1068" y="436"/>
+      <point x="972" y="340"/>
+      <point x="824" y="340" type="curve" smooth="yes"/>
+      <point x="676" y="340"/>
+      <point x="572" y="436"/>
+      <point x="572" y="600" type="curve" smooth="yes"/>
+      <point x="572" y="768"/>
+      <point x="676" y="868"/>
+      <point x="820" y="868" type="curve" smooth="yes"/>
+      <point x="968" y="868"/>
+      <point x="1068" y="768"/>
     </contour>
     <contour>
-      <point x="1548" y="1500" type="curve" smooth="yes"/>
-      <point x="1548" y="1876"/>
-      <point x="1280" y="2076"/>
-      <point x="896" y="2076" type="curve" smooth="yes"/>
-      <point x="520" y="2076"/>
-      <point x="248" y="1876"/>
-      <point x="248" y="1500" type="curve" smooth="yes"/>
-      <point x="248" y="1180"/>
-      <point x="520" y="964"/>
-      <point x="900" y="964" type="curve" smooth="yes"/>
-      <point x="1280" y="964"/>
-      <point x="1548" y="1180"/>
+      <point x="1472" y="1500" type="curve" smooth="yes"/>
+      <point x="1472" y="1876"/>
+      <point x="1204" y="2076"/>
+      <point x="820" y="2076" type="curve" smooth="yes"/>
+      <point x="444" y="2076"/>
+      <point x="172" y="1876"/>
+      <point x="172" y="1500" type="curve" smooth="yes"/>
+      <point x="172" y="1180"/>
+      <point x="444" y="964"/>
+      <point x="824" y="964" type="curve" smooth="yes"/>
+      <point x="1204" y="964"/>
+      <point x="1472" y="1180"/>
     </contour>
     <contour>
-      <point x="1104" y="1476" type="curve" smooth="yes"/>
-      <point x="1104" y="1328"/>
-      <point x="1036" y="1232"/>
-      <point x="900" y="1232" type="curve" smooth="yes"/>
-      <point x="764" y="1232"/>
-      <point x="692" y="1328"/>
-      <point x="692" y="1476" type="curve" smooth="yes"/>
-      <point x="692" y="1624"/>
-      <point x="764" y="1708"/>
-      <point x="896" y="1708" type="curve" smooth="yes"/>
-      <point x="1032" y="1708"/>
-      <point x="1104" y="1620"/>
+      <point x="1028" y="1476" type="curve" smooth="yes"/>
+      <point x="1028" y="1328"/>
+      <point x="960" y="1232"/>
+      <point x="824" y="1232" type="curve" smooth="yes"/>
+      <point x="688" y="1232"/>
+      <point x="616" y="1328"/>
+      <point x="616" y="1476" type="curve" smooth="yes"/>
+      <point x="616" y="1624"/>
+      <point x="688" y="1708"/>
+      <point x="820" y="1708" type="curve" smooth="yes"/>
+      <point x="956" y="1708"/>
+      <point x="1028" y="1620"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/eight.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/eight.tnum.glif
new file mode 100644
index 000000000..187d735c4
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/eight.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="eight.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="eight" xOffset="76"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9230863777</real>
+        <real>0.9647658846</real>
+        <real>0.7857136537</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nine.glif b/src/Inter-UI-Black.ufo/glyphs/nine.glif
index 9f02be1f3..3d38975b4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nine.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nine.glif
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="nine" format="1">
-  <advance width="1792"/>
+  <advance width="1660"/>
   <unicode hex="0039"/>
   <outline>
     <contour>
-      <point x="630" y="545" type="curve"/>
-      <point x="200" y="545" type="line"/>
-      <point x="268" y="213"/>
-      <point x="471" y="-34"/>
-      <point x="871" y="-34" type="curve"/>
-      <point x="1425.97" y="-1.650000000000091"/>
-      <point x="1604" y="444"/>
-      <point x="1604" y="1100" type="curve" smooth="yes"/>
-      <point x="1604" y="1180" type="line" smooth="yes"/>
-      <point x="1604" y="1756"/>
-      <point x="1300" y="2076"/>
-      <point x="876" y="2076" type="curve" smooth="yes"/>
-      <point x="468" y="2076"/>
-      <point x="184" y="1776"/>
-      <point x="184" y="1384" type="curve" smooth="yes"/>
-      <point x="184" y="996"/>
-      <point x="384" y="696"/>
-      <point x="752" y="696" type="curve" smooth="yes"/>
-      <point x="1104" y="696"/>
-      <point x="1304" y="980"/>
-      <point x="1304" y="1200" type="curve"/>
-      <point x="1160" y="1312" type="line"/>
-      <point x="1160" y="1188"/>
-      <point x="1080" y="1052"/>
-      <point x="900" y="1052" type="curve" smooth="yes"/>
-      <point x="736" y="1052"/>
-      <point x="628" y="1180"/>
-      <point x="628" y="1384" type="curve" smooth="yes"/>
-      <point x="628" y="1576"/>
-      <point x="732" y="1716"/>
-      <point x="888" y="1716" type="curve" smooth="yes"/>
-      <point x="1060" y="1716"/>
-      <point x="1160" y="1596"/>
-      <point x="1160" y="1336" type="curve" smooth="yes"/>
-      <point x="1160" y="988" type="line" smooth="yes"/>
-      <point x="1160" y="604"/>
-      <point x="1064.989" y="334.99"/>
-      <point x="878" y="333" type="curve" smooth="yes"/>
-      <point x="731.978" y="331.45000000000005"/>
-      <point x="677" y="394"/>
+      <point x="576" y="544" type="curve"/>
+      <point x="144" y="544" type="line"/>
+      <point x="212" y="212"/>
+      <point x="416" y="-36"/>
+      <point x="816" y="-36" type="curve"/>
+      <point x="1368" y="0"/>
+      <point x="1548" y="444"/>
+      <point x="1548" y="1100" type="curve" smooth="yes"/>
+      <point x="1548" y="1180" type="line" smooth="yes"/>
+      <point x="1548" y="1756"/>
+      <point x="1244" y="2076"/>
+      <point x="820" y="2076" type="curve" smooth="yes"/>
+      <point x="412" y="2076"/>
+      <point x="128" y="1776"/>
+      <point x="128" y="1384" type="curve" smooth="yes"/>
+      <point x="128" y="996"/>
+      <point x="328" y="696"/>
+      <point x="696" y="696" type="curve" smooth="yes"/>
+      <point x="1048" y="696"/>
+      <point x="1248" y="980"/>
+      <point x="1248" y="1200" type="curve"/>
+      <point x="1104" y="1312" type="line"/>
+      <point x="1104" y="1188"/>
+      <point x="1024" y="1052"/>
+      <point x="844" y="1052" type="curve" smooth="yes"/>
+      <point x="680" y="1052"/>
+      <point x="572" y="1180"/>
+      <point x="572" y="1384" type="curve" smooth="yes"/>
+      <point x="572" y="1576"/>
+      <point x="676" y="1716"/>
+      <point x="832" y="1716" type="curve" smooth="yes"/>
+      <point x="1004" y="1716"/>
+      <point x="1104" y="1596"/>
+      <point x="1104" y="1336" type="curve" smooth="yes"/>
+      <point x="1104" y="988" type="line" smooth="yes"/>
+      <point x="1104" y="604"/>
+      <point x="1008" y="336"/>
+      <point x="824" y="332" type="curve" smooth="yes"/>
+      <point x="676" y="332"/>
+      <point x="620" y="396"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nine.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/nine.tnum.glif
new file mode 100644
index 000000000..928882c5c
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/nine.tnum.glif
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="nine.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="nine" xOffset="68"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.adobe.type.autohint</key>
+      <data>
+      </data>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>0.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>x</key>
+          <real>0.0</real>
+          <key>y</key>
+          <real>763.125</real>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>0.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>x</key>
+          <real>0.0</real>
+          <key>y</key>
+          <real>1238.875</real>
+        </dict>
+      </array>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9230863777</real>
+        <real>0.9647658846</real>
+        <real>0.7857136537</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1627, 'leftMargin': 113, 'rightMargin': 132}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.1.glif b/src/Inter-UI-Black.ufo/glyphs/one.1.glif
new file mode 100644
index 000000000..2867040bf
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/one.1.glif
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="one.1" format="1">
+  <advance width="1440.0"/>
+  <outline>
+    <contour>
+      <point x="1156" y="2048" type="line"/>
+      <point x="740" y="2048" type="line"/>
+      <point x="720" y="2028"/>
+      <point x="672" y="1708"/>
+      <point x="192" y="1708" type="curve"/>
+      <point x="192" y="1336" type="line"/>
+      <point x="472" y="1336"/>
+      <point x="648" y="1412"/>
+      <point x="720" y="1492" type="curve"/>
+      <point x="736" y="1492" type="line"/>
+      <point x="736" y="0" type="line"/>
+      <point x="1156.0" y="0.0" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>0.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>x</key>
+          <real>0.0</real>
+          <key>y</key>
+          <real>1238.875</real>
+        </dict>
+        <dict>
+          <key>angle</key>
+          <real>0.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>x</key>
+          <real>0.0</real>
+          <key>y</key>
+          <real>763.125</real>
+        </dict>
+      </array>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8029983485</real>
+        <real>0.9647658846</real>
+        <real>0.7954395628</real>
+        <real>1.0</real>
+      </array>
+      <key>interface.gridadjust.original</key>
+      <string>{'width': 1627, 'leftMargin': 230, 'rightMargin': 493}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.glif b/src/Inter-UI-Black.ufo/glyphs/one.glif
index 07244ead7..d39d20d34 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.glif
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="one" format="1">
-  <advance width="1536"/>
+  <advance width="1424.0"/>
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="1156" y="2068" type="line"/>
-      <point x="1116" y="2068" type="line"/>
-      <point x="124" y="1708" type="line"/>
-      <point x="124" y="1348" type="line"/>
-      <point x="692" y="1544" type="line"/>
-      <point x="692" y="0" type="line"/>
-      <point x="1156" y="0" type="line"/>
+      <point x="1140" y="2048" type="line"/>
+      <point x="720" y="2048" type="line"/>
+      <point x="128" y="1700" type="line"/>
+      <point x="304" y="1372" type="line"/>
+      <point x="708" y="1608" type="line"/>
+      <point x="720" y="1608" type="line"/>
+      <point x="720" y="0" type="line"/>
+      <point x="1140" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -42,6 +43,116 @@
           <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>956.0</real>
+                  <key>y</key>
+                  <integer>2048</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>720.0</real>
+                  <key>y</key>
+                  <integer>2048</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>208.0</real>
+                  <key>y</key>
+                  <integer>1748</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>312.0</real>
+                  <key>y</key>
+                  <integer>1564</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>708.0</real>
+                  <key>y</key>
+                  <integer>1796</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>720.0</real>
+                  <key>y</key>
+                  <integer>1796</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>720.0</real>
+                  <key>y</key>
+                  <integer>0</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <real>956.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>
+          <real>1424.0</real>
+        </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
new file mode 100644
index 000000000..3fe6221ce
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="one.tnum.1" format="1">
+  <advance width="1792"/>
+  <outline>
+    <contour>
+      <point x="224" y="0" type="line"/>
+      <point x="1692" y="0" type="line"/>
+      <point x="1692" y="384" type="line"/>
+      <point x="224" y="384" type="line"/>
+    </contour>
+    <component base="one.1" xOffset="32"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9230863777</real>
+        <real>0.9647658846</real>
+        <real>0.7857136537</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif
index 2543ff54d..cf5dfea21 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.tnum.glif
@@ -3,12 +3,12 @@
   <advance width="1792"/>
   <outline>
     <contour>
-      <point x="128" y="0" type="line"/>
-      <point x="1600" y="0" type="line"/>
-      <point x="1600" y="384" type="line"/>
-      <point x="128" y="384" type="line"/>
+      <point x="224" y="0" type="line"/>
+      <point x="1692" y="0" type="line"/>
+      <point x="1692" y="384" type="line"/>
+      <point x="224" y="384" type="line"/>
     </contour>
-    <component base="one" xOffset="-4"/>
+    <component base="one" xOffset="48"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/six.glif b/src/Inter-UI-Black.ufo/glyphs/six.glif
index 6f6536908..df2afc160 100644
--- a/src/Inter-UI-Black.ufo/glyphs/six.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/six.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="six" format="1">
-  <advance width="1664"/>
+  <advance width="1652"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
@@ -93,7 +93,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>0</integer>
+                <real>0.25349934699647747</real>
                 <integer>0</integer>
               </array>
             </dict>
@@ -110,7 +110,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1664</integer>
+          <integer>1652</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/six.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/six.tnum.glif
index c0a25c622..8b8ed9bde 100644
--- a/src/Inter-UI-Black.ufo/glyphs/six.tnum.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/six.tnum.glif
@@ -2,7 +2,7 @@
 <glyph name="six.tnum" format="1">
   <advance width="1792"/>
   <outline>
-    <component base="six" xOffset="72"/>
+    <component base="six" xOffset="68"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/three.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/three.tnum.glif
index a45fe1774..c20f49897 100644
--- a/src/Inter-UI-Black.ufo/glyphs/three.tnum.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/three.tnum.glif
@@ -2,7 +2,7 @@
 <glyph name="three.tnum" format="1">
   <advance width="1792"/>
   <outline>
-    <component base="three" xOffset="60"/>
+    <component base="three" xOffset="68"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zero.glif b/src/Inter-UI-Black.ufo/glyphs/zero.glif
index 1acc84372..6aa116e1b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zero.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zero.glif
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zero" format="1">
-  <advance width="1664"/>
+  <advance width="1680"/>
   <unicode hex="0030"/>
   <outline>
     <contour>
-      <point x="1560" y="1204" type="line" smooth="yes"/>
-      <point x="1560" y="1776"/>
-      <point x="1248" y="2076"/>
-      <point x="832" y="2076" type="curve" smooth="yes"/>
-      <point x="416" y="2076"/>
-      <point x="104" y="1776"/>
-      <point x="104" y="1204" type="curve" smooth="yes"/>
-      <point x="104" y="864" type="line" smooth="yes"/>
-      <point x="104" y="260"/>
-      <point x="412" y="-28"/>
-      <point x="832" y="-28" type="curve" smooth="yes"/>
-      <point x="1248" y="-28"/>
-      <point x="1560" y="260"/>
-      <point x="1560" y="864" type="curve" smooth="yes"/>
+      <point x="1568" y="1204" type="line" smooth="yes"/>
+      <point x="1568" y="1776"/>
+      <point x="1256" y="2076"/>
+      <point x="840" y="2076" type="curve" smooth="yes"/>
+      <point x="424" y="2076"/>
+      <point x="112" y="1776"/>
+      <point x="112" y="1204" type="curve" smooth="yes"/>
+      <point x="112" y="864" type="line" smooth="yes"/>
+      <point x="112" y="260"/>
+      <point x="420" y="-28"/>
+      <point x="840" y="-28" type="curve" smooth="yes"/>
+      <point x="1256" y="-28"/>
+      <point x="1568" y="260"/>
+      <point x="1568" y="864" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="1108" y="804" type="line" smooth="yes"/>
-      <point x="1108" y="464"/>
-      <point x="988" y="352"/>
-      <point x="832" y="352" type="curve" smooth="yes"/>
-      <point x="672" y="352"/>
-      <point x="556" y="464"/>
-      <point x="556" y="804" type="curve" smooth="yes"/>
-      <point x="556" y="1264" type="line" smooth="yes"/>
-      <point x="556" y="1572"/>
-      <point x="672" y="1700"/>
-      <point x="832" y="1700" type="curve" smooth="yes"/>
-      <point x="992" y="1700"/>
-      <point x="1108" y="1572"/>
-      <point x="1108" y="1264" type="curve" smooth="yes"/>
+      <point x="1116" y="804" type="line" smooth="yes"/>
+      <point x="1116" y="464"/>
+      <point x="996" y="352"/>
+      <point x="840" y="352" type="curve" smooth="yes"/>
+      <point x="680" y="352"/>
+      <point x="564" y="464"/>
+      <point x="564" y="804" type="curve" smooth="yes"/>
+      <point x="564" y="1264" type="line" smooth="yes"/>
+      <point x="564" y="1572"/>
+      <point x="680" y="1700"/>
+      <point x="840" y="1700" type="curve" smooth="yes"/>
+      <point x="1000" y="1700"/>
+      <point x="1116" y="1572"/>
+      <point x="1116" y="1264" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index 25f1c37ce..5058e7378 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -2554,7 +2554,7 @@
 		<key>backslash</key>
 		<integer>22</integer>
 		<key>nine</key>
-		<integer>-39</integer>
+		<integer>-8</integer>
 		<key>nine.1</key>
 		<integer>-162</integer>
 		<key>underscore</key>
@@ -5856,7 +5856,7 @@
 		<key>j</key>
 		<integer>-160</integer>
 		<key>nine</key>
-		<integer>-64</integer>
+		<integer>-8</integer>
 		<key>slash</key>
 		<integer>-80</integer>
 	</dict>
@@ -5895,49 +5895,49 @@
 	<key>one</key>
 	<dict>
 		<key>@KERN_RIGHT_asciicircum</key>
-		<integer>-22</integer>
+		<integer>10</integer>
 		<key>@KERN_RIGHT_comma</key>
-		<integer>-76</integer>
+		<integer>-44</integer>
 		<key>@KERN_RIGHT_dagger</key>
-		<integer>-15</integer>
+		<integer>17</integer>
 		<key>@KERN_RIGHT_guillemotleft</key>
-		<integer>-48</integer>
+		<integer>-16</integer>
 		<key>@KERN_RIGHT_quotedbl</key>
-		<integer>-28</integer>
+		<integer>4</integer>
 		<key>@KERN_RIGHT_quotedblbase</key>
-		<integer>-63</integer>
+		<integer>-32</integer>
 		<key>@KERN_RIGHT_quotedblleft</key>
-		<integer>-34</integer>
+		<integer>-4</integer>
 		<key>@KERN_RIGHT_quotedblright</key>
-		<integer>-35</integer>
+		<integer>-4</integer>
 		<key>@KERN_RIGHT_two</key>
-		<integer>-80</integer>
+		<integer>-48</integer>
 		<key>ampersand</key>
-		<integer>-14</integer>
+		<integer>18</integer>
 		<key>eight</key>
-		<integer>-224</integer>
+		<integer>-128</integer>
 		<key>five</key>
-		<integer>-144</integer>
+		<integer>-112</integer>
 		<key>four</key>
-		<integer>-144</integer>
+		<integer>-64</integer>
 		<key>four.1</key>
-		<integer>-144</integer>
+		<integer>-112</integer>
 		<key>j</key>
-		<integer>-160</integer>
+		<integer>-128</integer>
 		<key>nine</key>
-		<integer>-144</integer>
+		<integer>-64</integer>
 		<key>nine.1</key>
-		<integer>-144</integer>
-		<key>one</key>
 		<integer>-112</integer>
+		<key>one</key>
+		<integer>-80</integer>
 		<key>seven</key>
-		<integer>-128</integer>
+		<integer>-96</integer>
 		<key>six</key>
-		<integer>-112</integer>
+		<integer>-80</integer>
 		<key>six.1</key>
-		<integer>-112</integer>
+		<integer>-80</integer>
 		<key>three</key>
-		<integer>-160</integer>
+		<integer>-64</integer>
 	</dict>
 	<key>percent</key>
 	<dict>
@@ -6234,7 +6234,7 @@
 		<key>decyrillic</key>
 		<integer>-68</integer>
 		<key>eight</key>
-		<integer>-131</integer>
+		<integer>-99</integer>
 		<key>ereversedcyrillic</key>
 		<integer>-13</integer>
 		<key>five</key>
diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist
index f7bf1212a..84c350fd2 100644
--- a/src/Inter-UI-Black.ufo/lib.plist
+++ b/src/Inter-UI-Black.ufo/lib.plist
@@ -483,7 +483,9 @@
 				<string>zero.slash</string>
 				<string>zero.tnum.slash</string>
 				<string>one</string>
+				<string>one.1</string>
 				<string>one.tnum</string>
+				<string>one.tnum.1</string>
 				<string>two</string>
 				<string>two.tnum</string>
 				<string>three</string>
@@ -500,7 +502,9 @@
 				<string>seven</string>
 				<string>seven.tnum</string>
 				<string>eight</string>
+				<string>eight.tnum</string>
 				<string>nine</string>
+				<string>nine.tnum</string>
 				<string>nine.1</string>
 				<string>nine.tnum.1</string>
 				<string>ampersand</string>
@@ -1943,7 +1947,9 @@
 		<string>zero.slash</string>
 		<string>zero.tnum.slash</string>
 		<string>one</string>
+		<string>one.1</string>
 		<string>one.tnum</string>
+		<string>one.tnum.1</string>
 		<string>two</string>
 		<string>two.tnum</string>
 		<string>three</string>
@@ -1960,7 +1966,9 @@
 		<string>seven</string>
 		<string>seven.tnum</string>
 		<string>eight</string>
+		<string>eight.tnum</string>
 		<string>nine</string>
+		<string>nine.tnum</string>
 		<string>nine.1</string>
 		<string>nine.tnum.1</string>
 		<string>ampersand</string>
diff --git a/src/Inter-UI-Regular.ufo/features.fea b/src/Inter-UI-Regular.ufo/features.fea
index e7b46d1d1..6211ea782 100644
--- a/src/Inter-UI-Regular.ufo/features.fea
+++ b/src/Inter-UI-Regular.ufo/features.fea
@@ -2,12 +2,12 @@ include(../features.fea);
 
 @TNUM_L = [
   one two seven
-  four.1 six.1 nine.1
+  one.1 four.1 six.1 nine.1
   period comma
 ];
 @TNUM_R = [
   one.tnum two.tnum seven.tnum
-  four.tnum.1 six.tnum.1 nine.tnum.1
+  one.tnum.1 four.tnum.1 six.tnum.1 nine.tnum.1
   period.tnum comma.tnum
 ];
 
diff --git a/src/Inter-UI-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
index 8a6b32cc7..72c5b4399 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
@@ -1304,10 +1304,14 @@
 	<string>omegatitlocyrillic.glif</string>
 	<key>one</key>
 	<string>one.glif</string>
+	<key>one.1</key>
+	<string>one.1.glif</string>
 	<key>one.sup</key>
 	<string>one.sup.glif</string>
 	<key>one.tnum</key>
 	<string>one.tnum.glif</string>
+	<key>one.tnum.1</key>
+	<string>one.tnum.1.glif</string>
 	<key>onedotleader</key>
 	<string>onedotleader.glif</string>
 	<key>oneeighth</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/one.1.glif b/src/Inter-UI-Regular.ufo/glyphs/one.1.glif
new file mode 100644
index 000000000..22510e312
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/one.1.glif
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="one.1" format="1">
+  <advance width="1280"/>
+  <outline>
+    <contour>
+      <point x="876" y="2048" type="line"/>
+      <point x="668" y="2048" type="line"/>
+      <point x="644" y="2024"/>
+      <point x="512" y="1744"/>
+      <point x="192" y="1744" type="curve"/>
+      <point x="192" y="1536" type="line"/>
+      <point x="428" y="1536"/>
+      <point x="596" y="1632"/>
+      <point x="624" y="1688" type="curve"/>
+      <point x="640" y="1688" type="line"/>
+      <point x="640" y="0" type="line"/>
+      <point x="876" y="0" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.8029983485</real>
+        <real>0.9647658846</real>
+        <real>0.7954395628</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/one.glif b/src/Inter-UI-Regular.ufo/glyphs/one.glif
index a62fd3ab0..d6b92f346 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/one.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/one.glif
@@ -4,13 +4,14 @@
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="876" y="2048" type="line"/>
-      <point x="836" y="2048" type="line"/>
-      <point x="128" y="1748" type="line"/>
-      <point x="128" y="1504" type="line"/>
-      <point x="640" y="1716" type="line"/>
-      <point x="640" y="0" type="line"/>
-      <point x="876" y="0" type="line"/>
+      <point x="876.0" y="2048.0" type="line"/>
+      <point x="640" y="2048" type="line"/>
+      <point x="128.0" y="1748.0" type="line"/>
+      <point x="232" y="1564" type="line"/>
+      <point x="628" y="1796" type="line"/>
+      <point x="640" y="1796" type="line"/>
+      <point x="640.0" y="0.0" type="line"/>
+      <point x="876.0" y="0.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/one.tnum.1.glif b/src/Inter-UI-Regular.ufo/glyphs/one.tnum.1.glif
new file mode 100644
index 000000000..3d9e5e534
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/one.tnum.1.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="one.tnum.1" format="1">
+  <advance width="1664"/>
+  <outline>
+    <contour>
+      <point x="384" y="0" type="line"/>
+      <point x="1436" y="0" type="line"/>
+      <point x="1436" y="220" type="line"/>
+      <point x="384" y="220" type="line"/>
+    </contour>
+    <component base="one.1" xOffset="192"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9230863776848417</real>
+        <real>0.9647658846</real>
+        <real>0.7857136537221083</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/one.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/one.tnum.glif
index 53a796217..a476b02a3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/one.tnum.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/one.tnum.glif
@@ -3,12 +3,12 @@
   <advance width="1664"/>
   <outline>
     <contour>
-      <point x="272" y="0" type="line"/>
-      <point x="1472" y="0" type="line"/>
-      <point x="1472" y="220" type="line"/>
-      <point x="272" y="220" type="line"/>
+      <point x="384" y="0" type="line"/>
+      <point x="1436" y="0" type="line"/>
+      <point x="1436" y="220" type="line"/>
+      <point x="384" y="220" type="line"/>
     </contour>
-    <component base="one" xOffset="140"/>
+    <component base="one" xOffset="192"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index 752e4ca98..872d57e8d 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -1527,7 +1527,7 @@
 		<key>@KERN_RIGHT_t</key>
 		<integer>-16</integer>
 		<key>@KERN_RIGHT_v</key>
-		<integer>-38</integer>
+		<integer>-64</integer>
 		<key>@KERN_RIGHT_w</key>
 		<integer>-69</integer>
 		<key>one</key>
@@ -1561,7 +1561,7 @@
 		<key>@KERN_RIGHT_quotedblleft</key>
 		<integer>-83</integer>
 		<key>@KERN_RIGHT_v</key>
-		<integer>-24</integer>
+		<integer>-48</integer>
 		<key>@KERN_RIGHT_w</key>
 		<integer>-55</integer>
 		<key>@KERN_RIGHT_x</key>
@@ -3389,7 +3389,7 @@
 		<key>@KERN_RIGHT_approxequal</key>
 		<integer>-110</integer>
 		<key>@KERN_RIGHT_c</key>
-		<integer>-56</integer>
+		<integer>-52</integer>
 		<key>@KERN_RIGHT_comma</key>
 		<integer>-206</integer>
 		<key>@KERN_RIGHT_divide</key>
@@ -3888,6 +3888,13 @@
 		<key>asterisk.case</key>
 		<integer>-32</integer>
 	</dict>
+	<key>a</key>
+	<dict>
+		<key>v</key>
+		<integer>-96</integer>
+		<key>y</key>
+		<integer>-80</integer>
+	</dict>
 	<key>afii10018</key>
 	<dict>
 		<key>@KERN_RIGHT_Djecyrillic</key>
@@ -4741,6 +4748,8 @@
 		<integer>-64</integer>
 		<key>seven</key>
 		<integer>-103</integer>
+		<key>six.1</key>
+		<integer>-176</integer>
 		<key>slash</key>
 		<integer>-48</integer>
 		<key>three</key>
@@ -5147,7 +5156,7 @@
 		<key>backslash</key>
 		<integer>40</integer>
 		<key>nine.1</key>
-		<integer>-80</integer>
+		<integer>-64</integer>
 		<key>seven</key>
 		<integer>-112</integer>
 		<key>underscore</key>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index 07811c05a..37eb9ac55 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.ufo/lib.plist
@@ -689,7 +689,9 @@
 				<string>zero</string>
 				<string>zero.slash</string>
 				<string>one</string>
+				<string>one.1</string>
 				<string>one.tnum</string>
+				<string>one.tnum.1</string>
 				<string>two</string>
 				<string>two.tnum</string>
 				<string>twostroke</string>
@@ -2145,7 +2147,9 @@
 		<string>zero</string>
 		<string>zero.slash</string>
 		<string>one</string>
+		<string>one.1</string>
 		<string>one.tnum</string>
+		<string>one.tnum.1</string>
 		<string>two</string>
 		<string>two.tnum</string>
 		<string>twostroke</string>
diff --git a/src/features.fea b/src/features.fea
index 0d867fe28..f63fd6c3c 100644
--- a/src/features.fea
+++ b/src/features.fea
@@ -887,6 +887,7 @@ feature calt {
 
 # Stylistic set 1: open digits
 feature ss01 {
+  sub one by one.1;
   sub four by four.1;
   sub six  by six.1;
   sub nine by nine.1;
diff --git a/src/glyphorder.txt b/src/glyphorder.txt
index 04335e2ef..6e6c2269c 100644
--- a/src/glyphorder.txt
+++ b/src/glyphorder.txt
@@ -373,7 +373,9 @@ zero.tnum
 zero.slash
 zero.tnum.slash
 one
+one.1
 one.tnum
+one.tnum.1
 two
 two.tnum
 twostroke
@@ -391,7 +393,9 @@ six.tnum.1
 seven
 seven.tnum
 eight
+eight.tnum
 nine
+nine.tnum
 nine.1
 nine.tnum.1
 ampersand