diff --git a/src/Inter-UI-Black.ufo/features.fea b/src/Inter-UI-Black.ufo/features.fea index c1a3a4541..020cf69a1 100644 --- a/src/Inter-UI-Black.ufo/features.fea +++ b/src/Inter-UI-Black.ufo/features.fea @@ -1,21 +1 @@ include(../features.fea); - -@TNUM_L = [ - 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 eight.tnum nine.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; - sub zero.tnum by zero.tnum.slash; -} zero; diff --git a/src/Inter-UI-Black.ufo/glyphs/contents.plist b/src/Inter-UI-Black.ufo/glyphs/contents.plist index 50caf4a0b..e93bdcc53 100644 --- a/src/Inter-UI-Black.ufo/glyphs/contents.plist +++ b/src/Inter-UI-Black.ufo/glyphs/contents.plist @@ -938,6 +938,8 @@ four.frac.glif four.sup four.sup.glif + four.tnum + four.tnum.glif four.tnum.1 four.tnum.1.glif fourroman diff --git a/src/Inter-UI-Black.ufo/glyphs/four.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/four.tnum.glif new file mode 100644 index 000000000..de8b7f417 --- /dev/null +++ b/src/Inter-UI-Black.ufo/glyphs/four.tnum.glif @@ -0,0 +1,18 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9230863777 + 0.9647658846 + 0.7857136537 + 1.0 + + + + diff --git a/src/Inter-UI-Black.ufo/glyphs/zero.tnum.slash.glif b/src/Inter-UI-Black.ufo/glyphs/zero.tnum.slash.glif index 56e6016e7..2a47a3770 100644 --- a/src/Inter-UI-Black.ufo/glyphs/zero.tnum.slash.glif +++ b/src/Inter-UI-Black.ufo/glyphs/zero.tnum.slash.glif @@ -2,13 +2,7 @@ - - - - - - - + diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist index 4dbb1b8ee..1d1ab5c2e 100644 --- a/src/Inter-UI-Black.ufo/lib.plist +++ b/src/Inter-UI-Black.ufo/lib.plist @@ -511,6 +511,7 @@ three.tnum four four.1 + four.tnum four.tnum.1 five five.tnum @@ -1828,6 +1829,7 @@ three.tnum four four.1 + four.tnum four.tnum.1 five five.tnum 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 @@ eight.frac.glif eight.sup eight.sup.glif + eight.tnum + eight.tnum.glif eightroman eightroman.glif eightsub @@ -916,6 +918,8 @@ five.frac.glif five.sup five.sup.glif + five.tnum + five.tnum.glif fiveeighths fiveeighths.glif fiveroman @@ -934,6 +938,8 @@ four.frac.glif four.sup four.sup.glif + four.tnum + four.tnum.glif four.tnum.1 four.tnum.1.glif fourroman @@ -1254,6 +1260,8 @@ nine.frac.glif nine.sup nine.sup.glif + nine.tnum + nine.tnum.glif nine.tnum.1 nine.tnum.1.glif nineinferior @@ -1640,6 +1648,8 @@ six.frac.glif six.sup six.sup.glif + six.tnum + six.tnum.glif six.tnum.1 six.tnum.1.glif sixinferior @@ -1724,6 +1734,8 @@ three.glif three.sup three.sup.glif + three.tnum + three.tnum.glif threeeighths threeeighths.glif threequarters @@ -2586,6 +2598,10 @@ zero.slash.glif zero.sup zero.sup.glif + zero.tnum + zero.tnum.glif + zero.tnum.slash + zero.tnum.slash.glif zerosub zerosub.glif zerosuperior 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 @@ - - - - - - - - - - - - + + + + + + + + + + + + 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9058 + 0.9634 + 0.7395 + 1.0 + + + + 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9058 + 0.9634 + 0.7395 + 1.0 + + + + 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9058 + 0.9634 + 0.7395 + 1.0 + + + + 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9058 + 0.9634 + 0.7395 + 1.0 + + + + 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 @@ com.typemytype.robofont.mark - 0.9230863776848417 + 0.9230863777 0.9647658846 - 0.7857136537221083 + 0.7857136537 1.0 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9058 + 0.9634 + 0.7395 + 1.0 + + + + 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9230863777 + 0.9647658846 + 0.7857136537 + 1.0 + + + + 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9230863777 + 0.9647658846 + 0.7857136537 + 1.0 + + + + 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 @@ + + + + + + + + + com.typemytype.robofont.mark + + 0.9230863777 + 0.9647658846 + 0.7857136537 + 1.0 + + + + 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 @@ 256 one 128 - seven.tnum - 256 infinity @@ -5291,11 +5289,6 @@ zeta -137 - seven.tnum - - idieresis - 256 - sigma @KERN_RIGHT_Alphagreek 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 @@ lari zero zero.slash + zero.tnum + zero.tnum.slash one one.1 one.tnum @@ -713,19 +715,25 @@ two.tnum twostroke three + three.tnum four four.1 + four.tnum four.tnum.1 five + five.tnum Tonefive six six.1 + six.tnum six.tnum.1 seven seven.tnum eight + eight.tnum nine nine.1 + nine.tnum nine.tnum.1 ampersand exclam @@ -2016,6 +2024,8 @@ lari zero zero.slash + zero.tnum + zero.tnum.slash one one.1 one.tnum @@ -2024,19 +2034,25 @@ two.tnum twostroke three + three.tnum four four.1 + four.tnum four.tnum.1 five + five.tnum Tonefive six six.1 + six.tnum six.tnum.1 seven seven.tnum eight + eight.tnum nine nine.1 + nine.tnum nine.tnum.1 ampersand exclam diff --git a/src/features.fea b/src/features.fea index b8eeee667..be758f468 100644 --- a/src/features.fea +++ b/src/features.fea @@ -626,6 +626,30 @@ feature locl { } locl; +@TNUM_L = [ + zero one two three four 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 four.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 +]; + +feature tnum { + sub @TNUM_L by @TNUM_R; +} tnum; + + +feature zero { + sub zero by zero.slash; + sub zero.tnum by zero.tnum.slash; +} zero; + + feature frac { # Fractions # Latin lookup frac_1 { diff --git a/src/glyphorder.txt b/src/glyphorder.txt index bfd47561a..5ca2ad4c0 100644 --- a/src/glyphorder.txt +++ b/src/glyphorder.txt @@ -386,8 +386,8 @@ manat rupee lari zero -zero.tnum zero.slash +zero.tnum zero.tnum.slash one one.1 @@ -400,6 +400,7 @@ three three.tnum four four.1 +four.tnum four.tnum.1 five five.tnum @@ -413,8 +414,8 @@ seven.tnum eight eight.tnum nine -nine.tnum nine.1 +nine.tnum nine.tnum.1 ampersand exclam