From 7dc293ad6a10acd29db128159cd521d767b67c18 Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Sat, 30 Sep 2017 19:17:13 -0700 Subject: Adds period and comma for tabular numbers feature --- src/Inter-UI-Black.ufo/features.fea | 2 + src/Inter-UI-Black.ufo/glyphs/comma.tnum.glif | 64 ++++++++++++++++++++++++ src/Inter-UI-Black.ufo/glyphs/contents.plist | 4 ++ src/Inter-UI-Black.ufo/glyphs/period.tnum.glif | 60 ++++++++++++++++++++++ src/Inter-UI-Black.ufo/lib.plist | 4 ++ src/Inter-UI-Regular.ufo/features.fea | 12 ++++- src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif | 39 +++++++++++++++ src/Inter-UI-Regular.ufo/glyphs/contents.plist | 4 ++ src/Inter-UI-Regular.ufo/glyphs/period.tnum.glif | 35 +++++++++++++ src/Inter-UI-Regular.ufo/lib.plist | 4 ++ src/glyphorder.txt | 2 + 11 files changed, 228 insertions(+), 2 deletions(-) create mode 100644 src/Inter-UI-Black.ufo/glyphs/comma.tnum.glif create mode 100644 src/Inter-UI-Black.ufo/glyphs/period.tnum.glif create mode 100644 src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif create mode 100644 src/Inter-UI-Regular.ufo/glyphs/period.tnum.glif diff --git a/src/Inter-UI-Black.ufo/features.fea b/src/Inter-UI-Black.ufo/features.fea index e466ff5ff..2a42fb476 100644 --- a/src/Inter-UI-Black.ufo/features.fea +++ b/src/Inter-UI-Black.ufo/features.fea @@ -3,10 +3,12 @@ include(../features.fea); @TNUM_L = [ zero one two three five six seven 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 + period.tnum comma.tnum ]; feature tnum { diff --git a/src/Inter-UI-Black.ufo/glyphs/comma.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/comma.tnum.glif new file mode 100644 index 000000000..83e4da703 --- /dev/null +++ b/src/Inter-UI-Black.ufo/glyphs/comma.tnum.glif @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + com.typemytype.robofont.guides + + + angle + 0.0 + isGlobal + + magnetic + 5 + x + 0.0 + y + 1238.875 + + + angle + 0.0 + isGlobal + + magnetic + 5 + x + 0.0 + y + 763.125 + + + com.typemytype.robofont.mark + + 0.94 + 0.94 + 0.94 + 1.0 + + interface.gridadjust.original + {'width': 737.0, 'leftMargin': 56, 'rightMargin': 175.0} + + + diff --git a/src/Inter-UI-Black.ufo/glyphs/contents.plist b/src/Inter-UI-Black.ufo/glyphs/contents.plist index d1f6c1c7d..202a59405 100644 --- a/src/Inter-UI-Black.ufo/glyphs/contents.plist +++ b/src/Inter-UI-Black.ufo/glyphs/contents.plist @@ -622,6 +622,8 @@ colontriangularmod.glif comma comma.glif + comma.tnum + comma.tnum.glif commaabovecmb commaabovecmb.glif commaaboverightcmb @@ -1380,6 +1382,8 @@ percent.glif period period.glif + period.tnum + period.tnum.glif periodcentered periodcentered.glif perispomenigreekcmb diff --git a/src/Inter-UI-Black.ufo/glyphs/period.tnum.glif b/src/Inter-UI-Black.ufo/glyphs/period.tnum.glif new file mode 100644 index 000000000..61bd0e09c --- /dev/null +++ b/src/Inter-UI-Black.ufo/glyphs/period.tnum.glif @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + com.typemytype.robofont.guides + + + angle + 0.0 + isGlobal + + magnetic + 5 + x + 0.0 + y + 1238.875 + + + angle + 0.0 + isGlobal + + magnetic + 5 + x + 0.0 + y + 763.125 + + + com.typemytype.robofont.mark + + 0.94 + 0.94 + 0.94 + 1.0 + + interface.gridadjust.original + {'width': 842, 'leftMargin': 165, 'rightMargin': 185} + + + diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist index dd5b8f4e9..69f128bcf 100644 --- a/src/Inter-UI-Black.ufo/lib.plist +++ b/src/Inter-UI-Black.ufo/lib.plist @@ -534,7 +534,9 @@ quotedblbase quotesinglbase comma + comma.tnum period + period.tnum ellipsis colon colon.case @@ -2000,7 +2002,9 @@ quotedblbase quotesinglbase comma + comma.tnum period + period.tnum ellipsis colon colon.case diff --git a/src/Inter-UI-Regular.ufo/features.fea b/src/Inter-UI-Regular.ufo/features.fea index 2ac1bc2c7..e7b46d1d1 100644 --- a/src/Inter-UI-Regular.ufo/features.fea +++ b/src/Inter-UI-Regular.ufo/features.fea @@ -1,7 +1,15 @@ include(../features.fea); -@TNUM_L = [one two seven four.1 six.1 nine.1]; -@TNUM_R = [one.tnum two.tnum seven.tnum four.tnum.1 six.tnum.1 nine.tnum.1]; +@TNUM_L = [ + one two seven + 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 + period.tnum comma.tnum +]; feature tnum { sub @TNUM_L by @TNUM_R; diff --git a/src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif new file mode 100644 index 000000000..5f97684d3 --- /dev/null +++ b/src/Inter-UI-Regular.ufo/glyphs/comma.tnum.glif @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + com.typemytype.robofont.mark + + 0.94 + 0.94 + 0.94 + 1.0 + + interface.width-adjustments + + -16 + + + + diff --git a/src/Inter-UI-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist index 6d408d377..719706687 100644 --- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist +++ b/src/Inter-UI-Regular.ufo/glyphs/contents.plist @@ -622,6 +622,8 @@ colontriangularmod.glif comma comma.glif + comma.tnum + comma.tnum.glif commaabovecmb commaabovecmb.glif commaaboverightcmb @@ -1378,6 +1380,8 @@ percent.glif period period.glif + period.tnum + period.tnum.glif periodcentered periodcentered.glif perispomenigreekcmb diff --git a/src/Inter-UI-Regular.ufo/glyphs/period.tnum.glif b/src/Inter-UI-Regular.ufo/glyphs/period.tnum.glif new file mode 100644 index 000000000..ebb2ca7c1 --- /dev/null +++ b/src/Inter-UI-Regular.ufo/glyphs/period.tnum.glif @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + com.typemytype.robofont.mark + + 0.94 + 0.94 + 0.94 + 1.0 + + interface.width-adjustments + + -16 + + + + diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist index dfe900b04..2a6ec0ed7 100644 --- a/src/Inter-UI-Regular.ufo/lib.plist +++ b/src/Inter-UI-Regular.ufo/lib.plist @@ -631,7 +631,9 @@ quotedblbase quotesinglbase comma + comma.tnum period + period.tnum ellipsis colon colon.case @@ -2093,7 +2095,9 @@ quotedblbase quotesinglbase comma + comma.tnum period + period.tnum ellipsis colon colon.case diff --git a/src/glyphorder.txt b/src/glyphorder.txt index 9f1ea9f2f..c9310c9f8 100644 --- a/src/glyphorder.txt +++ b/src/glyphorder.txt @@ -335,7 +335,9 @@ quotedblright quotedblbase quotesinglbase comma +comma.tnum period +period.tnum ellipsis colon colon.case -- cgit v1.2.3