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 | |
parent | 746d527b8f4bd6b5bc721c51052af98d11fc27c0 (diff) | |
download | inter-42f8afe6568c3b0d2cbcb7e412b3c32dd8f80729.tar.xz |
left-right arrow adjustments and calt refinements for case on left-hand repetition
39 files changed, 631 insertions, 1109 deletions
diff --git a/src/Inter-UI-Black.ufo/features.fea b/src/Inter-UI-Black.ufo/features.fea index 8595a68d9..34c84e1c5 100644 --- a/src/Inter-UI-Black.ufo/features.fea +++ b/src/Inter-UI-Black.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-Black.ufo/fontinfo.plist b/src/Inter-UI-Black.ufo/fontinfo.plist index 705774642..2d36c6298 100644 --- a/src/Inter-UI-Black.ufo/fontinfo.plist +++ b/src/Inter-UI-Black.ufo/fontinfo.plist @@ -48,6 +48,14 @@ <key>y</key> <real>768.0</real> </dict> + <dict> + <key>angle</key> + <real>0.0</real> + <key>x</key> + <real>2660.0</real> + <key>y</key> + <real>1024.0</real> + </dict> </array> <key>italicAngle</key> <real>-0.0</real> @@ -89,9 +97,9 @@ <key>openTypeNameSampleText</key> <string></string> <key>openTypeNameUniqueID</key> - <string>Inter UI Black:2018:a2200c6b</string> + <string>Inter UI Black: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-Black.ufo/glyphs.public.background/K_hook.glif b/src/Inter-UI-Black.ufo/glyphs.public.background/K_hook.glif deleted file mode 100644 index cfa28c13a..000000000 --- a/src/Inter-UI-Black.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" xOffset="12.0"/> - </outline> -</glyph> diff --git a/src/Inter-UI-Black.ufo/glyphs.public.background/contents.plist b/src/Inter-UI-Black.ufo/glyphs.public.background/contents.plist deleted file mode 100644 index 4aa48d64e..000000000 --- a/src/Inter-UI-Black.ufo/glyphs.public.background/contents.plist +++ /dev/null @@ -1,72 +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>C</key> - <string>C_.glif</string> - <key>G</key> - <string>G_.glif</string> - <key>Khook</key> - <string>K_hook.glif</string> - <key>Omega</key> - <string>O_mega.glif</string> - <key>P</key> - <string>P_.glif</string> - <key>ae</key> - <string>ae.glif</string> - <key>asterisk</key> - <string>asterisk.glif</string> - <key>b</key> - <string>b.glif</string> - <key>c</key> - <string>c.glif</string> - <key>comma</key> - <string>comma.glif</string> - <key>e</key> - <string>e.glif</string> - <key>eight</key> - <string>eight.glif</string> - <key>eight.dnomf</key> - <string>eight.dnomf.glif</string> - <key>five</key> - <string>five.glif</string> - <key>four</key> - <string>four.glif</string> - <key>four.ss01</key> - <string>four.ss01.glif</string> - <key>g</key> - <string>g.glif</string> - <key>interrobang</key> - <string>interrobang.glif</string> - <key>lambda</key> - <string>lambda.glif</string> - <key>m</key> - <string>m.glif</string> - <key>micro</key> - <string>micro.glif</string> - <key>nu</key> - <string>nu.glif</string> - <key>pertenthousand</key> - <string>pertenthousand.glif</string> - <key>perthousand</key> - <string>perthousand.glif</string> - <key>phigreek</key> - <string>phigreek.glif</string> - <key>seven</key> - <string>seven.glif</string> - <key>seven.dnomf</key> - <string>seven.dnomf.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>two</key> - <string>two.glif</string> - <key>uni04FD</key> - <string>uni04F_D_.glif</string> - <key>y</key> - <string>y.glif</string> - </dict> -</plist> diff --git a/src/Inter-UI-Black.ufo/glyphs.public.background/lambda.glif b/src/Inter-UI-Black.ufo/glyphs.public.background/lambda.glif deleted file mode 100644 index 20e4d8d71..000000000 --- a/src/Inter-UI-Black.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="1484.0"/> - </outline> -</glyph> diff --git a/src/Inter-UI-Black.ufo/glyphs.public.background/layerinfo.plist b/src/Inter-UI-Black.ufo/glyphs.public.background/layerinfo.plist deleted file mode 100644 index 564c7a6bb..000000000 --- a/src/Inter-UI-Black.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-Black.ufo/glyphs/contents.plist b/src/Inter-UI-Black.ufo/glyphs/contents.plist index 4876b88ff..fda28c9ed 100644 --- a/src/Inter-UI-Black.ufo/glyphs/contents.plist +++ b/src/Inter-UI-Black.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-Black.ufo/glyphs/upD_ownA_rrow.case.glif b/src/Inter-UI-Black.ufo/glyphs/upD_ownA_rrow.case.glif deleted file mode 100644 index 5e2f0bcc7..000000000 --- a/src/Inter-UI-Black.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="2816.0"/> - <outline> - <component base="upDownArrow" yOffset="216.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-Black.ufo/layercontents.plist b/src/Inter-UI-Black.ufo/layercontents.plist index 25677ffcc..963df4006 100644 --- a/src/Inter-UI-Black.ufo/layercontents.plist +++ b/src/Inter-UI-Black.ufo/layercontents.plist @@ -6,69 +6,5 @@ <string>public.default</string> <string>glyphs</string> </array> - <array> - <string>public.background</string> - <string>glyphs.public.background</string> - </array> - <array> - <string>Sep 26 18, 17:42</string> - <string>glyphs.S_ep 26 18, 17_42</string> - </array> - <array> - <string>Sep 26 18, 17:42.background</string> - <string>glyphs.S_ep 26 18, 17_42.background</string> - </array> - <array> - <string>Sep 9 18, 17:18</string> - <string>glyphs.S_ep 9 18, 17_18</string> - </array> - <array> - <string>Sep 16 18, 18:28</string> - <string>glyphs.S_ep 16 18, 18_28</string> - </array> - <array> - <string>Sep 16 18, 17:50</string> - <string>glyphs.S_ep 16 18, 17_50</string> - </array> - <array> - <string>Sep 16 18, 18:59</string> - <string>glyphs.S_ep 16 18, 18_59</string> - </array> - <array> - <string>Sep 20 18, 18:25</string> - <string>glyphs.S_ep 20 18, 18_25</string> - </array> - <array> - <string>Sep 20 18, 18:25.background</string> - <string>glyphs.S_ep 20 18, 18_25.background</string> - </array> - <array> - <string>Sep 23 18, 19:05</string> - <string>glyphs.S_ep 23 18, 19_05</string> - </array> - <array> - <string>Sep 23 18, 19:05.background</string> - <string>glyphs.S_ep 23 18, 19_05.background</string> - </array> - <array> - <string>Sep 23 18, 23:18</string> - <string>glyphs.S_ep 23 18, 23_18</string> - </array> - <array> - <string>Sep 23 18, 23:18.background</string> - <string>glyphs.S_ep 23 18, 23_18.background</string> - </array> - <array> - <string>_base</string> - <string>glyphs._base</string> - </array> - <array> - <string>Sep 11 18, 18:19</string> - <string>glyphs.S_ep 11 18, 18_19</string> - </array> - <array> - <string>Sep 11 18, 18:19.background</string> - <string>glyphs.S_ep 11 18, 18_19.background</string> - </array> </array> </plist> diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist index 117852485..15b0a7907 100644 --- a/src/Inter-UI-Black.ufo/lib.plist +++ b/src/Inter-UI-Black.ufo/lib.plist @@ -1573,22 +1573,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> diff --git a/src/Inter-UI-BlackItalic.ufo/features.fea b/src/Inter-UI-BlackItalic.ufo/features.fea index 8595a68d9..34c84e1c5 100644 --- a/src/Inter-UI-BlackItalic.ufo/features.fea +++ b/src/Inter-UI-BlackItalic.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-BlackItalic.ufo/fontinfo.plist b/src/Inter-UI-BlackItalic.ufo/fontinfo.plist index e48d8440d..eb580b285 100644 --- a/src/Inter-UI-BlackItalic.ufo/fontinfo.plist +++ b/src/Inter-UI-BlackItalic.ufo/fontinfo.plist @@ -105,9 +105,9 @@ <key>openTypeNameSampleText</key> <string></string> <key>openTypeNameUniqueID</key> - <string>Inter UI Black Italic:2018:a2200c6b</string> + <string>Inter UI Black Italic: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-BlackItalic.ufo/glyphs/contents.plist b/src/Inter-UI-BlackItalic.ufo/glyphs/contents.plist index 4876b88ff..fda28c9ed 100644 --- a/src/Inter-UI-BlackItalic.ufo/glyphs/contents.plist +++ b/src/Inter-UI-BlackItalic.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-BlackItalic.ufo/glyphs/fdotaccent.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/fdotaccent.glif index 95ba9917c..a8c8132e4 100644 --- a/src/Inter-UI-BlackItalic.ufo/glyphs/fdotaccent.glif +++ b/src/Inter-UI-BlackItalic.ufo/glyphs/fdotaccent.glif @@ -4,6 +4,6 @@ <unicode hex="1E1F"/> <outline> <component base="f"/> - <component base="dotaccent" xOffset="340.0" yOffset="592.0"/> + <component base="dotaccent" xOffset="344.0" yOffset="616.0"/> </outline> </glyph> diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/upD_ownA_rrow.case.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/upD_ownA_rrow.case.glif deleted file mode 100644 index 614ab7dad..000000000 --- a/src/Inter-UI-BlackItalic.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="2816.0"/> - <outline> - <component base="upDownArrow" xOffset="32.0" yOffset="216.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-BlackItalic.ufo/layercontents.plist b/src/Inter-UI-BlackItalic.ufo/layercontents.plist index 6b6641a58..963df4006 100644 --- a/src/Inter-UI-BlackItalic.ufo/layercontents.plist +++ b/src/Inter-UI-BlackItalic.ufo/layercontents.plist @@ -6,77 +6,5 @@ <string>public.default</string> <string>glyphs</string> </array> - <array> - <string>public.background</string> - <string>glyphs.public.background</string> - </array> - <array> - <string>Sep 14 18, 09:35</string> - <string>glyphs.S_ep 14 18, 09_35</string> - </array> - <array> - <string>Sep 14 18, 09:35.background</string> - <string>glyphs.S_ep 14 18, 09_35.background</string> - </array> - <array> - <string>Sep 14 18, 09:46</string> - <string>glyphs.S_ep 14 18, 09_46</string> - </array> - <array> - <string>Sep 14 18, 09:43</string> - <string>glyphs.S_ep 14 18, 09_43</string> - </array> - <array> - <string>Sep 14 18, 09:43.background</string> - <string>glyphs.S_ep 14 18, 09_43.background</string> - </array> - <array> - <string>Sep 14 18, 09:53</string> - <string>glyphs.S_ep 14 18, 09_53</string> - </array> - <array> - <string>Sep 14 18, 09:39</string> - <string>glyphs.S_ep 14 18, 09_39</string> - </array> - <array> - <string>Sep 14 18, 09:56</string> - <string>glyphs.S_ep 14 18, 09_56</string> - </array> - <array> - <string>Sep 14 18, 10:05</string> - <string>glyphs.S_ep 14 18, 10_05</string> - </array> - <array> - <string>Sep 14 18, 10:05.background</string> - <string>glyphs.S_ep 14 18, 10_05.background</string> - </array> - <array> - <string>Sep 14 18, 19:17</string> - <string>glyphs.S_ep 14 18, 19_17</string> - </array> - <array> - <string>Sep 14 18, 19:17.background</string> - <string>glyphs.S_ep 14 18, 19_17.background</string> - </array> - <array> - <string>Sep 16 18, 21:53</string> - <string>glyphs.S_ep 16 18, 21_53</string> - </array> - <array> - <string>Sep 16 18, 18:56</string> - <string>glyphs.S_ep 16 18, 18_56</string> - </array> - <array> - <string>Sep 16 18, 19:03</string> - <string>glyphs.S_ep 16 18, 19_03</string> - </array> - <array> - <string>Sep 16 18, 17:54</string> - <string>glyphs.S_ep 16 18, 17_54</string> - </array> - <array> - <string>Sep 16 18, 17:30</string> - <string>glyphs.S_ep 16 18, 17_30</string> - </array> </array> </plist> diff --git a/src/Inter-UI-BlackItalic.ufo/lib.plist b/src/Inter-UI-BlackItalic.ufo/lib.plist index 5bed23ee2..a8a69d01d 100644 --- a/src/Inter-UI-BlackItalic.ufo/lib.plist +++ b/src/Inter-UI-BlackItalic.ufo/lib.plist @@ -1569,22 +1569,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> diff --git a/src/Inter-UI-Italic.ufo/features.fea b/src/Inter-UI-Italic.ufo/features.fea index 8595a68d9..34c84e1c5 100644 --- a/src/Inter-UI-Italic.ufo/features.fea +++ b/src/Inter-UI-Italic.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-Italic.ufo/fontinfo.plist b/src/Inter-UI-Italic.ufo/fontinfo.plist index 96ca5dd51..dca501a1d 100644 --- a/src/Inter-UI-Italic.ufo/fontinfo.plist +++ b/src/Inter-UI-Italic.ufo/fontinfo.plist @@ -105,9 +105,9 @@ <key>openTypeNameSampleText</key> <string></string> <key>openTypeNameUniqueID</key> - <string>Inter UI Italic:2018:a2200c6b</string> + <string>Inter UI Italic: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-Italic.ufo/glyphs/contents.plist b/src/Inter-UI-Italic.ufo/glyphs/contents.plist index 4876b88ff..fda28c9ed 100644 --- a/src/Inter-UI-Italic.ufo/glyphs/contents.plist +++ b/src/Inter-UI-Italic.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-Italic.ufo/glyphs/downA_rrow.glif b/src/Inter-UI-Italic.ufo/glyphs/downA_rrow.glif index f119c91ab..477e0fc24 100644 --- a/src/Inter-UI-Italic.ufo/glyphs/downA_rrow.glif +++ b/src/Inter-UI-Italic.ufo/glyphs/downA_rrow.glif @@ -3,7 +3,7 @@ <advance width="2576.0"/> <unicode hex="2193"/> <outline> - <component base="upArrow" xScale="-1.0" yScale="-1.0" xOffset="2528.0" yOffset="2048.0"/> + <component base="upArrow" xScale="-1.0" yScale="-1.0" xOffset="2664.0" yOffset="2048.0"/> </outline> <lib> <dict> diff --git a/src/Inter-UI-Italic.ufo/glyphs/upA_rrow.glif b/src/Inter-UI-Italic.ufo/glyphs/upA_rrow.glif index ae1f5b792..f0bde5764 100644 --- a/src/Inter-UI-Italic.ufo/glyphs/upA_rrow.glif +++ b/src/Inter-UI-Italic.ufo/glyphs/upA_rrow.glif @@ -4,17 +4,17 @@ <unicode hex="2191"/> <outline> <contour> - <point x="1176.0" y="0.0" type="line"/> - <point x="1400.0" y="0.0" type="line"/> - <point x="1400.0" y="1636.0" type="line"/> - <point x="1416.0" y="1636.0" type="line"/> - <point x="2032.0" y="1024.0" type="line"/> - <point x="2184.0" y="1172.0" type="line"/> - <point x="1288.0" y="2068.0" type="line"/> - <point x="392.0" y="1172.0" type="line"/> - <point x="548.0" y="1024.0" type="line"/> - <point x="1160.0" y="1636.0" type="line"/> - <point x="1176.0" y="1636.0" type="line"/> + <point x="1048.0" y="0.0" type="line"/> + <point x="1272.0" y="0.0" type="line"/> + <point x="1544.0" y="1636.0" type="line"/> + <point x="1560.0" y="1636.0" type="line"/> + <point x="2076.0" y="1024.0" type="line"/> + <point x="2252.0" y="1172.0" type="line"/> + <point x="1504.0" y="2068.0" type="line"/> + <point x="460.0" y="1172.0" type="line"/> + <point x="592.0" y="1024.0" type="line"/> + <point x="1304.0" y="1636.0" type="line"/> + <point x="1320.0" y="1636.0" type="line"/> </contour> </outline> <lib> diff --git a/src/Inter-UI-Italic.ufo/glyphs/upD_ownA_rrow.case.glif b/src/Inter-UI-Italic.ufo/glyphs/upD_ownA_rrow.case.glif deleted file mode 100644 index 3e3ba2b58..000000000 --- a/src/Inter-UI-Italic.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="2580.0"/> - <outline> - <component base="upDownArrow" xOffset="20.0" 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-Italic.ufo/layercontents.plist b/src/Inter-UI-Italic.ufo/layercontents.plist index ab4f645ce..963df4006 100644 --- a/src/Inter-UI-Italic.ufo/layercontents.plist +++ b/src/Inter-UI-Italic.ufo/layercontents.plist @@ -6,61 +6,5 @@ <string>public.default</string> <string>glyphs</string> </array> - <array> - <string>public.background</string> - <string>glyphs.public.background</string> - </array> - <array> - <string>Sep 11 18, 23:27</string> - <string>glyphs.S_ep 11 18, 23_27</string> - </array> - <array> - <string>Sep 11 18, 23:23</string> - <string>glyphs.S_ep 11 18, 23_23</string> - </array> - <array> - <string>Sep 11 18, 23:24</string> - <string>glyphs.S_ep 11 18, 23_24</string> - </array> - <array> - <string>Sep 11 18, 23:22</string> - <string>glyphs.S_ep 11 18, 23_22</string> - </array> - <array> - <string>Sep 14 18, 19:26</string> - <string>glyphs.S_ep 14 18, 19_26</string> - </array> - <array> - <string>Sep 11 18, 19:44</string> - <string>glyphs.S_ep 11 18, 19_44</string> - </array> - <array> - <string>Sep 11 18, 19:44.background</string> - <string>glyphs.S_ep 11 18, 19_44.background</string> - </array> - <array> - <string>Sep 16 18, 17:48</string> - <string>glyphs.S_ep 16 18, 17_48</string> - </array> - <array> - <string>Sep 15 18, 14:44</string> - <string>glyphs.S_ep 15 18, 14_44</string> - </array> - <array> - <string>Sep 16 18, 16:57</string> - <string>glyphs.S_ep 16 18, 16_57</string> - </array> - <array> - <string>Sep 23 18, 16:27</string> - <string>glyphs.S_ep 23 18, 16_27</string> - </array> - <array> - <string>Sep 11 18, 20:42</string> - <string>glyphs.S_ep 11 18, 20_42</string> - </array> - <array> - <string>_base</string> - <string>glyphs._base</string> - </array> </array> </plist> diff --git a/src/Inter-UI-Italic.ufo/lib.plist b/src/Inter-UI-Italic.ufo/lib.plist index ceac6c478..c4c10494b 100644 --- a/src/Inter-UI-Italic.ufo/lib.plist +++ b/src/Inter-UI-Italic.ufo/lib.plist @@ -1575,22 +1575,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> 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> diff --git a/src/Inter-UI.glyphs b/src/Inter-UI.glyphs index 464d3c97f..1f4761573 100644 --- a/src/Inter-UI.glyphs +++ b/src/Inter-UI.glyphs @@ -1646,22 +1646,21 @@ leftArrow, leftArrow.case, leftLongArrow, leftLongArrow.case, -upArrow, rightArrow, rightArrow.case, rightLongArrow, rightLongArrow.case, -downArrow, northWestArrow, northEastArrow, southEastArrow, southWestArrow, leftRightArrow, leftRightArrow.case, -upDownArrow, -upDownArrow.case, leftRightLongArrow, leftRightLongArrow.case, +upArrow, +downArrow, +upDownArrow, dngb_check, dngb_ballotx, triagrt, @@ -2574,11 +2573,11 @@ name = dnom; }, { automatic = 1; -code = "sub parenleft by parenleft.case;\012sub parenright by parenright.case;\012sub bracketleft by bracketleft.case;\012sub bracketright by bracketright.case;\012sub braceleft by braceleft.case;\012sub braceright by braceright.case;\012sub at by at.case;\012sub hyphen by hyphen.case;\012sub endash by endash.case;\012sub figuredash by figuredash.case;\012sub emdash by emdash.case;\012sub bullet by bullet.case;\012sub openbullet by openbullet.case;\012sub colon by colon.case;\012sub equal by equal.case;\012sub notequal by notequal.case;\012sub plus by plus.case;\012sub minus by minus.case;\012sub multiply by multiply.case;\012sub divide by divide.case;\012sub plusminus by plusminus.case;\012sub asterisk by asterisk.case;\012sub leftArrow by leftArrow.case;\012sub leftLongArrow by leftLongArrow.case;\012sub rightArrow by rightArrow.case;\012sub rightLongArrow by rightLongArrow.case;\012sub leftRightArrow by leftRightArrow.case;\012sub upDownArrow by upDownArrow.case;\012sub leftRightLongArrow by leftRightLongArrow.case;\012"; +code = "sub parenleft by parenleft.case;\012sub parenright by parenright.case;\012sub bracketleft by bracketleft.case;\012sub bracketright by bracketright.case;\012sub braceleft by braceleft.case;\012sub braceright by braceright.case;\012sub at by at.case;\012sub hyphen by hyphen.case;\012sub endash by endash.case;\012sub figuredash by figuredash.case;\012sub emdash by emdash.case;\012sub bullet by bullet.case;\012sub openbullet by openbullet.case;\012sub colon by colon.case;\012sub equal by equal.case;\012sub notequal by notequal.case;\012sub plus by plus.case;\012sub minus by minus.case;\012sub multiply by multiply.case;\012sub divide by divide.case;\012sub plusminus by plusminus.case;\012sub asterisk by asterisk.case;\012sub leftArrow by leftArrow.case;\012sub leftLongArrow by leftLongArrow.case;\012sub rightArrow by rightArrow.case;\012sub rightLongArrow by rightLongArrow.case;\012sub leftRightArrow by leftRightArrow.case;\012sub leftRightLongArrow by leftRightLongArrow.case;\012"; name = case; }, { -code = "@CASE_DELIM_L = [\012 braceleft braceright\012 bracketleft bracketright\012 parenleft parenright\012];\012@CASE_NONDELIM_L = [\012 asterisk\012 at\012 multiply\012 minus\012 plus\012 plusminus\012 divide\012 equal\012 notequal\012 endash\012 figuredash\012 emdash\012 hyphen\012 bullet\012 openbullet\012 leftArrow\012 leftLongArrow\012 rightArrow\012 rightLongArrow\012 leftRightArrow\012 leftRightLongArrow\012 upDownArrow\012 notequal\012 colon\012];\012@CASE_L = [\012 @CASE_DELIM_L\012 @CASE_NONDELIM_L\012];\012\012@CASE_DELIM_R = [\012 braceleft.case braceright.case\012 bracketleft.case bracketright.case\012 parenleft.case parenright.case\012];\012@CASE_NONDELIM_R = [\012 asterisk.case\012 at.case\012 multiply.case\012 minus.case\012 plus.case\012 plusminus.case\012 divide.case\012 equal.case\012 notequal.case\012 endash.case\012 figuredash.case\012 emdash.case\012 hyphen.case\012 bullet.case\012 openbullet.case\012 leftArrow.case\012 leftLongArrow.case\012 rightArrow.case\012 rightLongArrow.case\012 leftRightArrow.case\012 leftRightLongArrow.case\012 upDownArrow.case\012 notequal.case\012 colon.case\012];\012@CASE_R = [\012 @CASE_DELIM_R\012 @CASE_NONDELIM_R\012];\012\012@UC = [ @UC_ROMAN @UC_SET1 exclam question ];\012@LC = [ @LC_ROMAN @LC_SET1 ];\012\012sub [ @UC @CASE_R ] @CASE_L' by @CASE_R; # Z y' -> Z x -> Z x 'y -> Z x x ...\012ignore sub @LC @CASE_NONDELIM_L @UC; # e.g. m multiply M\012sub @CASE_L' [ @UC @CASE_R ] by @CASE_R; # y' Z -> x Z\012\012# rule to support left-hand repetition of CASE{L}->{R} [issue #57]\012# e.g. /at /at /UC -> /at.case /at /UC -> /at.case /at.case /UC\012# Note that we can't look further than 2 glyphs back, since it would break\012# cases like /a /braceleft /braceright /asterisk /asterisk /A\012sub @CASE_L' @CASE_L [ @CASE_R @UC ] by @CASE_R;\012\012# ignore <-NUM e.g. \"<-3\"\012ignore sub less [ hyphen hyphen.case endash endash.case emdash emdash.case ] @NUM;\012# arrows: <->\012sub less hyphen greater by leftRightArrow;\012sub less hyphen.case greater by leftRightArrow.case;\012sub less [endash emdash] greater by leftRightLongArrow;\012sub less [endash.case emdash.case] greater by leftRightLongArrow.case;\012# arrows: ->\012sub hyphen greater by rightArrow;\012sub hyphen.case greater by rightArrow.case;\012sub [endash emdash] greater by rightLongArrow;\012sub [endash.case emdash.case] greater by rightLongArrow.case;\012# arrows: <-\012sub less hyphen by leftArrow;\012sub less hyphen.case by leftArrow.case;\012sub less [endash emdash] by leftLongArrow;\012sub less [endash.case emdash.case] by leftLongArrow.case;\012"; +code = "@CASE_DELIM_L = [\012 braceleft braceright\012 bracketleft bracketright\012 parenleft parenright\012];\012@CASE_NONDELIM_L = [\012 asterisk\012 at\012 multiply\012 minus\012 plus\012 plusminus\012 divide\012 equal\012 notequal\012 endash\012 figuredash\012 emdash\012 hyphen\012 bullet\012 openbullet\012 leftArrow\012 leftLongArrow\012 rightArrow\012 rightLongArrow\012 leftRightArrow\012 leftRightLongArrow\012 notequal\012 colon\012];\012@CASE_L = [\012 @CASE_DELIM_L\012 @CASE_NONDELIM_L\012];\012\012@CASE_DELIM_R = [\012 braceleft.case braceright.case\012 bracketleft.case bracketright.case\012 parenleft.case parenright.case\012];\012@CASE_NONDELIM_R = [\012 asterisk.case\012 at.case\012 multiply.case\012 minus.case\012 plus.case\012 plusminus.case\012 divide.case\012 equal.case\012 notequal.case\012 endash.case\012 figuredash.case\012 emdash.case\012 hyphen.case\012 bullet.case\012 openbullet.case\012 leftArrow.case\012 leftLongArrow.case\012 rightArrow.case\012 rightLongArrow.case\012 leftRightArrow.case\012 leftRightLongArrow.case\012 notequal.case\012 colon.case\012];\012@CASE_R = [\012 @CASE_DELIM_R\012 @CASE_NONDELIM_R\012];\012\012@UC = [ @UC_ROMAN @UC_SET1 exclam question ];\012@LC = [ @LC_ROMAN @LC_SET1 ];\012\012# ---------------------------------------------------\012\012# ignore <-NUM e.g. \"<-3\"\012ignore sub less [ hyphen hyphen.case endash endash.case emdash emdash.case ] @NUM;\012\012# arrows: <->\012sub less hyphen greater by leftRightArrow;\012sub less hyphen.case greater by leftRightArrow.case;\012sub less [endash emdash] greater by leftRightLongArrow;\012sub less [endash.case emdash.case] greater by leftRightLongArrow.case;\012sub less hyphen hyphen greater by leftRightLongArrow;\012sub less hyphen.case hyphen.case greater by leftRightLongArrow.case;\012\012# arrows: ->\012sub hyphen greater by rightArrow;\012sub hyphen.case greater by rightArrow.case;\012sub [endash emdash] greater by rightLongArrow;\012sub [endash.case emdash.case] greater by rightLongArrow.case;\012# arrows: <-\012sub less hyphen by leftArrow;\012sub less hyphen.case by leftArrow.case;\012sub less [endash emdash] by leftLongArrow;\012sub less [endash.case emdash.case] by leftLongArrow.case;\012\012# :-)\012sub colon' [hyphen hyphen.case endash endash.case emdash emdash.case] [parenright parenright.case] by colon.case;\012sub [colon colon.case] hyphen' [parenright parenright.case] by hyphen.case;\012sub [colon colon.case] endash' [parenright parenright.case] by endash.case;\012sub [colon colon.case] emdash' [parenright parenright.case] by emdash.case;\012sub [colon colon.case] [hyphen hyphen.case endash endash.case emdash emdash.case] parenright' by parenright.case;\012\012# A foo' -> A foo.case\012sub [ @UC @CASE_R ] @CASE_L' by @CASE_R;\012ignore sub @LC @CASE_NONDELIM_L @UC; # e.g. m multiply M\012\012# foo' foo foo foo foo A -> foo.case foo foo foo foo A\012# foo' foo foo foo A -> foo.case foo foo foo A\012# foo' foo foo A -> foo.case foo foo A\012# foo' foo A -> foo.case foo A\012# foo' A -> foo.case A\012# Note: since we look quite far back, sequences like x{}[]M will case both\012# the square brackets next to M _and_ the curly braces to become .case\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' [ @UC @CASE_R ] by @CASE_R;\012"; name = calt; }, { @@ -2757,6 +2756,10 @@ position = "{1224, 1056}"; alignment = center; name = anchors_Cap; position = "{52, 2304}"; +}, +{ +alignment = center; +position = "{2296, 1024}"; } ); horizontalStems = ( @@ -2978,6 +2981,10 @@ position = "{472, 2168}"; { alignment = center; position = "{1016, 768}"; +}, +{ +alignment = center; +position = "{2660, 1024}"; } ); horizontalStems = ( @@ -37193,7 +37200,7 @@ unicode = 01C8; { color = (219,235,247,1); glyphname = M; -lastChange = "2018-09-27 17:36:45 +0000"; +lastChange = "2018-09-28 19:03:14 +0000"; layers = ( { anchors = ( @@ -91300,7 +91307,7 @@ interface.gridadjust.original = "{'width': 989, 'leftMargin': 315, 'rightMargin' }, { glyphname = fdotaccent; -lastChange = "2018-09-28 02:11:20 +0000"; +lastChange = "2018-09-28 19:13:04 +0000"; layers = ( { components = ( @@ -91348,7 +91355,7 @@ name = f; }, { name = dotaccent; -transform = "{1, 0, 0, 1, 340, 592}"; +transform = "{1, 0, 0, 1, 344, 616}"; } ); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -259541,177 +259548,6 @@ com.typemytype.robofont.guideline.magnetic.j1R7bzZtA3 = 5; }, { color = (204,240,242,1); -glyphname = upArrow; -lastChange = "2018-09-27 00:56:25 +0000"; -layers = ( -{ -hints = ( -{ -horizontal = 1; -origin = "{0, 10}"; -target = up; -type = BottomGhost; -}, -{ -horizontal = 1; -origin = "{0, 5}"; -target = down; -type = TopGhost; -}, -{ -origin = "{0, 10}"; -target = "{0, 0}"; -type = Stem; -}, -{ -horizontal = 1; -origin = "{0, 10}"; -type = Anchor; -options = 4; -}, -{ -horizontal = 1; -origin = "{0, 5}"; -type = Anchor; -options = 4; -} -); -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; -paths = ( -{ -closed = 1; -nodes = ( -"1400 0 LINE", -"1400 1636 LINE", -"1416 1636 LINE", -"2032 1024 LINE", -"2184 1172 LINE", -"1288 2068 LINE", -"392 1172 LINE", -"548 1024 LINE", -"1160 1636 LINE", -"1176 1636 LINE", -"1176 0 LINE" -); -} -); -width = 2576; -}, -{ -guideLines = ( -{ -angle = 90; -position = "{1324, 452}"; -} -); -hints = ( -{ -horizontal = 1; -origin = "{0, 10}"; -target = up; -type = BottomGhost; -}, -{ -horizontal = 1; -origin = "{0, 5}"; -target = down; -type = TopGhost; -}, -{ -horizontal = 1; -origin = "{0, 10}"; -type = Anchor; -options = 4; -}, -{ -horizontal = 1; -origin = "{0, 5}"; -type = Anchor; -options = 4; -} -); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; -paths = ( -{ -closed = 1; -nodes = ( -"1612 0 LINE", -"1612 1304 LINE", -"1628 1304 LINE", -"2060 912 LINE", -"2332 1184 LINE", -"1408 2064 LINE", -"484 1184 LINE", -"756 912 LINE", -"1188 1304 LINE", -"1204 1304 LINE", -"1204 0 LINE" -); -} -); -width = 2816; -}, -{ -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; -paths = ( -{ -closed = 1; -nodes = ( -"1400 0 LINE", -"1400 1636 LINE", -"1416 1636 LINE", -"2032 1024 LINE", -"2184 1172 LINE", -"1288 2068 LINE", -"392 1172 LINE", -"548 1024 LINE", -"1160 1636 LINE", -"1176 1636 LINE", -"1176 0 LINE" -); -} -); -width = 2576; -}, -{ -guideLines = ( -{ -angle = 90; -position = "{1220, 452}"; -} -); -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; -paths = ( -{ -closed = 1; -nodes = ( -"1484 0 LINE", -"1700 1304 LINE", -"1716 1304 LINE", -"2084 912 LINE", -"2400 1184 LINE", -"1624 2064 LINE", -"552 1184 LINE", -"780 912 LINE", -"1276 1304 LINE", -"1292 1304 LINE", -"1076 0 LINE" -); -} -); -width = 2816; -} -); -unicode = 2191; -userData = { -interface.gridadjust.original = "{'width': 1800, 'leftMargin': 296, 'rightMargin': 304}"; -"interface.width-adjustments" = ( --16 -); -}; -}, -{ -color = (204,240,242,1); glyphname = rightArrow; lastChange = "2018-09-27 16:34:03 +0000"; layers = ( @@ -259767,7 +259603,7 @@ userData = { { color = 4; glyphname = rightArrow.case; -lastChange = "2018-09-27 18:13:12 +0000"; +lastChange = "2018-09-28 19:07:49 +0000"; layers = ( { components = ( @@ -259996,61 +259832,6 @@ com.typemytype.robofont.guideline.magnetic.MLXbi8JRvP = 5; }, { color = (204,240,242,1); -glyphname = downArrow; -lastChange = "2018-09-27 18:09:57 +0000"; -layers = ( -{ -components = ( -{ -name = upArrow; -transform = "{-1, 0, 0, -1, 2576, 2048}"; -} -); -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; -width = 2576; -}, -{ -components = ( -{ -name = upArrow; -transform = "{-1, 0, 0, -1, 2816, 2048}"; -} -); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; -width = 2816; -}, -{ -components = ( -{ -name = upArrow; -transform = "{-1, 0, 0, -1, 2528, 2048}"; -} -); -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; -width = 2576; -}, -{ -components = ( -{ -name = upArrow; -transform = "{-1, 0, 0, -1, 2900, 2048}"; -} -); -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; -width = 2816; -} -); -leftMetricsKey = upArrow; -rightMetricsKey = upArrow; -unicode = 2193; -userData = { -"interface.width-adjustments" = ( --16 -); -}; -}, -{ -color = (204,240,242,1); glyphname = northWestArrow; lastChange = "2018-09-27 00:56:25 +0000"; layers = ( @@ -260598,67 +260379,59 @@ leftMetricsKey = leftArrow; rightMetricsKey = rightArrow; }, { -glyphname = upDownArrow; -lastChange = "2018-09-27 18:11:35 +0000"; +glyphname = leftRightLongArrow; +lastChange = "2018-09-27 18:11:05 +0000"; layers = ( { hints = ( { horizontal = 1; -place = "{160, 21}"; +origin = "{0, 17}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 8}"; -target = down; -type = TopGhost; -}, -{ -origin = "{0, 13}"; -target = "{0, 3}"; +origin = "{0, 2}"; +target = "{0, 12}"; type = Stem; }, { horizontal = 1; -origin = "{0, 16}"; +origin = "{0, 17}"; type = Anchor; options = 4; }, { horizontal = 1; -origin = "{0, 8}"; -type = Anchor; +origin = "{0, 2}"; +target = "{0, 12}"; +type = TTStem; options = 4; }, { horizontal = 1; -place = "{1408, 21}"; +origin = "{0, 8}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 17}"; -target = up; -type = BottomGhost; -}, -{ -origin = "{0, 4}"; -target = "{0, 12}"; +origin = "{0, 11}"; +target = "{0, 3}"; type = Stem; }, { horizontal = 1; -origin = "{0, 7}"; +origin = "{0, 8}"; type = Anchor; options = 4; }, { horizontal = 1; -origin = "{0, 17}"; -type = Anchor; +origin = "{0, 11}"; +target = "{0, 3}"; +type = TTStem; options = 4; } ); @@ -260667,76 +260440,257 @@ paths = ( { closed = 1; nodes = ( -"2184 236 LINE", -"2028 384 LINE", -"1416 -228 LINE", -"1400 -228 LINE", -"1400 1796 LINE", -"1416 1796 LINE", -"2032 1184 LINE", -"2184 1332 LINE", -"1288 2228 LINE", -"392 1332 LINE", -"548 1184 LINE", -"1160 1796 LINE", -"1176 1796 LINE", -"1176 -228 LINE", -"1160 -228 LINE", -"544 384 LINE", -"392 236 LINE", -"1288 -660 LINE" +"1420 152 LINE", +"804 768 LINE", +"804 784 LINE", +"4092 784 LINE", +"4092 768 LINE", +"3476 152 LINE", +"3628 0 LINE", +"4524 896 LINE", +"3628 1792 LINE", +"3476 1640 LINE", +"4092 1024 LINE", +"4092 1008 LINE", +"804 1008 LINE", +"804 1024 LINE", +"1420 1640 LINE", +"1268 1792 LINE", +"372 896 LINE", +"1268 0 LINE" ); } ); -width = 2576; +width = 4912; }, { +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +paths = ( +{ +closed = 1; +nodes = ( +"1456 196 LINE", +"1024 588 LINE", +"1024 604 LINE", +"3620 604 LINE", +"3620 588 LINE", +"3188 196 LINE", +"3464 -72 LINE", +"4388 804 LINE", +"3464 1684 LINE", +"3188 1416 LINE", +"3620 1024 LINE", +"3620 1008 LINE", +"1024 1008 LINE", +"1024 1024 LINE", +"1456 1416 LINE", +"1180 1684 LINE", +"256 808 LINE", +"1180 -72 LINE" +); +} +); +width = 4712; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +paths = ( +{ +closed = 1; +nodes = ( +"1360 196 LINE", +"996 588 LINE", +"996 604 LINE", +"3592 604 LINE", +"3592 588 LINE", +"3092 196 LINE", +"3324 -72 LINE", +"4392 804 LINE", +"3616 1684 LINE", +"3296 1416 LINE", +"3664 1024 LINE", +"3660 1008 LINE", +"1064 1008 LINE", +"1068 1024 LINE", +"1564 1416 LINE", +"1332 1684 LINE", +"264 808 LINE", +"1040 -72 LINE" +); +} +); +width = 4712; +}, +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +paths = ( +{ +closed = 1; +nodes = ( +"1300 152 LINE", +"784 768 LINE", +"788 784 LINE", +"4076 784 LINE", +"4072 768 LINE", +"3356 152 LINE", +"3480 0 LINE", +"4524 896 LINE", +"3776 1792 LINE", +"3600 1640 LINE", +"4116 1024 LINE", +"4112 1008 LINE", +"824 1008 LINE", +"828 1024 LINE", +"1544 1640 LINE", +"1416 1792 LINE", +"372 896 LINE", +"1120 0 LINE" +); +} +); +width = 4912; +} +); +leftMetricsKey = leftArrow; +rightMetricsKey = rightArrow; +unicode = 27F7; +}, +{ +color = 4; +glyphname = leftRightLongArrow.case; +lastChange = "2018-09-27 18:27:45 +0000"; +layers = ( +{ +components = ( +{ +name = leftRightLongArrow; +transform = "{1, 0, 0, 1, 0, 128}"; +} +); +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +width = 4912; +}, +{ +components = ( +{ +name = leftRightLongArrow; +transform = "{1, 0, 0, 1, 24, 128}"; +} +); +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +width = 4916; +}, +{ +components = ( +{ +name = leftRightLongArrow; +transform = "{1, 0, 0, 1, 0, 216}"; +} +); +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +width = 4712; +}, +{ +components = ( +{ +name = leftRightLongArrow; +transform = "{1, 0, 0, 1, 36, 216}"; +} +); +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +width = 4712; +} +); +leftMetricsKey = leftArrow; +rightMetricsKey = rightArrow; +}, +{ +color = (204,240,242,1); +glyphname = upArrow; +lastChange = "2018-09-28 19:04:36 +0000"; +layers = ( +{ hints = ( { horizontal = 1; -place = "{8, 21}"; +origin = "{0, 10}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 8}"; +origin = "{0, 5}"; target = down; type = TopGhost; }, { +origin = "{0, 10}"; +target = "{0, 0}"; +type = Stem; +}, +{ horizontal = 1; -origin = "{0, 14}"; +origin = "{0, 10}"; type = Anchor; options = 4; }, { horizontal = 1; -origin = "{0, 9}"; +origin = "{0, 5}"; type = Anchor; options = 4; +} +); +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +paths = ( +{ +closed = 1; +nodes = ( +"1400 0 LINE", +"1400 1636 LINE", +"1416 1636 LINE", +"2032 1024 LINE", +"2184 1172 LINE", +"1288 2068 LINE", +"392 1172 LINE", +"548 1024 LINE", +"1160 1636 LINE", +"1176 1636 LINE", +"1176 0 LINE" +); +} +); +width = 2576; }, { +guideLines = ( +{ +angle = 90; +position = "{1324, 452}"; +} +); +hints = ( +{ horizontal = 1; -place = "{1576, 21}"; +origin = "{0, 10}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 17}"; -target = up; -type = BottomGhost; +origin = "{0, 5}"; +target = down; +type = TopGhost; }, { horizontal = 1; -origin = "{0, 5}"; +origin = "{0, 10}"; type = Anchor; options = 4; }, { horizontal = 1; -origin = "{0, 0}"; +origin = "{0, 5}"; type = Anchor; options = 4; } @@ -260746,102 +260700,91 @@ paths = ( { closed = 1; nodes = ( -"2332 392 LINE", -"2060 664 LINE", -"1628 272 LINE", -"1612 272 LINE", -"1612 1312 LINE", -"1628 1312 LINE", -"2060 920 LINE", -"2332 1192 LINE", -"1408 2072 LINE", -"484 1192 LINE", -"756 920 LINE", -"1188 1312 LINE", -"1204 1312 LINE", -"1204 272 LINE", -"1188 272 LINE", -"756 664 LINE", -"484 392 LINE", -"1408 -488 LINE" +"1612 0 LINE", +"1612 1304 LINE", +"1628 1304 LINE", +"2060 912 LINE", +"2332 1184 LINE", +"1408 2064 LINE", +"484 1184 LINE", +"756 912 LINE", +"1188 1304 LINE", +"1204 1304 LINE", +"1204 0 LINE" ); } ); width = 2816; }, { -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; paths = ( { closed = 1; nodes = ( -"2272 392 LINE", -"2044 664 LINE", -"1548 272 LINE", -"1532 272 LINE", -"1704 1312 LINE", -"1720 1312 LINE", -"2088 920 LINE", -"2404 1192 LINE", -"1624 2072 LINE", -"556 1192 LINE", -"784 920 LINE", -"1280 1312 LINE", -"1296 1312 LINE", -"1124 272 LINE", -"1108 272 LINE", -"740 664 LINE", -"424 392 LINE", -"1200 -488 LINE" +"1272 0 LINE", +"1544 1636 LINE", +"1560 1636 LINE", +"2076 1024 LINE", +"2252 1172 LINE", +"1504 2068 LINE", +"460 1172 LINE", +"592 1024 LINE", +"1304 1636 LINE", +"1320 1636 LINE", +"1048 0 LINE" ); } ); -width = 2820; +width = 2576; }, { -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +guideLines = ( +{ +angle = 90; +position = "{1220, 452}"; +} +); +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; paths = ( { closed = 1; nodes = ( -"2032 236 LINE", -"1900 384 LINE", -"1188 -228 LINE", -"1172 -228 LINE", -"1504 1796 LINE", -"1520 1796 LINE", -"2036 1184 LINE", -"2212 1332 LINE", -"1464 2228 LINE", -"420 1332 LINE", +"1484 0 LINE", +"1700 1304 LINE", +"1716 1304 LINE", +"2084 912 LINE", +"2400 1184 LINE", +"1624 2064 LINE", "552 1184 LINE", -"1264 1796 LINE", -"1280 1796 LINE", -"948 -228 LINE", -"932 -228 LINE", -"416 384 LINE", -"240 236 LINE", -"988 -660 LINE" +"780 912 LINE", +"1276 1304 LINE", +"1292 1304 LINE", +"1076 0 LINE" ); } ); -width = 2580; +width = 2816; } ); -leftMetricsKey = upArrow; -rightMetricsKey = upArrow; -unicode = 2195; +unicode = 2191; +userData = { +interface.gridadjust.original = "{'width': 1800, 'leftMargin': 296, 'rightMargin': 304}"; +"interface.width-adjustments" = ( +-16 +); +}; }, { -color = 4; -glyphname = upDownArrow.case; -lastChange = "2018-09-27 18:27:45 +0000"; +color = (204,240,242,1); +glyphname = downArrow; +lastChange = "2018-09-28 19:05:08 +0000"; layers = ( { components = ( { -name = upDownArrow; -transform = "{1, 0, 0, 1, 0, 128}"; +name = upArrow; +transform = "{-1, 0, 0, -1, 2576, 2048}"; } ); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; @@ -260850,28 +260793,28 @@ width = 2576; { components = ( { -name = upDownArrow; -transform = "{1, 0, 0, 1, 20, 128}"; +name = upArrow; +transform = "{-1, 0, 0, -1, 2816, 2048}"; } ); -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; -width = 2580; +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +width = 2816; }, { components = ( { -name = upDownArrow; -transform = "{1, 0, 0, 1, 0, 216}"; +name = upArrow; +transform = "{-1, 0, 0, -1, 2664, 2048}"; } ); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; -width = 2816; +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +width = 2576; }, { components = ( { -name = upDownArrow; -transform = "{1, 0, 0, 1, 32, 216}"; +name = upArrow; +transform = "{-1, 0, 0, -1, 2900, 2048}"; } ); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -260880,61 +260823,75 @@ width = 2816; ); leftMetricsKey = upArrow; rightMetricsKey = upArrow; +unicode = 2193; +userData = { +"interface.width-adjustments" = ( +-16 +); +}; }, { -glyphname = leftRightLongArrow; -lastChange = "2018-09-27 18:11:05 +0000"; +glyphname = upDownArrow; +lastChange = "2018-09-27 18:11:35 +0000"; layers = ( { hints = ( { horizontal = 1; -origin = "{0, 17}"; +place = "{160, 21}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 2}"; -target = "{0, 12}"; +origin = "{0, 8}"; +target = down; +type = TopGhost; +}, +{ +origin = "{0, 13}"; +target = "{0, 3}"; type = Stem; }, { horizontal = 1; -origin = "{0, 17}"; +origin = "{0, 16}"; type = Anchor; options = 4; }, { horizontal = 1; -origin = "{0, 2}"; -target = "{0, 12}"; -type = TTStem; +origin = "{0, 8}"; +type = Anchor; options = 4; }, { horizontal = 1; -origin = "{0, 8}"; +place = "{1408, 21}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 11}"; -target = "{0, 3}"; +origin = "{0, 17}"; +target = up; +type = BottomGhost; +}, +{ +origin = "{0, 4}"; +target = "{0, 12}"; type = Stem; }, { horizontal = 1; -origin = "{0, 8}"; +origin = "{0, 7}"; type = Anchor; options = 4; }, { horizontal = 1; -origin = "{0, 11}"; -target = "{0, 3}"; -type = TTStem; +origin = "{0, 17}"; +type = Anchor; options = 4; } ); @@ -260943,57 +260900,107 @@ paths = ( { closed = 1; nodes = ( -"1420 152 LINE", -"804 768 LINE", -"804 784 LINE", -"4092 784 LINE", -"4092 768 LINE", -"3476 152 LINE", -"3628 0 LINE", -"4524 896 LINE", -"3628 1792 LINE", -"3476 1640 LINE", -"4092 1024 LINE", -"4092 1008 LINE", -"804 1008 LINE", -"804 1024 LINE", -"1420 1640 LINE", -"1268 1792 LINE", -"372 896 LINE", -"1268 0 LINE" +"2184 236 LINE", +"2028 384 LINE", +"1416 -228 LINE", +"1400 -228 LINE", +"1400 1796 LINE", +"1416 1796 LINE", +"2032 1184 LINE", +"2184 1332 LINE", +"1288 2228 LINE", +"392 1332 LINE", +"548 1184 LINE", +"1160 1796 LINE", +"1176 1796 LINE", +"1176 -228 LINE", +"1160 -228 LINE", +"544 384 LINE", +"392 236 LINE", +"1288 -660 LINE" ); } ); -width = 4912; +width = 2576; +}, +{ +hints = ( +{ +horizontal = 1; +place = "{8, 21}"; +target = up; +type = BottomGhost; +}, +{ +horizontal = 1; +origin = "{0, 8}"; +target = down; +type = TopGhost; +}, +{ +horizontal = 1; +origin = "{0, 14}"; +type = Anchor; +options = 4; +}, +{ +horizontal = 1; +origin = "{0, 9}"; +type = Anchor; +options = 4; +}, +{ +horizontal = 1; +place = "{1576, 21}"; +target = up; +type = BottomGhost; +}, +{ +horizontal = 1; +origin = "{0, 17}"; +target = up; +type = BottomGhost; +}, +{ +horizontal = 1; +origin = "{0, 5}"; +type = Anchor; +options = 4; }, { +horizontal = 1; +origin = "{0, 0}"; +type = Anchor; +options = 4; +} +); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; paths = ( { closed = 1; nodes = ( -"1456 196 LINE", -"1024 588 LINE", -"1024 604 LINE", -"3620 604 LINE", -"3620 588 LINE", -"3188 196 LINE", -"3464 -72 LINE", -"4388 804 LINE", -"3464 1684 LINE", -"3188 1416 LINE", -"3620 1024 LINE", -"3620 1008 LINE", -"1024 1008 LINE", -"1024 1024 LINE", -"1456 1416 LINE", -"1180 1684 LINE", -"256 808 LINE", -"1180 -72 LINE" +"2332 392 LINE", +"2060 664 LINE", +"1628 272 LINE", +"1612 272 LINE", +"1612 1312 LINE", +"1628 1312 LINE", +"2060 920 LINE", +"2332 1192 LINE", +"1408 2072 LINE", +"484 1192 LINE", +"756 920 LINE", +"1188 1312 LINE", +"1204 1312 LINE", +"1204 272 LINE", +"1188 272 LINE", +"756 664 LINE", +"484 392 LINE", +"1408 -488 LINE" ); } ); -width = 4712; +width = 2816; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -261001,28 +261008,28 @@ paths = ( { closed = 1; nodes = ( -"1360 196 LINE", -"996 588 LINE", -"996 604 LINE", -"3592 604 LINE", -"3592 588 LINE", -"3092 196 LINE", -"3324 -72 LINE", -"4392 804 LINE", -"3616 1684 LINE", -"3296 1416 LINE", -"3664 1024 LINE", -"3660 1008 LINE", -"1064 1008 LINE", -"1068 1024 LINE", -"1564 1416 LINE", -"1332 1684 LINE", -"264 808 LINE", -"1040 -72 LINE" +"2272 392 LINE", +"2044 664 LINE", +"1548 272 LINE", +"1532 272 LINE", +"1704 1312 LINE", +"1720 1312 LINE", +"2088 920 LINE", +"2404 1192 LINE", +"1624 2072 LINE", +"556 1192 LINE", +"784 920 LINE", +"1280 1312 LINE", +"1296 1312 LINE", +"1124 272 LINE", +"1108 272 LINE", +"740 664 LINE", +"424 392 LINE", +"1200 -488 LINE" ); } ); -width = 4712; +width = 2820; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -261030,82 +261037,33 @@ paths = ( { closed = 1; nodes = ( -"1300 152 LINE", -"784 768 LINE", -"788 784 LINE", -"4076 784 LINE", -"4072 768 LINE", -"3356 152 LINE", -"3480 0 LINE", -"4524 896 LINE", -"3776 1792 LINE", -"3600 1640 LINE", -"4116 1024 LINE", -"4112 1008 LINE", -"824 1008 LINE", -"828 1024 LINE", -"1544 1640 LINE", -"1416 1792 LINE", -"372 896 LINE", -"1120 0 LINE" -); -} -); -width = 4912; -} -); -leftMetricsKey = leftArrow; -rightMetricsKey = rightArrow; -unicode = 27F7; -}, -{ -color = 4; -glyphname = leftRightLongArrow.case; -lastChange = "2018-09-27 18:27:45 +0000"; -layers = ( -{ -components = ( -{ -name = leftRightLongArrow; -transform = "{1, 0, 0, 1, 0, 128}"; -} -); -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; -width = 4912; -}, -{ -components = ( -{ -name = leftRightLongArrow; -transform = "{1, 0, 0, 1, 24, 128}"; -} -); -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; -width = 4916; -}, -{ -components = ( -{ -name = leftRightLongArrow; -transform = "{1, 0, 0, 1, 0, 216}"; -} +"2032 236 LINE", +"1900 384 LINE", +"1188 -228 LINE", +"1172 -228 LINE", +"1504 1796 LINE", +"1520 1796 LINE", +"2036 1184 LINE", +"2212 1332 LINE", +"1464 2228 LINE", +"420 1332 LINE", +"552 1184 LINE", +"1264 1796 LINE", +"1280 1796 LINE", +"948 -228 LINE", +"932 -228 LINE", +"416 384 LINE", +"240 236 LINE", +"988 -660 LINE" ); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; -width = 4712; -}, -{ -components = ( -{ -name = leftRightLongArrow; -transform = "{1, 0, 0, 1, 36, 216}"; } ); -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; -width = 4712; +width = 2580; } ); -leftMetricsKey = leftArrow; -rightMetricsKey = rightArrow; +leftMetricsKey = upArrow; +rightMetricsKey = upArrow; +unicode = 2195; }, { glyphname = dngb_check; |