diff options
author | Rasmus Andersson <rasmus@notion.se> | 2018-09-28 22:45:43 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2018-10-11 09:38:23 +0300 |
commit | 42f8afe6568c3b0d2cbcb7e412b3c32dd8f80729 (patch) | |
tree | ea4c0932b5b23edcfea68052296c795125c842c2 /src/Inter-UI-Regular.ufo | |
parent | 746d527b8f4bd6b5bc721c51052af98d11fc27c0 (diff) | |
download | inter-42f8afe6568c3b0d2cbcb7e412b3c32dd8f80729.tar.xz |
left-right arrow adjustments and calt refinements for case on left-hand repetition
Diffstat (limited to 'src/Inter-UI-Regular.ufo')
13 files changed, 42 insertions, 196 deletions
diff --git a/src/Inter-UI-Regular.ufo/features.fea b/src/Inter-UI-Regular.ufo/features.fea index 8595a68d9..34c84e1c5 100644 --- a/src/Inter-UI-Regular.ufo/features.fea +++ b/src/Inter-UI-Regular.ufo/features.fea @@ -1024,7 +1024,6 @@ sub leftLongArrow by leftLongArrow.case; sub rightArrow by rightArrow.case; sub rightLongArrow by rightLongArrow.case; sub leftRightArrow by leftRightArrow.case; -sub upDownArrow by upDownArrow.case; sub leftRightLongArrow by leftRightLongArrow.case; } case; @@ -1057,7 +1056,6 @@ feature calt { rightLongArrow leftRightArrow leftRightLongArrow - upDownArrow notequal colon ]; @@ -1093,7 +1091,6 @@ feature calt { rightLongArrow.case leftRightArrow.case leftRightLongArrow.case - upDownArrow.case notequal.case colon.case ]; @@ -1105,23 +1102,19 @@ feature calt { @UC = [ @UC_ROMAN @UC_SET1 exclam question ]; @LC = [ @LC_ROMAN @LC_SET1 ]; -sub [ @UC @CASE_R ] @CASE_L' by @CASE_R; # Z y' -> Z x -> Z x 'y -> Z x x ... -ignore sub @LC @CASE_NONDELIM_L @UC; # e.g. m multiply M -sub @CASE_L' [ @UC @CASE_R ] by @CASE_R; # y' Z -> x Z - -# rule to support left-hand repetition of CASE{L}->{R} [issue #57] -# e.g. /at /at /UC -> /at.case /at /UC -> /at.case /at.case /UC -# Note that we can't look further than 2 glyphs back, since it would break -# cases like /a /braceleft /braceright /asterisk /asterisk /A -sub @CASE_L' @CASE_L [ @CASE_R @UC ] by @CASE_R; +# --------------------------------------------------- # ignore <-NUM e.g. "<-3" ignore sub less [ hyphen hyphen.case endash endash.case emdash emdash.case ] @NUM; + # arrows: <-> sub less hyphen greater by leftRightArrow; sub less hyphen.case greater by leftRightArrow.case; sub less [endash emdash] greater by leftRightLongArrow; sub less [endash.case emdash.case] greater by leftRightLongArrow.case; +sub less hyphen hyphen greater by leftRightLongArrow; +sub less hyphen.case hyphen.case greater by leftRightLongArrow.case; + # arrows: -> sub hyphen greater by rightArrow; sub hyphen.case greater by rightArrow.case; @@ -1133,6 +1126,30 @@ sub less hyphen.case by leftArrow.case; sub less [endash emdash] by leftLongArrow; sub less [endash.case emdash.case] by leftLongArrow.case; +# :-) +sub colon' [hyphen hyphen.case endash endash.case emdash emdash.case] [parenright parenright.case] by colon.case; +sub [colon colon.case] hyphen' [parenright parenright.case] by hyphen.case; +sub [colon colon.case] endash' [parenright parenright.case] by endash.case; +sub [colon colon.case] emdash' [parenright parenright.case] by emdash.case; +sub [colon colon.case] [hyphen hyphen.case endash endash.case emdash emdash.case] parenright' by parenright.case; + +# A foo' -> A foo.case +sub [ @UC @CASE_R ] @CASE_L' by @CASE_R; +ignore sub @LC @CASE_NONDELIM_L @UC; # e.g. m multiply M + +# foo' foo foo foo foo A -> foo.case foo foo foo foo A +# foo' foo foo foo A -> foo.case foo foo foo A +# foo' foo foo A -> foo.case foo foo A +# foo' foo A -> foo.case foo A +# foo' A -> foo.case A +# Note: since we look quite far back, sequences like x{}[]M will case both +# the square brackets next to M _and_ the curly braces to become .case +sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R; +sub @CASE_L' @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R; +sub @CASE_L' @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R; +sub @CASE_L' @CASE_L [ @CASE_R @UC ] by @CASE_R; +sub @CASE_L' [ @UC @CASE_R ] by @CASE_R; + } calt; feature tnum { diff --git a/src/Inter-UI-Regular.ufo/fontinfo.plist b/src/Inter-UI-Regular.ufo/fontinfo.plist index bbdc7104a..4f000304d 100644 --- a/src/Inter-UI-Regular.ufo/fontinfo.plist +++ b/src/Inter-UI-Regular.ufo/fontinfo.plist @@ -68,6 +68,14 @@ <key>y</key> <real>2304.0</real> </dict> + <dict> + <key>angle</key> + <real>0.0</real> + <key>x</key> + <real>2296.0</real> + <key>y</key> + <real>1024.0</real> + </dict> </array> <key>italicAngle</key> <real>-0.0</real> @@ -109,9 +117,9 @@ <key>openTypeNameSampleText</key> <string></string> <key>openTypeNameUniqueID</key> - <string>Inter UI Regular:2018:a2200c6b</string> + <string>Inter UI Regular:2018:06dfba3d</string> <key>openTypeNameVersion</key> - <string>3.0;a2200c6b</string> + <string>3.0;06dfba3d</string> <key>openTypeOS2CodePageRanges</key> <array> <integer>0</integer> diff --git a/src/Inter-UI-Regular.ufo/glyphs.public.background/K_hook.glif b/src/Inter-UI-Regular.ufo/glyphs.public.background/K_hook.glif deleted file mode 100644 index 6f3b463df..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs.public.background/K_hook.glif +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="Khook" format="2"> - <outline> - <component base="K"/> - </outline> -</glyph> diff --git a/src/Inter-UI-Regular.ufo/glyphs.public.background/R_x.glif b/src/Inter-UI-Regular.ufo/glyphs.public.background/R_x.glif deleted file mode 100644 index 74dafda55..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs.public.background/R_x.glif +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="Rx" format="2"> - <outline> - <component base="R"/> - </outline> -</glyph> diff --git a/src/Inter-UI-Regular.ufo/glyphs.public.background/b.glif b/src/Inter-UI-Regular.ufo/glyphs.public.background/b.glif deleted file mode 100644 index ef3b81372..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs.public.background/b.glif +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="b" format="2"> - <outline> - <component base="c" xScale="-1.0" xOffset="1720.0"/> - </outline> -</glyph> diff --git a/src/Inter-UI-Regular.ufo/glyphs.public.background/contents.plist b/src/Inter-UI-Regular.ufo/glyphs.public.background/contents.plist deleted file mode 100644 index 251e2d0ae..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs.public.background/contents.plist +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> - <dict> - <key>G</key> - <string>G_.glif</string> - <key>Khook</key> - <string>K_hook.glif</string> - <key>Omega</key> - <string>O_mega.glif</string> - <key>Rx</key> - <string>R_x.glif</string> - <key>asterisk</key> - <string>asterisk.glif</string> - <key>asterisk.case</key> - <string>asterisk.case.glif</string> - <key>b</key> - <string>b.glif</string> - <key>e</key> - <string>e.glif</string> - <key>four.ss01</key> - <string>four.ss01.glif</string> - <key>interrobang</key> - <string>interrobang.glif</string> - <key>jcrosstail.ccmp</key> - <string>jcrosstail.ccmp.glif</string> - <key>lambda</key> - <string>lambda.glif</string> - <key>pertenthousand</key> - <string>pertenthousand.glif</string> - <key>perthousand</key> - <string>perthousand.glif</string> - <key>six</key> - <string>six.glif</string> - <key>six.dnomf</key> - <string>six.dnomf.glif</string> - <key>six.ss01</key> - <string>six.ss01.glif</string> - <key>three</key> - <string>three.glif</string> - <key>two</key> - <string>two.glif</string> - </dict> -</plist> diff --git a/src/Inter-UI-Regular.ufo/glyphs.public.background/jcrosstail.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs.public.background/jcrosstail.ccmp.glif deleted file mode 100644 index 6fbcda319..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs.public.background/jcrosstail.ccmp.glif +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="jcrosstail.ccmp" format="2"> - <outline> - <component base="j" xOffset="304.0"/> - </outline> -</glyph> diff --git a/src/Inter-UI-Regular.ufo/glyphs.public.background/lambda.glif b/src/Inter-UI-Regular.ufo/glyphs.public.background/lambda.glif deleted file mode 100644 index d46c1376d..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs.public.background/lambda.glif +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="lambda" format="2"> - <outline> - <component base="y" yScale="-1.0" xOffset="-16.0" yOffset="1492.0"/> - </outline> -</glyph> diff --git a/src/Inter-UI-Regular.ufo/glyphs.public.background/layerinfo.plist b/src/Inter-UI-Regular.ufo/glyphs.public.background/layerinfo.plist deleted file mode 100644 index 564c7a6bb..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs.public.background/layerinfo.plist +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> - <dict/> -</plist> diff --git a/src/Inter-UI-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist index 4876b88ff..fda28c9ed 100644 --- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist +++ b/src/Inter-UI-Regular.ufo/glyphs/contents.plist @@ -4350,8 +4350,6 @@ <string>upA_rrow.glif</string> <key>upDownArrow</key> <string>upD_ownA_rrow.glif</string> - <key>upDownArrow.case</key> - <string>upD_ownA_rrow.case.glif</string> <key>upsilon</key> <string>upsilon.glif</string> <key>upsilondieresis</key> diff --git a/src/Inter-UI-Regular.ufo/glyphs/upD_ownA_rrow.case.glif b/src/Inter-UI-Regular.ufo/glyphs/upD_ownA_rrow.case.glif deleted file mode 100644 index 9436f46d7..000000000 --- a/src/Inter-UI-Regular.ufo/glyphs/upD_ownA_rrow.case.glif +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="upDownArrow.case" format="2"> - <advance width="2576.0"/> - <outline> - <component base="upDownArrow" yOffset="128.0"/> - </outline> - <lib> - <dict> - <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key> - <string>upArrow</string> - <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key> - <string>upArrow</string> - <key>public.markColor</key> - <string>0.67,0.95,0.38,1</string> - </dict> - </lib> -</glyph> diff --git a/src/Inter-UI-Regular.ufo/layercontents.plist b/src/Inter-UI-Regular.ufo/layercontents.plist index 4d4f4e2b5..963df4006 100644 --- a/src/Inter-UI-Regular.ufo/layercontents.plist +++ b/src/Inter-UI-Regular.ufo/layercontents.plist @@ -6,85 +6,5 @@ <string>public.default</string> <string>glyphs</string> </array> - <array> - <string>public.background</string> - <string>glyphs.public.background</string> - </array> - <array> - <string>Sep 16 18, 16:08</string> - <string>glyphs.S_ep 16 18, 16_08</string> - </array> - <array> - <string>Sep 16 18, 16:08.background</string> - <string>glyphs.S_ep 16 18, 16_08.background</string> - </array> - <array> - <string>Sep 23 18, 16:20</string> - <string>glyphs.S_ep 23 18, 16_20</string> - </array> - <array> - <string>Sep 20 18, 18:59</string> - <string>glyphs.S_ep 20 18, 18_59</string> - </array> - <array> - <string>Sep 22 - traditional</string> - <string>glyphs.S_ep 22 - traditional</string> - </array> - <array> - <string>Sep 23 - slice side</string> - <string>glyphs.S_ep 23 - slice side</string> - </array> - <array> - <string>Sep 23 - slice side.background</string> - <string>glyphs.S_ep 23 - slice side.background</string> - </array> - <array> - <string>Sep 23 - conjoined</string> - <string>glyphs.S_ep 23 - conjoined</string> - </array> - <array> - <string>Sep 23 - conjoined.background</string> - <string>glyphs.S_ep 23 - conjoined.background</string> - </array> - <array> - <string>Sep 23 - trad 2</string> - <string>glyphs.S_ep 23 - trad 2</string> - </array> - <array> - <string>Sep 23 - trad 2.background</string> - <string>glyphs.S_ep 23 - trad 2.background</string> - </array> - <array> - <string>Sep 23 - slice center</string> - <string>glyphs.S_ep 23 - slice center</string> - </array> - <array> - <string>Sep 23 - slice center.background</string> - <string>glyphs.S_ep 23 - slice center.background</string> - </array> - <array> - <string>Sep 23 - crazy1</string> - <string>glyphs.S_ep 23 - crazy1</string> - </array> - <array> - <string>Sep 23 - crazy1.background</string> - <string>glyphs.S_ep 23 - crazy1.background</string> - </array> - <array> - <string>Sep 23 18, 23:20</string> - <string>glyphs.S_ep 23 18, 23_20</string> - </array> - <array> - <string>Sep 23 18, 23:20.background</string> - <string>glyphs.S_ep 23 18, 23_20.background</string> - </array> - <array> - <string>_base</string> - <string>glyphs._base</string> - </array> - <array> - <string>Sep 23 18, 17:53</string> - <string>glyphs.S_ep 23 18, 17_53</string> - </array> </array> </plist> diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist index a7998b705..dd25a31c2 100644 --- a/src/Inter-UI-Regular.ufo/lib.plist +++ b/src/Inter-UI-Regular.ufo/lib.plist @@ -1577,22 +1577,21 @@ <string>leftArrow.case</string> <string>leftLongArrow</string> <string>leftLongArrow.case</string> - <string>upArrow</string> <string>rightArrow</string> <string>rightArrow.case</string> <string>rightLongArrow</string> <string>rightLongArrow.case</string> - <string>downArrow</string> <string>northWestArrow</string> <string>northEastArrow</string> <string>southEastArrow</string> <string>southWestArrow</string> <string>leftRightArrow</string> <string>leftRightArrow.case</string> - <string>upDownArrow</string> - <string>upDownArrow.case</string> <string>leftRightLongArrow</string> <string>leftRightLongArrow.case</string> + <string>upArrow</string> + <string>downArrow</string> + <string>upDownArrow</string> <string>dngb_check</string> <string>dngb_ballotx</string> <string>triagrt</string> |