Adds tabular numbers. Closes #10

docs/lab/index.html

@@ -85,6 +85,17 @@ FFFFFF  000000  FF00  4296DE
 3200  9000  198.3  5300
 -0 -1 -2 -3 -4 -5 -6 -7 -8 -9  +0 +1 +2 +3 +4 +5 +6 +7 +8 +9
 
+000000000000|
+111111111111|
+222222222222|
+333333333333|
+444444444444|
+555555555555|
+666666666666|
+777777777777|
+888888888888|
+999999999999|
+
 00102030405060708090
 10112131415161718191
 20212232425262728292

misc/gen-tnum.py

@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+# encoding: utf8
+from __future__ import print_function
+import os, sys
+from argparse import ArgumentParser
+from robofab.objects.objectsRF import OpenFont
+from math import ceil, floor
+
+dryRun = False
+numNames = [
+  'zero','one','two','three','four','five','six','seven','eight','nine'
+]
+
+
+def main():
+  argparser = ArgumentParser(
+    description='Generate tabular number glyphs from regular number glyphs')
+
+  argparser.add_argument(
+    '-dry', dest='dryRun', action='store_const', const=True, default=False,
+    help='Do not modify anything, but instead just print what would happen.')
+
+  argparser.add_argument(
+    'fontPaths', metavar='<ufofile>', type=str, nargs='+', help='UFO fonts')
+
+  args = argparser.parse_args()
+  dryRun = args.dryRun
+
+  # Strip trailing slashes from font paths and iterate
+  for fontPath in [s.rstrip('/ ') for s in args.fontPaths]:
+    fontName = os.path.basename(fontPath)
+    font = OpenFont(fontPath)
+
+    # Find widest glyph
+    width = 0
+    for name in numNames:
+      g = font[name]
+      width = max(width, g.width)
+
+    print('[%s] tnums width:' % fontName, width)
+
+    # Create tnum glyphs
+    for name in numNames:
+      g = font[name]
+
+      tnum = font.newGlyph(name + '.tnum')
+      tnum.width = width
+      print('[%s] gen' % fontName, tnum.name)
+
+      # calculate component x-offset
+      xoffs = 0
+      if g.width != width:
+        # center shape, ignoring existing margins
+        # xMin, yMin, xMax, yMax = g.box
+        # graphicWidth = xMax - xMin
+        # leftMargin = round((width - graphicWidth) / 2)
+        # xoffs = leftMargin - g.leftMargin
+
+        # adjust margins
+        widthDelta = width - g.width
+        leftMargin  = g.leftMargin + int(floor(widthDelta / 2))
+        rightMargin = g.rightMargin + int(ceil(widthDelta / 2))
+        xoffs = leftMargin - g.leftMargin
+
+      tnum.appendComponent(name, (xoffs, 0))
+
+    if dryRun:
+      print('[%s] save [dry run]' % fontName)
+    else:
+      print('[%s] save' % fontName)
+      font.save()
+
+
+if __name__ == '__main__':
+  main()

src/Interface-Bold.ufo/glyphs/DZcaron_.glif

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dzcaron" format="1">
+<glyph name="Dzcaron_" format="1">
   <advance width="3328"/>
   <unicode hex="01C5"/>
   <outline>

src/Interface-Bold.ufo/glyphs/contents.plist

@@ -36,8 +36,6 @@
 	<string>D_.glif</string>
 	<key>D.cn</key>
 	<string>D_.cn.glif</string>
-	<key>DZcaron</key>
-	<string>DZcaron_.glif</string>
 	<key>Dbar1</key>
 	<string>Dbar1_.glif</string>
 	<key>Delta</key>
@@ -48,7 +46,7 @@
 	<string>Digamma_.glif</string>
 	<key>Dtopbar</key>
 	<string>Dtopbar_.glif</string>
-	<key>Dzcaron</key>
+	<key>Dzcaron_</key>
 	<string>Dzcaron_.glif</string>
 	<key>Dzeabkhasiancyrillic</key>
 	<string>Dzeabkhasiancyrillic_.glif</string>
@@ -754,6 +752,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>
@@ -874,6 +874,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>
@@ -890,6 +892,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>fourroman</key>
 	<string>fourroman.glif</string>
 	<key>foursub</key>
@@ -1204,6 +1208,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>nineinferior</key>
 	<string>nineinferior.glif</string>
 	<key>nineroman</key>
@@ -1258,6 +1264,8 @@
 	<string>one.glif</string>
 	<key>one.sup</key>
 	<string>one.sup.glif</string>
+	<key>one.tnum</key>
+	<string>one.tnum.glif</string>
 	<key>onedotleader</key>
 	<string>onedotleader.glif</string>
 	<key>oneeighth</key>
@@ -1550,6 +1558,8 @@
 	<string>seven.frac.glif</string>
 	<key>seven.sup</key>
 	<string>seven.sup.glif</string>
+	<key>seven.tnum</key>
+	<string>seven.tnum.glif</string>
 	<key>seveneighths</key>
 	<string>seveneighths.glif</string>
 	<key>sevenroman</key>
@@ -1574,6 +1584,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>sixinferior</key>
 	<string>sixinferior.glif</string>
 	<key>sixroman</key>
@@ -1658,6 +1670,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>
@@ -1748,6 +1762,8 @@
 	<string>two.glif</string>
 	<key>two.sup</key>
 	<string>two.sup.glif</string>
+	<key>two.tnum</key>
+	<string>two.tnum.glif</string>
 	<key>twodotleader</key>
 	<string>twodotleader.glif</string>
 	<key>tworoman</key>
@@ -4332,6 +4348,8 @@
 	<string>zero.frac.glif</string>
 	<key>zero.sup</key>
 	<string>zero.sup.glif</string>
+	<key>zero.tnum</key>
+	<string>zero.tnum.glif</string>
 	<key>zerosub</key>
 	<string>zerosub.glif</string>
 	<key>zerosuperior</key>

src/Interface-Bold.ufo/glyphs/eight.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="eight.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="eight"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/five.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="five.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="five" xOffset="64"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/four.glif

@@ -5,18 +5,18 @@
   <outline>
     <contour>
       <point x="1664" y="784" type="line"/>
-      <point x="512" y="784" type="line"/>
+      <point x="544" y="784" type="line"/>
-      <point x="868" y="1352" type="line"/>
+      <point x="900" y="1352" type="line"/>
-      <point x="1248" y="2004" type="line"/>
+      <point x="1280" y="2004" type="line"/>
-      <point x="896" y="2004" type="line"/>
+      <point x="900" y="2004" type="line"/>
       <point x="84" y="708" type="line"/>
       <point x="84" y="400" type="line"/>
       <point x="1664" y="400" type="line"/>
     </contour>
     <contour>
       <point x="1360" y="2004" type="line"/>
-      <point x="896" y="2004" type="line"/>
+      <point x="948" y="2004" type="line"/>
-      <point x="896" y="0" type="line"/>
+      <point x="948" y="0" type="line"/>
       <point x="1360" y="0" type="line"/>
     </contour>
   </outline>

src/Interface-Bold.ufo/glyphs/four.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="four.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="four"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/nine.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="nine.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="nine"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/one.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="one.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="one" xOffset="-4"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/seven.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="seven.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="seven" xOffset="64"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/six.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="six.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="six" xOffset="64.0"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/three.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="three.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="three" xOffset="64"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/two.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="two.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="two" xOffset="64"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/glyphs/zero.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="zero.tnum" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="zero" xOffset="64"/>
+  </outline>
+</glyph>

src/Interface-Bold.ufo/groups.plist

@@ -608,7 +608,7 @@
 	</array>
 	<key>@KERN_LEFT_u01C5</key>
 	<array>
-		<string>Dzcaron</string>
+		<string>Dzcaron_</string>
 		<string>dzcaron</string>
 		<string>z</string>
 		<string>zacute</string>
@@ -687,7 +687,7 @@
 		<string>F</string>
 		<string>N</string>
 		<string>R</string>
-		<string>Dzcaron</string>
+		<string>Dzcaron_</string>
 		<string>Itildebelow</string>
 		<string>E</string>
 		<string>Thorn</string>

src/Interface-Bold.ufo/lib.plist

@@ -444,7 +444,7 @@
 				<string>dzeabkhasiancyrillic</string>
 				<string>izhitsacyrillic</string>
 				<string>dz</string>
-				<string>Dzcaron</string>
+				<string>Dzcaron_</string>
 				<string>dzcaron</string>
 				<string>germandbls</string>
 				<string>dotlessi</string>
@@ -487,6 +487,16 @@
 				<string>seven</string>
 				<string>eight</string>
 				<string>nine</string>
+				<string>zero.tnum</string>
+				<string>one.tnum</string>
+				<string>two.tnum</string>
+				<string>three.tnum</string>
+				<string>four.tnum</string>
+				<string>five.tnum</string>
+				<string>six.tnum</string>
+				<string>seven.tnum</string>
+				<string>eight.tnum</string>
+				<string>nine.tnum</string>
 				<string>ampersand</string>
 				<string>exclam</string>
 				<string>exclamdown</string>
@@ -1311,7 +1321,6 @@
 				<string>uni02E8_uni02E7_uni02E9</string>
 				<string>uni02E8_uni02E7_uni02E8</string>
 				<string>shindagesh</string>
-				<string>N.unic</string>
 				<string>uni034B</string>
 				<string>uni034C</string>
 				<string>uni034A</string>
@@ -1354,12 +1363,10 @@
 				<string>Fturn</string>
 				<string>uni023F</string>
 				<string>p.cn</string>
-				<string>f_f</string>
 				<string>uni023E</string>
 				<string>uni023B</string>
 				<string>uni023C</string>
 				<string>uni023A</string>
-				<string>f_l</string>
 				<string>uniA685</string>
 				<string>uniA686</string>
 				<string>uniA687</string>
@@ -1384,7 +1391,6 @@
 				<string>breveacutecomb</string>
 				<string>uni2C69</string>
 				<string>uni2C66</string>
-				<string>U.unic</string>
 				<string>mhook</string>
 				<string>uni2C67</string>
 				<string>uni0500</string>
@@ -1400,7 +1406,6 @@
 				<string>rturn</string>
 				<string>referencemark</string>
 				<string>Ghook</string>
-				<string>A.unic</string>
 				<string>overscorenosp</string>
 				<string>breveinvsubnosp_uni1ABD</string>
 				<string>commaaboverightcomb</string>
@@ -1653,7 +1658,6 @@
 				<string>uniE001</string>
 				<string>uniAB49</string>
 				<string>Nhook</string>
-				<string>fi</string>
 				<string>tildemacroncomb.lc</string>
 				<string>response</string>
 				<string>iota1</string>
@@ -1954,7 +1958,6 @@
 				<string>uniA76B</string>
 				<string>eshshortrev</string>
 				<string>b.cn</string>
-				<string>M.unic</string>
 				<string>uni1D7C</string>
 				<string>uni1D7B</string>
 				<string>uni1D7A</string>
@@ -2048,7 +2051,6 @@
 				<string>iotasubnosp</string>
 				<string>dieresisgravecomb</string>
 				<string>tildemacroncomb</string>
-				<string>E.unic</string>
 				<string>uni0221</string>
 				<string>gamma1</string>
 				<string>uniA7AB</string>
@@ -2169,9 +2171,7 @@
 				<string>elevenroman</string>
 				<string>lambdabar</string>
 				<string>uniA677</string>
-				<string>f_f_i</string>
 				<string>uniA671</string>
-				<string>f_f_l</string>
 				<string>uniA767.cn</string>
 				<string>rfishhook</string>
 				<string>uniA7A7</string>
@@ -2395,7 +2395,6 @@
 				<string>uniE003</string>
 				<string>placeofinterestsign</string>
 				<string>.notdef</string>
-				<string>Dzcaron</string>
 			</array>
 			<key>type</key>
 			<string>glyphList</string>
@@ -2637,7 +2636,7 @@
 		<string>dzeabkhasiancyrillic</string>
 		<string>izhitsacyrillic</string>
 		<string>dz</string>
-		<string>Dzcaron</string>
+		<string>Dzcaron_</string>
 		<string>dzcaron</string>
 		<string>germandbls</string>
 		<string>dotlessi</string>
@@ -2680,6 +2679,16 @@
 		<string>seven</string>
 		<string>eight</string>
 		<string>nine</string>
+		<string>zero.tnum</string>
+		<string>one.tnum</string>
+		<string>two.tnum</string>
+		<string>three.tnum</string>
+		<string>four.tnum</string>
+		<string>five.tnum</string>
+		<string>six.tnum</string>
+		<string>seven.tnum</string>
+		<string>eight.tnum</string>
+		<string>nine.tnum</string>
 		<string>ampersand</string>
 		<string>exclam</string>
 		<string>exclamdown</string>
@@ -3504,7 +3513,6 @@
 		<string>uni02E8_uni02E7_uni02E9</string>
 		<string>uni02E8_uni02E7_uni02E8</string>
 		<string>shindagesh</string>
-		<string>N.unic</string>
 		<string>uni034B</string>
 		<string>uni034C</string>
 		<string>uni034A</string>
@@ -3547,12 +3555,10 @@
 		<string>Fturn</string>
 		<string>uni023F</string>
 		<string>p.cn</string>
-		<string>f_f</string>
 		<string>uni023E</string>
 		<string>uni023B</string>
 		<string>uni023C</string>
 		<string>uni023A</string>
-		<string>f_l</string>
 		<string>uniA685</string>
 		<string>uniA686</string>
 		<string>uniA687</string>
@@ -3577,7 +3583,6 @@
 		<string>breveacutecomb</string>
 		<string>uni2C69</string>
 		<string>uni2C66</string>
-		<string>U.unic</string>
 		<string>mhook</string>
 		<string>uni2C67</string>
 		<string>uni0500</string>
@@ -3593,7 +3598,6 @@
 		<string>rturn</string>
 		<string>referencemark</string>
 		<string>Ghook</string>
-		<string>A.unic</string>
 		<string>overscorenosp</string>
 		<string>breveinvsubnosp_uni1ABD</string>
 		<string>commaaboverightcomb</string>
@@ -3846,7 +3850,6 @@
 		<string>uniE001</string>
 		<string>uniAB49</string>
 		<string>Nhook</string>
-		<string>fi</string>
 		<string>tildemacroncomb.lc</string>
 		<string>response</string>
 		<string>iota1</string>
@@ -4147,7 +4150,6 @@
 		<string>uniA76B</string>
 		<string>eshshortrev</string>
 		<string>b.cn</string>
-		<string>M.unic</string>
 		<string>uni1D7C</string>
 		<string>uni1D7B</string>
 		<string>uni1D7A</string>
@@ -4241,7 +4243,6 @@
 		<string>iotasubnosp</string>
 		<string>dieresisgravecomb</string>
 		<string>tildemacroncomb</string>
-		<string>E.unic</string>
 		<string>uni0221</string>
 		<string>gamma1</string>
 		<string>uniA7AB</string>
@@ -4362,9 +4363,7 @@
 		<string>elevenroman</string>
 		<string>lambdabar</string>
 		<string>uniA677</string>
-		<string>f_f_i</string>
 		<string>uniA671</string>
-		<string>f_f_l</string>
 		<string>uniA767.cn</string>
 		<string>rfishhook</string>
 		<string>uniA7A7</string>
@@ -4588,7 +4587,6 @@
 		<string>uniE003</string>
 		<string>placeofinterestsign</string>
 		<string>.notdef</string>
-		<string>Dzcaron</string>
 	</array>
 </dict>
 </plist>

src/Interface-Regular.ufo/glyphs/DZcaron_.glif

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Dzcaron" format="1">
+<glyph name="Dzcaron_" format="1">
   <advance width="3296"/>
   <unicode hex="01C5"/>
   <outline>

src/Interface-Regular.ufo/glyphs/contents.plist

@@ -36,8 +36,6 @@
 	<string>D_.glif</string>
 	<key>D.cn</key>
 	<string>D_.cn.glif</string>
-	<key>DZcaron</key>
-	<string>DZcaron_.glif</string>
 	<key>Dbar1</key>
 	<string>Dbar1_.glif</string>
 	<key>Delta</key>
@@ -48,7 +46,7 @@
 	<string>Digamma_.glif</string>
 	<key>Dtopbar</key>
 	<string>Dtopbar_.glif</string>
-	<key>Dzcaron</key>
+	<key>Dzcaron_</key>
 	<string>Dzcaron_.glif</string>
 	<key>Dzeabkhasiancyrillic</key>
 	<string>Dzeabkhasiancyrillic_.glif</string>
@@ -754,6 +752,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>
@@ -874,6 +874,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>
@@ -890,6 +892,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>fourroman</key>
 	<string>fourroman.glif</string>
 	<key>foursub</key>
@@ -1204,6 +1208,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>nineinferior</key>
 	<string>nineinferior.glif</string>
 	<key>nineroman</key>
@@ -1258,6 +1264,8 @@
 	<string>one.glif</string>
 	<key>one.sup</key>
 	<string>one.sup.glif</string>
+	<key>one.tnum</key>
+	<string>one.tnum.glif</string>
 	<key>onedotleader</key>
 	<string>onedotleader.glif</string>
 	<key>oneeighth</key>
@@ -1552,6 +1560,8 @@
 	<string>seven.frac.glif</string>
 	<key>seven.sup</key>
 	<string>seven.sup.glif</string>
+	<key>seven.tnum</key>
+	<string>seven.tnum.glif</string>
 	<key>seveneighths</key>
 	<string>seveneighths.glif</string>
 	<key>sevenroman</key>
@@ -1576,6 +1586,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>sixinferior</key>
 	<string>sixinferior.glif</string>
 	<key>sixroman</key>
@@ -1660,6 +1672,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>
@@ -1750,6 +1764,8 @@
 	<string>two.glif</string>
 	<key>two.sup</key>
 	<string>two.sup.glif</string>
+	<key>two.tnum</key>
+	<string>two.tnum.glif</string>
 	<key>twodotleader</key>
 	<string>twodotleader.glif</string>
 	<key>tworoman</key>
@@ -4334,6 +4350,8 @@
 	<string>zero.frac.glif</string>
 	<key>zero.sup</key>
 	<string>zero.sup.glif</string>
+	<key>zero.tnum</key>
+	<string>zero.tnum.glif</string>
 	<key>zerosub</key>
 	<string>zerosub.glif</string>
 	<key>zerosuperior</key>

src/Interface-Regular.ufo/glyphs/eight.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="eight.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="eight"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/five.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="five.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="five"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/four.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="four.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="four"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/nine.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="nine.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="nine"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/one.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="one.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="one" xOffset="140"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/seven.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="seven.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="seven" xOffset="64"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/six.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="six.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="six"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/three.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="three.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="three"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/two.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="two.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="two"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/glyphs/zero.tnum.glif

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="zero.tnum" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="zero"/>
+  </outline>
+</glyph>

src/Interface-Regular.ufo/groups.plist

@@ -608,7 +608,7 @@
 	</array>
 	<key>@KERN_LEFT_u01C5</key>
 	<array>
-		<string>Dzcaron</string>
+		<string>Dzcaron_</string>
 		<string>dzcaron</string>
 		<string>z</string>
 		<string>zacute</string>
@@ -687,7 +687,7 @@
 		<string>F</string>
 		<string>N</string>
 		<string>R</string>
-		<string>Dzcaron</string>
+		<string>Dzcaron_</string>
 		<string>Itildebelow</string>
 		<string>E</string>
 		<string>Thorn</string>

src/Interface-Regular.ufo/lib.plist

@@ -307,7 +307,7 @@
 				<string>B</string>
 				<string>C</string>
 				<string>D</string>
-				<string>Dzcaron</string>
+				<string>Dzcaron_</string>
 				<string>E</string>
 				<string>F</string>
 				<string>G</string>
@@ -574,6 +574,16 @@
 				<string>seven</string>
 				<string>eight</string>
 				<string>nine</string>
+				<string>zero.tnum</string>
+				<string>one.tnum</string>
+				<string>two.tnum</string>
+				<string>three.tnum</string>
+				<string>four.tnum</string>
+				<string>five.tnum</string>
+				<string>six.tnum</string>
+				<string>seven.tnum</string>
+				<string>eight.tnum</string>
+				<string>nine.tnum</string>
 				<string>ampersand</string>
 				<string>exclam</string>
 				<string>exclamdown</string>
@@ -1440,7 +1450,6 @@
 				<string>Fturn</string>
 				<string>uni023F</string>
 				<string>p.cn</string>
-				<string>f_f</string>
 				<string>uni023E</string>
 				<string>uni023B</string>
 				<string>uni023C</string>
@@ -1735,7 +1744,6 @@
 				<string>uni1DCB</string>
 				<string>uni1DCA</string>
 				<string>Nhook</string>
-				<string>fi</string>
 				<string>tildemacroncomb.lc</string>
 				<string>iota1</string>
 				<string>uni02E6_uni02E8</string>
@@ -2492,7 +2500,7 @@
 		<string>B</string>
 		<string>C</string>
 		<string>D</string>
-		<string>Dzcaron</string>
+		<string>Dzcaron_</string>
 		<string>E</string>
 		<string>F</string>
 		<string>G</string>
@@ -2759,6 +2767,16 @@
 		<string>seven</string>
 		<string>eight</string>
 		<string>nine</string>
+		<string>zero.tnum</string>
+		<string>one.tnum</string>
+		<string>two.tnum</string>
+		<string>three.tnum</string>
+		<string>four.tnum</string>
+		<string>five.tnum</string>
+		<string>six.tnum</string>
+		<string>seven.tnum</string>
+		<string>eight.tnum</string>
+		<string>nine.tnum</string>
 		<string>ampersand</string>
 		<string>exclam</string>
 		<string>exclamdown</string>
@@ -3625,7 +3643,6 @@
 		<string>Fturn</string>
 		<string>uni023F</string>
 		<string>p.cn</string>
-		<string>f_f</string>
 		<string>uni023E</string>
 		<string>uni023B</string>
 		<string>uni023C</string>
@@ -3920,7 +3937,6 @@
 		<string>uni1DCB</string>
 		<string>uni1DCA</string>
 		<string>Nhook</string>
-		<string>fi</string>
 		<string>tildemacroncomb.lc</string>
 		<string>iota1</string>
 		<string>uni02E6_uni02E8</string>
@@ -4660,7 +4676,6 @@
 		<string>placeofinterestsign.specz.medium</string>
 		<string>uniE001</string>
 		<string>.notdef</string>
-		<string>DZcaron</string>
 	</array>
 </dict>
 </plist>

src/diacritics.txt

@@ -240,14 +240,6 @@ X+crossbar:cross=uni04FE
 x+crossbar:cross=uni04FF
 epsilon=uni0511
 F+crossbar:cross=franc
-two=two.pnum
-three=three.pnum
-four=four.pnum
-five=five.pnum
-six=six.pnum/20,0
-eight=eight.pnum/20,20
-nine=nine.pnum/0,20
-zero=zero.pnum/20,20
 L_J=LJ
 L_j=Lj
 l_j=lj

src/glyphorder.txt

@@ -272,6 +272,16 @@ six
 seven
 eight
 nine
+zero.tnum
+one.tnum
+two.tnum
+three.tnum
+four.tnum
+five.tnum
+six.tnum
+seven.tnum
+eight.tnum
+nine.tnum
 ampersand
 exclam
 exclamdown
@@ -2173,7 +2183,6 @@ uniE002
 uniE003
 placeofinterestsign.specz.medium
 .notdef
-DZcaron
 N.unic
 f_l
 U.unic