Fixes tabular numbers for medium, bold and black weights. Closes #60

14 files changed, 190 insertions, 40 deletions

diff --git a/src/Inter-UI-Regular.ufo/features.fea b/src/Inter-UI-Regular.ufo/features.fea
index 6211ea782..020cf69a1 100644
--- a/src/Inter-UI-Regular.ufo/features.fea
+++ b/src/Inter-UI-Regular.ufo/features.fea
@@ -1,20 +1 @@
 include(../features.fea);
-
-@TNUM_L = [
-  one two seven
-  one.1 four.1 six.1 nine.1
-  period comma
-];
-@TNUM_R = [
-  one.tnum two.tnum seven.tnum
-  one.tnum.1 four.tnum.1 six.tnum.1 nine.tnum.1
-  period.tnum comma.tnum
-];
-
-feature tnum {
-  sub @TNUM_L by @TNUM_R;
-} tnum;
-
-feature zero {
-  sub zero by zero.slash;
-} zero;
diff --git a/src/Inter-UI-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
index 97e44b151..732a43e70 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
@@ -790,6 +790,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>
@@ -916,6 +918,8 @@
 	<string>five.frac.glif</string>
 	<key>five.sup</key>
 	<string>five.sup.glif</string>
+	<key>five.tnum</key>
+	<string>five.tnum.glif</string>
 	<key>fiveeighths</key>
 	<string>fiveeighths.glif</string>
 	<key>fiveroman</key>
@@ -934,6 +938,8 @@
 	<string>four.frac.glif</string>
 	<key>four.sup</key>
 	<string>four.sup.glif</string>
+	<key>four.tnum</key>
+	<string>four.tnum.glif</string>
 	<key>four.tnum.1</key>
 	<string>four.tnum.1.glif</string>
 	<key>fourroman</key>
@@ -1254,6 +1260,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>
@@ -1640,6 +1648,8 @@
 	<string>six.frac.glif</string>
 	<key>six.sup</key>
 	<string>six.sup.glif</string>
+	<key>six.tnum</key>
+	<string>six.tnum.glif</string>
 	<key>six.tnum.1</key>
 	<string>six.tnum.1.glif</string>
 	<key>sixinferior</key>
@@ -1724,6 +1734,8 @@
 	<string>three.glif</string>
 	<key>three.sup</key>
 	<string>three.sup.glif</string>
+	<key>three.tnum</key>
+	<string>three.tnum.glif</string>
 	<key>threeeighths</key>
 	<string>threeeighths.glif</string>
 	<key>threequarters</key>
@@ -2586,6 +2598,10 @@
 	<string>zero.slash.glif</string>
 	<key>zero.sup</key>
 	<string>zero.sup.glif</string>
+	<key>zero.tnum</key>
+	<string>zero.tnum.glif</string>
+	<key>zero.tnum.slash</key>
+	<string>zero.tnum.slash.glif</string>
 	<key>zerosub</key>
 	<string>zerosub.glif</string>
 	<key>zerosuperior</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/dotaccent.glif b/src/Inter-UI-Regular.ufo/glyphs/dotaccent.glif
index 028929d71..b161d5873 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/dotaccent.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/dotaccent.glif
@@ -4,18 +4,18 @@
   <unicode hex="02D9"/>
   <outline>
     <contour>
-      <point x="332" y="1772" type="curve"/>
-      <point x="436" y="1772"/>
-      <point x="500" y="1844"/>
-      <point x="500" y="1932" type="curve"/>
-      <point x="500" y="2012"/>
-      <point x="436" y="2092"/>
-      <point x="332" y="2092" type="curve"/>
-      <point x="228" y="2092"/>
-      <point x="164" y="2012"/>
-      <point x="164" y="1932" type="curve" smooth="yes"/>
-      <point x="164" y="1844"/>
-      <point x="228" y="1772"/>
+      <point x="332" y="1780" type="curve"/>
+      <point x="436" y="1780"/>
+      <point x="500" y="1852"/>
+      <point x="500" y="1940" type="curve"/>
+      <point x="500" y="2020"/>
+      <point x="436" y="2100"/>
+      <point x="332" y="2100" type="curve"/>
+      <point x="228" y="2100"/>
+      <point x="164" y="2020"/>
+      <point x="164" y="1940" type="curve" smooth="yes"/>
+      <point x="164" y="1852"/>
+      <point x="228" y="1780"/>
     </contour>
     <contour>
       <point x="332" y="1792" type="move" name="_top"/>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/eight.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/eight.tnum.glif
new file mode 100644
index 000000000..12bfd05ec
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/eight.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="eight.tnum" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="eight"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9058</real>
+        <real>0.9634</real>
+        <real>0.7395</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/five.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/five.tnum.glif
new file mode 100644
index 000000000..3ba66aaa1
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/five.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="five.tnum" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="five"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9058</real>
+        <real>0.9634</real>
+        <real>0.7395</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/four.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/four.tnum.glif
new file mode 100644
index 000000000..3da693c1a
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/four.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="four.tnum" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="four"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9058</real>
+        <real>0.9634</real>
+        <real>0.7395</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/nine.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/nine.tnum.glif
new file mode 100644
index 000000000..11c27b1e1
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/nine.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="nine.tnum" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="nine"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9058</real>
+        <real>0.9634</real>
+        <real>0.7395</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 951897a32..d3b97175a 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/one.tnum.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/one.tnum.glif
@@ -14,9 +14,9 @@
     <dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
-        <real>0.9230863776848417</real>
+        <real>0.9230863777</real>
         <real>0.9647658846</real>
-        <real>0.7857136537221083</real>
+        <real>0.7857136537</real>
         <real>1.0</real>
       </array>
     </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/six.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/six.tnum.glif
new file mode 100644
index 000000000..d3475e61a
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/six.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="six.tnum" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="six"/>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.typemytype.robofont.mark</key>
+      <array>
+        <real>0.9058</real>
+        <real>0.9634</real>
+        <real>0.7395</real>
+        <real>1.0</real>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/three.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/three.tnum.glif
new file mode 100644
index 000000000..2b97c03b0
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/three.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="three.tnum" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="three"/>
+  </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-Regular.ufo/glyphs/zero.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.tnum.glif
new file mode 100644
index 000000000..d85e6a0a1
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.tnum.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="zero.tnum" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="zero"/>
+  </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-Regular.ufo/glyphs/zero.tnum.slash.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.tnum.slash.glif
new file mode 100644
index 000000000..9c6e2d4a3
--- /dev/null
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.tnum.slash.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="zero.tnum.slash" format="1">
+  <advance width="1680"/>
+  <outline>
+    <component base="zero.slash"/>
+  </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-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index 0eb5abb6a..c8a744b70 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -4756,8 +4756,6 @@
 		<integer>256</integer>
 		<key>one</key>
 		<integer>128</integer>
-		<key>seven.tnum</key>
-		<integer>256</integer>
 	</dict>
 	<key>infinity</key>
 	<dict>
@@ -5291,11 +5289,6 @@
 		<key>zeta</key>
 		<integer>-137</integer>
 	</dict>
-	<key>seven.tnum</key>
-	<dict>
-		<key>idieresis</key>
-		<integer>256</integer>
-	</dict>
 	<key>sigma</key>
 	<dict>
 		<key>@KERN_RIGHT_Alphagreek</key>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index c4ac34fc8..eb849fc42 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.ufo/lib.plist
@@ -705,6 +705,8 @@
 				<string>lari</string>
 				<string>zero</string>
 				<string>zero.slash</string>
+				<string>zero.tnum</string>
+				<string>zero.tnum.slash</string>
 				<string>one</string>
 				<string>one.1</string>
 				<string>one.tnum</string>
@@ -713,19 +715,25 @@
 				<string>two.tnum</string>
 				<string>twostroke</string>
 				<string>three</string>
+				<string>three.tnum</string>
 				<string>four</string>
 				<string>four.1</string>
+				<string>four.tnum</string>
 				<string>four.tnum.1</string>
 				<string>five</string>
+				<string>five.tnum</string>
 				<string>Tonefive</string>
 				<string>six</string>
 				<string>six.1</string>
+				<string>six.tnum</string>
 				<string>six.tnum.1</string>
 				<string>seven</string>
 				<string>seven.tnum</string>
 				<string>eight</string>
+				<string>eight.tnum</string>
 				<string>nine</string>
 				<string>nine.1</string>
+				<string>nine.tnum</string>
 				<string>nine.tnum.1</string>
 				<string>ampersand</string>
 				<string>exclam</string>
@@ -2016,6 +2024,8 @@
 		<string>lari</string>
 		<string>zero</string>
 		<string>zero.slash</string>
+		<string>zero.tnum</string>
+		<string>zero.tnum.slash</string>
 		<string>one</string>
 		<string>one.1</string>
 		<string>one.tnum</string>
@@ -2024,19 +2034,25 @@
 		<string>two.tnum</string>
 		<string>twostroke</string>
 		<string>three</string>
+		<string>three.tnum</string>
 		<string>four</string>
 		<string>four.1</string>
+		<string>four.tnum</string>
 		<string>four.tnum.1</string>
 		<string>five</string>
+		<string>five.tnum</string>
 		<string>Tonefive</string>
 		<string>six</string>
 		<string>six.1</string>
+		<string>six.tnum</string>
 		<string>six.tnum.1</string>
 		<string>seven</string>
 		<string>seven.tnum</string>
 		<string>eight</string>
+		<string>eight.tnum</string>
 		<string>nine</string>
 		<string>nine.1</string>
+		<string>nine.tnum</string>
 		<string>nine.tnum.1</string>
 		<string>ampersand</string>
 		<string>exclam</string>