diff options
author | Rasmus Andersson <rasmus@notion.se> | 2017-08-26 23:35:55 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2017-08-26 23:35:55 +0300 |
commit | 66d89e754fbdc0ae9e5bdeaf5bea04424ab16305 (patch) | |
tree | fddf3f3a86de64f7e6ca0bef0de01214c5bfb9dd | |
parent | d4678c2ed43c7abb736804e1c79a769fed6a6c19 (diff) | |
download | inter-66d89e754fbdc0ae9e5bdeaf5bea04424ab16305.tar.xz |
Adds and improves a lot of case and calt ".case" glyphs used with tall letterforms
-rw-r--r-- | docs/lab/index.html | 30 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/arrowdown.case.glif (renamed from src/Interface-Bold.ufo/glyphs/arrowdown.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/arrowleft.case.glif (renamed from src/Interface-Bold.ufo/glyphs/arrowleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/arrowright.case.glif (renamed from src/Interface-Bold.ufo/glyphs/arrowright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/arrowup.case.glif (renamed from src/Interface-Bold.ufo/glyphs/arrowup.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/asterisk.case.glif | 84 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/at.case.glif (renamed from src/Interface-Bold.ufo/glyphs/at.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/braceleft.case.glif (renamed from src/Interface-Bold.ufo/glyphs/braceleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/braceright.case.glif (renamed from src/Interface-Bold.ufo/glyphs/braceright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/bracketleft.case.glif (renamed from src/Interface-Bold.ufo/glyphs/bracketleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/bracketright.case.glif (renamed from src/Interface-Bold.ufo/glyphs/bracketright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/bullet.case.glif (renamed from src/Interface-Bold.ufo/glyphs/bullet.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/colon.case.glif | 21 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/colon.glif | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/colon.pnum.glif | 15 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/contents.plist | 98 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/divide.case.glif (renamed from src/Interface-Bold.ufo/glyphs/divide.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/emdash.case.glif (renamed from src/Interface-Bold.ufo/glyphs/emdash.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/endash.case.glif (renamed from src/Interface-Bold.ufo/glyphs/endash.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/equal.case.glif (renamed from src/Interface-Bold.ufo/glyphs/equal.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/figuredash.case.glif (renamed from src/Interface-Bold.ufo/glyphs/figuredash.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/hyphen.case.glif (renamed from src/Interface-Bold.ufo/glyphs/hyphen.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/minus.case.glif (renamed from src/Interface-Bold.ufo/glyphs/minus.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/multiply.case.glif (renamed from src/Interface-Bold.ufo/glyphs/multiply.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/notequal.case.glif (renamed from src/Interface-Bold.ufo/glyphs/notequal.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/parenleft.case.glif (renamed from src/Interface-Bold.ufo/glyphs/parenleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/parenright.case.glif (renamed from src/Interface-Bold.ufo/glyphs/parenright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/period.glif | 6 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/period.num.glif | 47 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/plus.case.glif (renamed from src/Interface-Bold.ufo/glyphs/plus.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/plusminus.case.glif | 20 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/uni20DB__.glif | 6 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/glyphs/uni20DC__.glif | 6 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/groups.plist | 3 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/kerning.plist | 274 | ||||
-rw-r--r-- | src/Interface-Bold.ufo/lib.plist | 98 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/features.fea | 4 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/arrowdown.case.glif (renamed from src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/arrowleft.case.glif (renamed from src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/arrowright.case.glif (renamed from src/Interface-Regular.ufo/glyphs/arrowright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/arrowup.case.glif (renamed from src/Interface-Regular.ufo/glyphs/arrowup.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/asterisk.case.glif | 119 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/at.case.glif (renamed from src/Interface-Regular.ufo/glyphs/at.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/braceleft.case.glif (renamed from src/Interface-Regular.ufo/glyphs/braceleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/braceright.case.glif (renamed from src/Interface-Regular.ufo/glyphs/braceright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/bracketleft.case.glif (renamed from src/Interface-Regular.ufo/glyphs/bracketleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/bracketright.case.glif (renamed from src/Interface-Regular.ufo/glyphs/bracketright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/bullet.case.glif (renamed from src/Interface-Regular.ufo/glyphs/bullet.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/c.glif | 54 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/colon.case.glif | 25 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/colon.glif | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/colon.pnum.glif | 19 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/contents.plist | 100 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/divide.case.glif (renamed from src/Interface-Regular.ufo/glyphs/divide.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/e.glif | 54 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/emdash.case.glif (renamed from src/Interface-Regular.ufo/glyphs/emdash.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/endash.case.glif (renamed from src/Interface-Regular.ufo/glyphs/endash.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/equal.case.glif (renamed from src/Interface-Regular.ufo/glyphs/equal.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/figuredash.case.glif (renamed from src/Interface-Regular.ufo/glyphs/figuredash.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/hyphen.case.glif (renamed from src/Interface-Regular.ufo/glyphs/hyphen.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/hyphen.glif | 8 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/minus.case.glif (renamed from src/Interface-Regular.ufo/glyphs/minus.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/multiply.case.glif (renamed from src/Interface-Regular.ufo/glyphs/multiply.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/notequal.case.glif (renamed from src/Interface-Regular.ufo/glyphs/notequal.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/o.glif | 52 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/parenleft.case.glif (renamed from src/Interface-Regular.ufo/glyphs/parenleft.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/parenright.case.glif (renamed from src/Interface-Regular.ufo/glyphs/parenright.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/period.glif | 22 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/period.num.glif | 22 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/plus.case.glif (renamed from src/Interface-Regular.ufo/glyphs/plus.cap.glif) | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/plusminus.case.glif | 22 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/semicolon.glif | 2 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/two.tnum.glif | 18 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/uni20DB__.glif | 6 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/glyphs/uni20DC__.glif | 6 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/groups.plist | 3 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/kerning.plist | 249 | ||||
-rw-r--r-- | src/Interface-Regular.ufo/lib.plist | 100 | ||||
-rw-r--r-- | src/features.fea | 172 | ||||
-rw-r--r-- | src/glyphorder.txt | 1 |
80 files changed, 1164 insertions, 694 deletions
diff --git a/docs/lab/index.html b/docs/lab/index.html index 42b17c59d..64028872f 100644 --- a/docs/lab/index.html +++ b/docs/lab/index.html @@ -57,11 +57,16 @@ HAHBHCHDHEHFHGHHIHJHKHLHMHNHOHPHQHRHSHTHUHVHWHXHYHZH samples.set('Numbers', ` -0123456789 +0123456789 12:35 4:1 8-3 +3×5 ×9 8× 3x4 x9 2x +3−5 −5 8− 3+5 +5 3+ +3÷5 ÷5 8÷ 3±5 ±5 8± +3=5 =5 8= 3≠5 ≠5 8≠ +5 > 4 8 < 9 x ≤ z y ≥ z FFFFFF 000000 FF00 4296DE 3200 9000 198.3 5300 -12,385,900 43.2e9 --0 -1 -2 -3 -4 -5 -6 -7 -8 -9 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +12,385,900 43.2e9 0xA04D +−0 −1 −2 −3 −4 −5 −6 −7 −8 −9 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 00102030405060708090 10112131415161718191 @@ -74,6 +79,10 @@ FFFFFF 000000 FF00 4296DE 3200 9000 198.3 5300 80818283848586878898 90919293949596979899 +001020304050607080910112131415161 +171819202122324252627282930313233 +34353637383940414243445464748495 + .0.0.1.1.2.2.3.3.4.4.5.5.6.6.7.7.8.8.9.9. ,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9, :0:0:1:1:2:2:3:3:4:4:5:5:6:6:7:7:8:8:9:9: @@ -111,16 +120,19 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fA fB fC fD fE fF fa fb fc fd fe ff samples.set('Contextual alternates', ` (m) (M) (6) [m] [M] [6] {m} {M} {6} m@n M@N -3x5 x5 8x 3×5 ×5 8× -3-5 -5 8- 3+5 +5 8+ -3÷5 ÷5 8÷ +3×5 ×9 8× 3x4 x9 2x +3−5 −5 8− 3+5 +5 3+ +3÷5 ÷5 8÷ 3±5 ±5 8± 3=5 =5 8= 3≠5 ≠5 8≠ +8*5 8 * 7 WALLPAPER* B-O B–O B‒O B—O M•N b-o b–o b‒o b—o m•n X→Y X←Y X↑Y X↓Y x→y x←y x↑y x↓y A → B ← C ↑ D ↓ E a → b ← c ↑ d ↓ e +12:35 +1.2 34.56.78.90.12 `) // From http://justanotherfoundry.com/generator @@ -977,7 +989,7 @@ document.head.appendChild(fontCSS) <select name="sample"></select> <label> - <input type="number" value="11" step="1" min="4" max="1024" name="size"> + <input type="number" value="13" step="1" min="4" max="1024" name="size"> <select name="weight" style="max-width:120px"> <!--option value="200">Thin (200)</option> <option value="300">Light (300)</option--> @@ -1099,7 +1111,7 @@ document.head.appendChild(fontCSS) <label><input type="checkbox" class="featopt" name="feat:tnum"> Enable tnum *</label> <!-- <label><input type="checkbox" class="featopt" name="feat:lnum"> Enable lnum</label> --> <!-- <label><input type="checkbox" class="featopt" name="feat:kern"> Enable kern</label> --> - <label><input type="checkbox" class="featopt" name="feat:case"> Enable case</label> + <label><input type="checkbox" class="featopt" name="feat:case"> Enable case *</label> <label><input type="checkbox" class="featopt" name="feat:calt=0"> <em>Disable</em> calt *</label> <label><input type="checkbox" class="featopt" name="feat:zero"> Enable (slashed) zero *</label> <!-- <label><input type="checkbox" class="featopt" name="feat:c2sc"> Enable c2sc</label> --> @@ -1109,7 +1121,7 @@ document.head.appendChild(fontCSS) <label><input type="checkbox" class="featopt" name="feat:ss04"> Enable Stylistic set 4</label> <label><input type="checkbox" class="featopt" name="feat:ss05"> Enable Stylistic set 5</label> <label><input type="checkbox" class="featopt" name="feat:ss06"> Enable Stylistic set 6</label> - <label><input type="checkbox" class="featopt" name="feat:salt"> Enable Stylistic alternates</label> + <!-- <label><input type="checkbox" class="featopt" name="feat:salt"> Enable Stylistic alternates</label> --> <small>* currently implemented</small> </div> diff --git a/src/Interface-Bold.ufo/glyphs/arrowdown.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowdown.case.glif index e810de37e..6fc0efb86 100644 --- a/src/Interface-Bold.ufo/glyphs/arrowdown.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/arrowdown.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowdown.cap" format="1"> +<glyph name="arrowdown.case" format="1"> <advance width="1792"/> <outline> <component base="arrowdown" yOffset="256"/> diff --git a/src/Interface-Bold.ufo/glyphs/arrowleft.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowleft.case.glif index 4e47e2c68..a37c5ed1d 100644 --- a/src/Interface-Bold.ufo/glyphs/arrowleft.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/arrowleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowleft.cap" format="1"> +<glyph name="arrowleft.case" format="1"> <advance width="3072"/> <outline> <component base="arrowleft" yOffset="192"/> diff --git a/src/Interface-Bold.ufo/glyphs/arrowright.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowright.case.glif index 6a425e5f1..51c6bde9a 100644 --- a/src/Interface-Bold.ufo/glyphs/arrowright.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/arrowright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowright.cap" format="1"> +<glyph name="arrowright.case" format="1"> <advance width="3072"/> <outline> <component base="arrowright" yOffset="192"/> diff --git a/src/Interface-Bold.ufo/glyphs/arrowup.cap.glif b/src/Interface-Bold.ufo/glyphs/arrowup.case.glif index 26d1be020..62f7132cd 100644 --- a/src/Interface-Bold.ufo/glyphs/arrowup.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/arrowup.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowup.cap" format="1"> +<glyph name="arrowup.case" format="1"> <advance width="1792"/> <outline> <component base="arrowup" yOffset="256"/> diff --git a/src/Interface-Bold.ufo/glyphs/asterisk.case.glif b/src/Interface-Bold.ufo/glyphs/asterisk.case.glif new file mode 100644 index 000000000..204b52883 --- /dev/null +++ b/src/Interface-Bold.ufo/glyphs/asterisk.case.glif @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="asterisk.case" format="1"> + <advance width="1536"/> + <note> + Recipe: + 1. make horizontal rect + 2. copy rect and paste + 3. rotate by 60 deg + 4. enter transform mode and center it + 5. copy the rotated piece and paste + 6. flip on vertical axis + 7. enter transform mode and center it + </note> + <outline> + <contour> + <point x="552" y="408" type="line"/> + <point x="760" y="788" type="line"/> + <point x="776" y="788" type="line"/> + <point x="984" y="408" type="line"/> + <point x="1192" y="528" type="line"/> + <point x="968" y="900" type="line"/> + <point x="976" y="916" type="line"/> + <point x="1408" y="904" type="line"/> + <point x="1408" y="1144" type="line"/> + <point x="976" y="1132" type="line"/> + <point x="968" y="1148" type="line"/> + <point x="1192" y="1520" type="line"/> + <point x="984" y="1640" type="line"/> + <point x="776" y="1256" type="line"/> + <point x="760" y="1256" type="line"/> + <point x="552" y="1640" type="line"/> + <point x="344" y="1520" type="line"/> + <point x="572" y="1148" type="line"/> + <point x="564" y="1132" type="line"/> + <point x="128" y="1144" type="line"/> + <point x="128" y="904" type="line"/> + <point x="564" y="916" type="line"/> + <point x="572" y="900" type="line"/> + <point x="344" y="528" type="line"/> + </contour> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.guides</key> + <array> + <dict> + <key>angle</key> + <real>90.0</real> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>name</key> + <string></string> + <key>x</key> + <integer>768</integer> + <key>y</key> + <integer>636</integer> + </dict> + <dict> + <key>angle</key> + <integer>0</integer> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>name</key> + <string></string> + <key>x</key> + <integer>1516</integer> + <key>y</key> + <integer>1024</integer> + </dict> + </array> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.94</real> + <real>0.94</real> + <real>0.94</real> + <real>1.0</real> + </array> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Bold.ufo/glyphs/at.cap.glif b/src/Interface-Bold.ufo/glyphs/at.case.glif index 61dd4aba1..71c6701f0 100644 --- a/src/Interface-Bold.ufo/glyphs/at.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/at.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="at.cap" format="1"> +<glyph name="at.case" format="1"> <advance width="2816"/> <outline> <component base="at" yOffset="284"/> diff --git a/src/Interface-Bold.ufo/glyphs/braceleft.cap.glif b/src/Interface-Bold.ufo/glyphs/braceleft.case.glif index 2ca6681ec..fd8df57fd 100644 --- a/src/Interface-Bold.ufo/glyphs/braceleft.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/braceleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="braceleft.cap" format="1"> +<glyph name="braceleft.case" format="1"> <advance width="1024"/> <outline> <component base="braceleft" yOffset="172"/> diff --git a/src/Interface-Bold.ufo/glyphs/braceright.cap.glif b/src/Interface-Bold.ufo/glyphs/braceright.case.glif index ce4fcee57..accaf9f5e 100644 --- a/src/Interface-Bold.ufo/glyphs/braceright.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/braceright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="braceright.cap" format="1"> +<glyph name="braceright.case" format="1"> <advance width="1024"/> <outline> <component base="braceright" yOffset="172"/> diff --git a/src/Interface-Bold.ufo/glyphs/bracketleft.cap.glif b/src/Interface-Bold.ufo/glyphs/bracketleft.case.glif index 63d4d79be..97485601d 100644 --- a/src/Interface-Bold.ufo/glyphs/bracketleft.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/bracketleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="bracketleft.cap" format="1"> +<glyph name="bracketleft.case" format="1"> <advance width="1024"/> <outline> <component base="bracketleft" yOffset="64"/> diff --git a/src/Interface-Bold.ufo/glyphs/bracketright.cap.glif b/src/Interface-Bold.ufo/glyphs/bracketright.case.glif index 4188085f5..46f0a9c66 100644 --- a/src/Interface-Bold.ufo/glyphs/bracketright.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/bracketright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="bracketright.cap" format="1"> +<glyph name="bracketright.case" format="1"> <advance width="1024"/> <outline> <component base="bracketright" yOffset="64"/> diff --git a/src/Interface-Bold.ufo/glyphs/bullet.cap.glif b/src/Interface-Bold.ufo/glyphs/bullet.case.glif index a655c61c9..0c443ebf5 100644 --- a/src/Interface-Bold.ufo/glyphs/bullet.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/bullet.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="bullet.cap" format="1"> +<glyph name="bullet.case" format="1"> <advance width="1024"/> <outline> <component base="bullet" yOffset="128"/> diff --git a/src/Interface-Bold.ufo/glyphs/colon.case.glif b/src/Interface-Bold.ufo/glyphs/colon.case.glif new file mode 100644 index 000000000..16fd4a401 --- /dev/null +++ b/src/Interface-Bold.ufo/glyphs/colon.case.glif @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="colon.case" format="1"> + <advance width="856"/> + <outline> + <component base="period" xOffset="44" yOffset="288"/> + <component base="period" xOffset="44" yOffset="1296"/> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.94</real> + <real>0.94</real> + <real>0.94</real> + <real>1.0</real> + </array> + <key>interface.gridadjust.original</key> + <string>{'width': 828, 'leftMargin': 141, 'rightMargin': 195}</string> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Bold.ufo/glyphs/colon.glif b/src/Interface-Bold.ufo/glyphs/colon.glif index a95a56578..e3cbb3fa0 100644 --- a/src/Interface-Bold.ufo/glyphs/colon.glif +++ b/src/Interface-Bold.ufo/glyphs/colon.glif @@ -4,7 +4,7 @@ <unicode hex="003A"/> <outline> <component base="period" xOffset="-4"/> - <component base="period" xOffset="-4" yOffset="1096"/> + <component base="period" xOffset="-4" yOffset="1032"/> </outline> <lib> <dict> diff --git a/src/Interface-Bold.ufo/glyphs/colon.pnum.glif b/src/Interface-Bold.ufo/glyphs/colon.pnum.glif deleted file mode 100644 index 1d1890418..000000000 --- a/src/Interface-Bold.ufo/glyphs/colon.pnum.glif +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="colon.pnum" format="1"> - <advance width="768"/> - <unicode hex="EE01"/> - <outline> - <component base="period" xOffset="-4" yOffset="260"/> - <component base="period" xOffset="-4" yOffset="1356"/> - </outline> - <lib> - <dict> - <key>interface.gridadjust.original</key> - <string>{'width': 828, 'leftMargin': 141, 'rightMargin': 195}</string> - </dict> - </lib> -</glyph> diff --git a/src/Interface-Bold.ufo/glyphs/contents.plist b/src/Interface-Bold.ufo/glyphs/contents.plist index 9647887a1..7564eb680 100644 --- a/src/Interface-Bold.ufo/glyphs/contents.plist +++ b/src/Interface-Bold.ufo/glyphs/contents.plist @@ -398,8 +398,8 @@ <string>archdblsubnosp.glif</string> <key>arrowdown</key> <string>arrowdown.glif</string> - <key>arrowdown.cap</key> - <string>arrowdown.cap.glif</string> + <key>arrowdown.case</key> + <string>arrowdown.case.glif</string> <key>arrowheaddownmod</key> <string>arrowheaddownmod.glif</string> <key>arrowheadleftmod</key> @@ -410,16 +410,16 @@ <string>arrowheadupmod.glif</string> <key>arrowleft</key> <string>arrowleft.glif</string> - <key>arrowleft.cap</key> - <string>arrowleft.cap.glif</string> + <key>arrowleft.case</key> + <string>arrowleft.case.glif</string> <key>arrowright</key> <string>arrowright.glif</string> - <key>arrowright.cap</key> - <string>arrowright.cap.glif</string> + <key>arrowright.case</key> + <string>arrowright.case.glif</string> <key>arrowup</key> <string>arrowup.glif</string> - <key>arrowup.cap</key> - <string>arrowup.cap.glif</string> + <key>arrowup.case</key> + <string>arrowup.case.glif</string> <key>asciicircum</key> <string>asciicircum.glif</string> <key>asciitilde</key> @@ -434,12 +434,14 @@ <string>ascriptturn_uni02DE__.glif</string> <key>asterisk</key> <string>asterisk.glif</string> + <key>asterisk.case</key> + <string>asterisk.case.glif</string> <key>asterism</key> <string>asterism.glif</string> <key>at</key> <string>at.glif</string> - <key>at.cap</key> - <string>at.cap.glif</string> + <key>at.case</key> + <string>at.case.glif</string> <key>aturn</key> <string>aturn.glif</string> <key>aturn_uni02DE</key> @@ -478,20 +480,20 @@ <string>blackleftpointingtriangle.glif</string> <key>braceleft</key> <string>braceleft.glif</string> - <key>braceleft.cap</key> - <string>braceleft.cap.glif</string> + <key>braceleft.case</key> + <string>braceleft.case.glif</string> <key>braceright</key> <string>braceright.glif</string> - <key>braceright.cap</key> - <string>braceright.cap.glif</string> + <key>braceright.case</key> + <string>braceright.case.glif</string> <key>bracketleft</key> <string>bracketleft.glif</string> - <key>bracketleft.cap</key> - <string>bracketleft.cap.glif</string> + <key>bracketleft.case</key> + <string>bracketleft.case.glif</string> <key>bracketright</key> <string>bracketright.glif</string> - <key>bracketright.cap</key> - <string>bracketright.cap.glif</string> + <key>bracketright.case</key> + <string>bracketright.case.glif</string> <key>breve</key> <string>breve.glif</string> <key>breveacutecomb</key> @@ -524,8 +526,8 @@ <string>btopbar.glif</string> <key>bullet</key> <string>bullet.glif</string> - <key>bullet.cap</key> - <string>bullet.cap.glif</string> + <key>bullet.case</key> + <string>bullet.case.glif</string> <key>bullseye</key> <string>bullseye.glif</string> <key>c</key> @@ -596,8 +598,8 @@ <string>circumflextildecomb.glif</string> <key>colon</key> <string>colon.glif</string> - <key>colon.pnum</key> - <string>colon.pnum.glif</string> + <key>colon.case</key> + <string>colon.case.glif</string> <key>coloncurrency</key> <string>coloncurrency.glif</string> <key>colontriangularhalfmod</key> @@ -716,8 +718,8 @@ <string>digamma.glif</string> <key>divide</key> <string>divide.glif</string> - <key>divide.cap</key> - <string>divide.cap.glif</string> + <key>divide.case</key> + <string>divide.case.glif</string> <key>djecyrillic</key> <string>djecyrillic.glif</string> <key>dollar</key> @@ -792,8 +794,8 @@ <string>emcyrillic.glif</string> <key>emdash</key> <string>emdash.glif</string> - <key>emdash.cap</key> - <string>emdash.cap.glif</string> + <key>emdash.case</key> + <string>emdash.case.glif</string> <key>emquad</key> <string>emquad.glif</string> <key>emspace</key> @@ -802,8 +804,8 @@ <string>encyrillic.glif</string> <key>endash</key> <string>endash.glif</string> - <key>endash.cap</key> - <string>endash.cap.glif</string> + <key>endash.case</key> + <string>endash.case.glif</string> <key>endescendercyrillic</key> <string>endescendercyrillic.glif</string> <key>eng</key> @@ -834,8 +836,8 @@ <string>epsilonclosed.glif</string> <key>equal</key> <string>equal.glif</string> - <key>equal.cap</key> - <string>equal.cap.glif</string> + <key>equal.case</key> + <string>equal.case.glif</string> <key>equalsub</key> <string>equalsub.glif</string> <key>equalsuperior</key> @@ -880,8 +882,8 @@ <string>f.glif</string> <key>figuredash</key> <string>figuredash.glif</string> - <key>figuredash.cap</key> - <string>figuredash.cap.glif</string> + <key>figuredash.case</key> + <string>figuredash.case.glif</string> <key>figurespace</key> <string>figurespace.glif</string> <key>finalkaf</key> @@ -1042,8 +1044,8 @@ <string>hv.glif</string> <key>hyphen</key> <string>hyphen.glif</string> - <key>hyphen.cap</key> - <string>hyphen.cap.glif</string> + <key>hyphen.case</key> + <string>hyphen.case.glif</string> <key>hyphen__</key> <string>hyphen__.glif</string> <key>hyphenbullet</key> @@ -1214,8 +1216,8 @@ <string>mill.glif</string> <key>minus</key> <string>minus.glif</string> - <key>minus.cap</key> - <string>minus.cap.glif</string> + <key>minus.case</key> + <string>minus.case.glif</string> <key>minusmod</key> <string>minusmod.glif</string> <key>minussub</key> @@ -1232,8 +1234,8 @@ <string>mu.glif</string> <key>multiply</key> <string>multiply.glif</string> - <key>multiply.cap</key> - <string>multiply.cap.glif</string> + <key>multiply.case</key> + <string>multiply.case.glif</string> <key>n</key> <string>n.glif</string> <key>naira</key> @@ -1260,8 +1262,8 @@ <string>nlfthook.glif</string> <key>notequal</key> <string>notequal.glif</string> - <key>notequal.cap</key> - <string>notequal.cap.glif</string> + <key>notequal.case</key> + <string>notequal.case.glif</string> <key>nrthook</key> <string>nrthook.glif</string> <key>nsuperior</key> @@ -1354,16 +1356,16 @@ <string>paragraph.glif</string> <key>parenleft</key> <string>parenleft.glif</string> - <key>parenleft.cap</key> - <string>parenleft.cap.glif</string> + <key>parenleft.case</key> + <string>parenleft.case.glif</string> <key>parenleftinferior</key> <string>parenleftinferior.glif</string> <key>parenleftsuperior</key> <string>parenleftsuperior.glif</string> <key>parenright</key> <string>parenright.glif</string> - <key>parenright.cap</key> - <string>parenright.cap.glif</string> + <key>parenright.case</key> + <string>parenright.case.glif</string> <key>parenrightsub</key> <string>parenrightsub.glif</string> <key>parenrightsuperior</key> @@ -1378,6 +1380,8 @@ <string>percent.glif</string> <key>period</key> <string>period.glif</string> + <key>period.num</key> + <string>period.num.glif</string> <key>periodcentered</key> <string>periodcentered.glif</string> <key>perispomenigreekcmb</key> @@ -1414,10 +1418,12 @@ <string>placeofinterestsign.glif</string> <key>plus</key> <string>plus.glif</string> - <key>plus.cap</key> - <string>plus.cap.glif</string> + <key>plus.case</key> + <string>plus.case.glif</string> <key>plusminus</key> <string>plusminus.glif</string> + <key>plusminus.case</key> + <string>plusminus.case.glif</string> <key>plusmod</key> <string>plusmod.glif</string> <key>plussub</key> diff --git a/src/Interface-Bold.ufo/glyphs/divide.cap.glif b/src/Interface-Bold.ufo/glyphs/divide.case.glif index ff388f899..ca19eae38 100644 --- a/src/Interface-Bold.ufo/glyphs/divide.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/divide.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="divide.cap" format="1"> +<glyph name="divide.case" format="1"> <advance width="1792"/> <outline> <component base="divide" yOffset="80"/> diff --git a/src/Interface-Bold.ufo/glyphs/emdash.cap.glif b/src/Interface-Bold.ufo/glyphs/emdash.case.glif index d74d6ca0b..9d2a7fdce 100644 --- a/src/Interface-Bold.ufo/glyphs/emdash.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/emdash.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="emdash.cap" format="1"> +<glyph name="emdash.case" format="1"> <advance width="2560"/> <outline> <component base="emdash" yOffset="160"/> diff --git a/src/Interface-Bold.ufo/glyphs/endash.cap.glif b/src/Interface-Bold.ufo/glyphs/endash.case.glif index f66734d31..876cdfadf 100644 --- a/src/Interface-Bold.ufo/glyphs/endash.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/endash.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="endash.cap" format="1"> +<glyph name="endash.case" format="1"> <advance width="1792"/> <outline> <component base="endash" yOffset="160"/> diff --git a/src/Interface-Bold.ufo/glyphs/equal.cap.glif b/src/Interface-Bold.ufo/glyphs/equal.case.glif index 1f7a12897..1c5c5e9a9 100644 --- a/src/Interface-Bold.ufo/glyphs/equal.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/equal.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="equal.cap" format="1"> +<glyph name="equal.case" format="1"> <advance width="1536"/> <outline> <component base="equal" yOffset="148"/> diff --git a/src/Interface-Bold.ufo/glyphs/figuredash.cap.glif b/src/Interface-Bold.ufo/glyphs/figuredash.case.glif index 90a77a850..499679184 100644 --- a/src/Interface-Bold.ufo/glyphs/figuredash.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/figuredash.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="figuredash.cap" format="1"> +<glyph name="figuredash.case" format="1"> <advance width="1792"/> <outline> <component base="figuredash" yOffset="160"/> diff --git a/src/Interface-Bold.ufo/glyphs/hyphen.cap.glif b/src/Interface-Bold.ufo/glyphs/hyphen.case.glif index 85cf43a31..4810d95c6 100644 --- a/src/Interface-Bold.ufo/glyphs/hyphen.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/hyphen.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="hyphen.cap" format="1"> +<glyph name="hyphen.case" format="1"> <advance width="1280"/> <outline> <component base="hyphen" yOffset="164"/> diff --git a/src/Interface-Bold.ufo/glyphs/minus.cap.glif b/src/Interface-Bold.ufo/glyphs/minus.case.glif index ef9defa32..a4170246b 100644 --- a/src/Interface-Bold.ufo/glyphs/minus.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/minus.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="minus.cap" format="1"> +<glyph name="minus.case" format="1"> <advance width="1536"/> <outline> <component base="minus" yOffset="48"/> diff --git a/src/Interface-Bold.ufo/glyphs/multiply.cap.glif b/src/Interface-Bold.ufo/glyphs/multiply.case.glif index bc3fb34c5..657252be9 100644 --- a/src/Interface-Bold.ufo/glyphs/multiply.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/multiply.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="multiply.cap" format="1"> +<glyph name="multiply.case" format="1"> <advance width="1536"/> <outline> <component base="multiply" yOffset="80"/> diff --git a/src/Interface-Bold.ufo/glyphs/notequal.cap.glif b/src/Interface-Bold.ufo/glyphs/notequal.case.glif index 99b7d2e83..767b685e5 100644 --- a/src/Interface-Bold.ufo/glyphs/notequal.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/notequal.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="notequal.cap" format="1"> +<glyph name="notequal.case" format="1"> <advance width="1536"/> <outline> <component base="notequal" yOffset="148"/> diff --git a/src/Interface-Bold.ufo/glyphs/parenleft.cap.glif b/src/Interface-Bold.ufo/glyphs/parenleft.case.glif index 29f4a0247..ca5d1de06 100644 --- a/src/Interface-Bold.ufo/glyphs/parenleft.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/parenleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="parenleft.cap" format="1"> +<glyph name="parenleft.case" format="1"> <advance width="1024"/> <outline> <component base="parenleft" yOffset="140"/> diff --git a/src/Interface-Bold.ufo/glyphs/parenright.cap.glif b/src/Interface-Bold.ufo/glyphs/parenright.case.glif index 3119a85d4..b0d9d0ed9 100644 --- a/src/Interface-Bold.ufo/glyphs/parenright.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/parenright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="parenright.cap" format="1"> +<glyph name="parenright.case" format="1"> <advance width="1024"/> <outline> <component base="parenright" yOffset="140"/> diff --git a/src/Interface-Bold.ufo/glyphs/period.glif b/src/Interface-Bold.ufo/glyphs/period.glif index 139a20dcd..eea76e7e1 100644 --- a/src/Interface-Bold.ufo/glyphs/period.glif +++ b/src/Interface-Bold.ufo/glyphs/period.glif @@ -4,9 +4,6 @@ <unicode hex="002E"/> <outline> <contour> - <point x="136" y="216" type="curve" smooth="yes"/> - <point x="136" y="84"/> - <point x="236" y="-16"/> <point x="384" y="-16" type="curve" smooth="yes"/> <point x="532" y="-16"/> <point x="632" y="84"/> @@ -16,6 +13,9 @@ <point x="384" y="452" type="curve" smooth="yes"/> <point x="236" y="452"/> <point x="136" y="348"/> + <point x="136" y="216" type="curve" smooth="yes"/> + <point x="136" y="84"/> + <point x="236" y="-16"/> </contour> </outline> <lib> diff --git a/src/Interface-Bold.ufo/glyphs/period.num.glif b/src/Interface-Bold.ufo/glyphs/period.num.glif new file mode 100644 index 000000000..402a97ff6 --- /dev/null +++ b/src/Interface-Bold.ufo/glyphs/period.num.glif @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="period.num" format="1"> + <advance width="936"/> + <outline> + <component base="period" xOffset="84"/> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.guides</key> + <array> + <dict> + <key>angle</key> + <real>0.0</real> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>x</key> + <real>0.0</real> + <key>y</key> + <real>1238.875</real> + </dict> + <dict> + <key>angle</key> + <real>0.0</real> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>x</key> + <real>0.0</real> + <key>y</key> + <real>763.125</real> + </dict> + </array> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.94</real> + <real>0.94</real> + <real>0.94</real> + <real>1.0</real> + </array> + <key>interface.gridadjust.original</key> + <string>{'width': 842, 'leftMargin': 165, 'rightMargin': 185}</string> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Bold.ufo/glyphs/plus.cap.glif b/src/Interface-Bold.ufo/glyphs/plus.case.glif index a22642015..170ba5cec 100644 --- a/src/Interface-Bold.ufo/glyphs/plus.cap.glif +++ b/src/Interface-Bold.ufo/glyphs/plus.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="plus.cap" format="1"> +<glyph name="plus.case" format="1"> <advance width="1536"/> <outline> <component base="plus" yOffset="172"/> diff --git a/src/Interface-Bold.ufo/glyphs/plusminus.case.glif b/src/Interface-Bold.ufo/glyphs/plusminus.case.glif new file mode 100644 index 000000000..13992f49f --- /dev/null +++ b/src/Interface-Bold.ufo/glyphs/plusminus.case.glif @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="plusminus.case" format="1"> + <advance width="1536"/> + <outline> + <component base="plusminus" yOffset="236"/> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.8</real> + <real>0.94</real> + <real>0.95</real> + <real>1.0</real> + </array> + <key>interface.gridadjust.original</key> + <string>{'width': 1515, 'leftMargin': 118, 'rightMargin': 137}</string> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Bold.ufo/glyphs/uni20DB__.glif b/src/Interface-Bold.ufo/glyphs/uni20DB__.glif index 137c33dde..327ee0950 100644 --- a/src/Interface-Bold.ufo/glyphs/uni20DB__.glif +++ b/src/Interface-Bold.ufo/glyphs/uni20DB__.glif @@ -3,12 +3,12 @@ <advance width="0"/> <unicode hex="20DB"/> <outline> - <contour> - <point x="-810" y="1609" type="move" name="_marktop"/> - </contour> <component base="period" xOffset="-1884" yOffset="1788"/> <component base="period" xOffset="-1218" yOffset="1788"/> <component base="period" xOffset="-558" yOffset="1788"/> + <contour> + <point x="-810" y="1609" type="move" name="_marktop"/> + </contour> </outline> <lib> <dict> diff --git a/src/Interface-Bold.ufo/glyphs/uni20DC__.glif b/src/Interface-Bold.ufo/glyphs/uni20DC__.glif index 511912b8b..9708798c1 100644 --- a/src/Interface-Bold.ufo/glyphs/uni20DC__.glif +++ b/src/Interface-Bold.ufo/glyphs/uni20DC__.glif @@ -3,13 +3,13 @@ <advance width="0"/> <unicode hex="20DC"/> <outline> - <contour> - <point x="-811" y="1609" type="move" name="_marktop"/> - </contour> <component base="period" xOffset="-2214" yOffset="1788"/> <component base="period" xOffset="-1548" yOffset="1788"/> <component base="period" xOffset="-888" yOffset="1788"/> <component base="period" xOffset="-231" yOffset="1788"/> + <contour> + <point x="-811" y="1609" type="move" name="_marktop"/> + </contour> </outline> <lib> <dict> diff --git a/src/Interface-Bold.ufo/groups.plist b/src/Interface-Bold.ufo/groups.plist index 421ac9523..d683587a3 100644 --- a/src/Interface-Bold.ufo/groups.plist +++ b/src/Interface-Bold.ufo/groups.plist @@ -370,6 +370,7 @@ <string>ellipsis</string> <string>comma</string> <string>period</string> + <string>period.num</string> </array> <key>@KERN_LEFT_dagger</key> <array> @@ -960,6 +961,7 @@ <key>@KERN_RIGHT_colon</key> <array> <string>colon</string> + <string>colon.case</string> <string>semicolon</string> </array> <key>@KERN_RIGHT_colon.case</key> @@ -971,6 +973,7 @@ <string>ellipsis</string> <string>comma</string> <string>period</string> + <string>period.num</string> </array> <key>@KERN_RIGHT_dagger</key> <array> diff --git a/src/Interface-Bold.ufo/kerning.plist b/src/Interface-Bold.ufo/kerning.plist index 8f643e808..62e4b2f58 100644 --- a/src/Interface-Bold.ufo/kerning.plist +++ b/src/Interface-Bold.ufo/kerning.plist @@ -2077,6 +2077,8 @@ <integer>-76</integer> <key>@KERN_RIGHT_Y</key> <integer>-192</integer> + <key>@KERN_RIGHT_c</key> + <integer>-4</integer> <key>@KERN_RIGHT_dagger</key> <integer>-14</integer> <key>@KERN_RIGHT_f</key> @@ -2142,142 +2144,10 @@ </dict> <key>@KERN_LEFT_comma</key> <dict> - <key>@KERN_RIGHT_C</key> - <integer>-158</integer> - <key>@KERN_RIGHT_Djecyrillic</key> - <integer>-247</integer> - <key>@KERN_RIGHT_Ecyrillic</key> - <integer>-132</integer> - <key>@KERN_RIGHT_Omicrongreek</key> - <integer>-159</integer> - <key>@KERN_RIGHT_T</key> - <integer>-247</integer> - <key>@KERN_RIGHT_U</key> - <integer>-116</integer> - <key>@KERN_RIGHT_Ucyrillic</key> - <integer>-89</integer> - <key>@KERN_RIGHT_V</key> - <integer>-304</integer> - <key>@KERN_RIGHT_W</key> - <integer>-304</integer> - <key>@KERN_RIGHT_Y</key> - <integer>-343</integer> - <key>@KERN_RIGHT_alphagreek</key> - <integer>-54</integer> - <key>@KERN_RIGHT_asciicircum</key> - <integer>-400</integer> - <key>@KERN_RIGHT_c</key> - <integer>-55</integer> - <key>@KERN_RIGHT_deltagreek</key> - <integer>-56</integer> - <key>@KERN_RIGHT_djecyrillic</key> - <integer>-22</integer> - <key>@KERN_RIGHT_ecyrillic</key> - <integer>-33</integer> - <key>@KERN_RIGHT_eight.sups</key> - <integer>-150</integer> - <key>@KERN_RIGHT_epsilongreek</key> - <integer>-54</integer> - <key>@KERN_RIGHT_etagreek</key> - <integer>-27</integer> - <key>@KERN_RIGHT_f</key> - <integer>-117</integer> - <key>@KERN_RIGHT_gammagreek</key> - <integer>-192</integer> - <key>@KERN_RIGHT_iotadieresisgreek</key> - <integer>-28</integer> - <key>@KERN_RIGHT_omegagreek</key> - <integer>-56</integer> - <key>@KERN_RIGHT_quotedbl</key> - <integer>-304</integer> - <key>@KERN_RIGHT_quotedblleft</key> - <integer>-441</integer> - <key>@KERN_RIGHT_quotedblright</key> - <integer>-358</integer> - <key>@KERN_RIGHT_six</key> - <integer>-131</integer> - <key>@KERN_RIGHT_t</key> - <integer>-28</integer> - <key>@KERN_RIGHT_v</key> - <integer>-192</integer> - <key>@KERN_RIGHT_w</key> - <integer>-192</integer> - <key>Psi</key> - <integer>-344</integer> - <key>Tbar</key> - <integer>-248</integer> - <key>afii10021</key> - <integer>27</integer> - <key>afii10025</key> - <integer>-29</integer> - <key>afii10038</key> - <integer>-68</integer> - <key>afii10041</key> - <integer>-221</integer> - <key>afii10044</key> - <integer>-249</integer> - <key>afii10047</key> - <integer>-104</integer> - <key>afii10049</key> - <integer>-27</integer> - <key>ampersand</key> - <integer>-48</integer> - <key>backslash</key> - <integer>-118</integer> - <key>becyrillic</key> - <integer>-56</integer> - <key>checyrillic</key> - <integer>-164</integer> - <key>decyrillic</key> - <integer>54</integer> - <key>eight</key> - <integer>-117</integer> - <key>ereversedcyrillic</key> - <integer>-29</integer> - <key>five</key> - <integer>-86</integer> - <key>four</key> - <integer>-41</integer> - <key>hardsigncyrillic</key> - <integer>-104</integer> - <key>hryvnia</key> - <integer>-48</integer> - <key>iacyrillic</key> - <integer>-21</integer> - <key>nine</key> - <integer>-117</integer> - <key>nine.1</key> - <integer>-117</integer> - <key>one</key> - <integer>-144</integer> - <key>pi</key> - <integer>-29</integer> - <key>rho</key> - <integer>-54</integer> - <key>seven</key> - <integer>-29</integer> - <key>slash</key> - <integer>116</integer> - <key>tau</key> - <integer>-29</integer> - <key>tbar</key> - <integer>-48</integer> - <key>tecyrillic</key> - <integer>-152</integer> - <key>tenge</key> - <integer>-206</integer> - <key>theta</key> - <integer>-55</integer> - <key>three</key> - <integer>-84</integer> - <key>two</key> - <integer>-29</integer> - <key>xi</key> - <integer>-54</integer> - <key>zecyrillic</key> - <integer>-27</integer> - <key>zeta</key> - <integer>-55</integer> + <key>quotedblreversed</key> + <integer>-128</integer> + <key>quotereversed</key> + <integer>-128</integer> </dict> <key>@KERN_LEFT_dagger</key> <dict> @@ -3328,7 +3198,7 @@ <key>@KERN_RIGHT_colon.case</key> <integer>-22</integer> <key>@KERN_RIGHT_comma</key> - <integer>-144</integer> + <integer>-128</integer> <key>@KERN_RIGHT_eight.subs</key> <integer>-28</integer> <key>@KERN_RIGHT_gammagreek</key> @@ -4357,8 +4227,17 @@ <key>seven</key> <integer>-15</integer> </dict> + <key>A</key> + <dict> + <key>asterisk.case</key> + <integer>-128</integer> + <key>space</key> + <integer>0</integer> + </dict> <key>Delta</key> <dict> + <key>asterisk.case</key> + <integer>-128</integer> <key>eth</key> <integer>-21</integer> </dict> @@ -4456,6 +4335,11 @@ <key>@KERN_RIGHT_eight.sups</key> <integer>63</integer> </dict> + <key>K</key> + <dict> + <key>asterisk.case</key> + <integer>-128</integer> + </dict> <key>Kappa</key> <dict> <key>tbar</key> @@ -4463,6 +4347,8 @@ </dict> <key>L</key> <dict> + <key>asterisk.case</key> + <integer>-96</integer> <key>quotedblreversed</key> <integer>-128</integer> <key>quotereversed</key> @@ -4470,6 +4356,8 @@ </dict> <key>Lambda</key> <dict> + <key>asterisk.case</key> + <integer>-128</integer> <key>eth</key> <integer>-21</integer> </dict> @@ -4636,6 +4524,8 @@ <integer>-62</integer> <key>@KERN_RIGHT_six</key> <integer>-13</integer> + <key>asterisk.case</key> + <integer>-128</integer> <key>four</key> <integer>-33</integer> <key>less</key> @@ -4653,6 +4543,11 @@ <key>zeta</key> <integer>-77</integer> </dict> + <key>T</key> + <dict> + <key>asterisk.case</key> + <integer>-64</integer> + </dict> <key>Tbar</key> <dict> <key>@KERN_RIGHT_A</key> @@ -4752,6 +4647,21 @@ <key>idieresisacute</key> <integer>220</integer> </dict> + <key>V</key> + <dict> + <key>asterisk.case</key> + <integer>-128</integer> + </dict> + <key>W</key> + <dict> + <key>asterisk.case</key> + <integer>-48</integer> + </dict> + <key>Y</key> + <dict> + <key>asterisk.case</key> + <integer>-160</integer> + </dict> <key>afii10018</key> <dict> <key>@KERN_RIGHT_Djecyrillic</key> @@ -5101,6 +5011,25 @@ <key>tenge</key> <integer>-20</integer> </dict> + <key>asterisk.case</key> + <dict> + <key>A</key> + <integer>-128</integer> + <key>Delta</key> + <integer>-128</integer> + <key>Lambda</key> + <integer>-128</integer> + <key>Sigma</key> + <integer>-96</integer> + <key>T</key> + <integer>-64</integer> + <key>V</key> + <integer>-128</integer> + <key>W</key> + <integer>-48</integer> + <key>Y</key> + <integer>-160</integer> + </dict> <key>at</key> <dict> <key>@KERN_RIGHT_AE</key> @@ -5239,6 +5168,11 @@ <key>@KERN_RIGHT_quotedblleft</key> <integer>-63</integer> </dict> + <key>colon.case</key> + <dict> + <key>seven</key> + <integer>-20</integer> + </dict> <key>comma</key> <dict> <key>quotedblreversed</key> @@ -5263,6 +5197,8 @@ <dict> <key>two</key> <integer>-48</integer> + <key>zero.tnum</key> + <integer>0</integer> </dict> <key>emdash</key> <dict> @@ -5782,6 +5718,10 @@ <integer>-160</integer> <key>nine.1</key> <integer>-112</integer> + <key>period</key> + <integer>-272</integer> + <key>period.num</key> + <integer>-272</integer> <key>slash</key> <integer>-240</integer> <key>three</key> @@ -5859,9 +5799,52 @@ </dict> <key>period</key> <dict> - <key>quotedblreversed</key> + <key>eight</key> + <integer>-112</integer> + <key>five</key> + <integer>-80</integer> + <key>nine</key> + <integer>-112</integer> + <key>nine.1</key> + <integer>-176</integer> + <key>one</key> + <integer>-112</integer> + <key>seven</key> + <integer>-96</integer> + <key>six</key> + <integer>-96</integer> + <key>six.1</key> + <integer>-96</integer> + <key>three</key> + <integer>-96</integer> + <key>zero</key> <integer>-128</integer> - <key>quotereversed</key> + </dict> + <key>period.num</key> + <dict> + <key>eight</key> + <integer>-109</integer> + <key>five</key> + <integer>-78</integer> + <key>four</key> + <integer>-32</integer> + <key>four.1</key> + <integer>0</integer> + <key>nine</key> + <integer>-112</integer> + <key>nine.1</key> + <integer>-176</integer> + <key>one</key> + <integer>-112</integer> + <key>seven</key> + <integer>-32</integer> + <key>six</key> + <integer>-96</integer> + <key>six.1</key> + <integer>-96</integer> + <key>three</key> + <integer>-96</integer> + <key>zero</key> <integer>-128</integer> </dict> <key>periodcentered</key> @@ -6151,6 +6134,8 @@ <integer>-240</integer> <key>slash</key> <integer>-61</integer> + <key>space</key> + <integer>0</integer> <key>theta</key> <integer>-84</integer> <key>three</key> @@ -6507,6 +6492,17 @@ <key>nine.1</key> <integer>-82</integer> </dict> + <key>three.tnum</key> + <dict> + <key>nine</key> + <integer>0</integer> + <key>six.tnum</key> + <integer>0</integer> + <key>six.tnum.1</key> + <integer>0</integer> + <key>zero.tnum</key> + <integer>0</integer> + </dict> <key>two</key> <dict> <key>@KERN_RIGHT_Ucyrillic</key> diff --git a/src/Interface-Bold.ufo/lib.plist b/src/Interface-Bold.ufo/lib.plist index ed9627445..0b8542862 100644 --- a/src/Interface-Bold.ufo/lib.plist +++ b/src/Interface-Bold.ufo/lib.plist @@ -508,19 +508,19 @@ <string>question</string> <string>questiondown</string> <string>parenleft</string> - <string>parenleft.cap</string> + <string>parenleft.case</string> <string>parenright</string> - <string>parenright.cap</string> + <string>parenright.case</string> <string>bracketleft</string> - <string>bracketleft.cap</string> + <string>bracketleft.case</string> <string>bracketright</string> - <string>bracketright.cap</string> + <string>bracketright.case</string> <string>braceleft</string> - <string>braceleft.cap</string> + <string>braceleft.case</string> <string>braceright</string> - <string>braceright.cap</string> + <string>braceright.case</string> <string>at</string> - <string>at.cap</string> + <string>at.case</string> <string>numbersign</string> <string>currency</string> <string>slash</string> @@ -529,15 +529,15 @@ <string>backslash</string> <string>hyphenbullet</string> <string>hyphen</string> - <string>hyphen.cap</string> + <string>hyphen.case</string> <string>endash</string> - <string>endash.cap</string> + <string>endash.case</string> <string>figuredash</string> - <string>figuredash.cap</string> + <string>figuredash.case</string> <string>emdash</string> - <string>emdash.cap</string> + <string>emdash.case</string> <string>bullet</string> - <string>bullet.cap</string> + <string>bullet.case</string> <string>quoteleft</string> <string>quoteright</string> <string>primetripl1</string> @@ -549,8 +549,10 @@ <string>quotesinglbase</string> <string>comma</string> <string>period</string> + <string>period.num</string> <string>ellipsis</string> <string>colon</string> + <string>colon.case</string> <string>semicolon</string> <string>guilsinglleft</string> <string>guilsinglright</string> @@ -561,18 +563,19 @@ <string>lessequal</string> <string>greaterequal</string> <string>equal</string> - <string>equal.cap</string> + <string>equal.case</string> <string>notequal</string> - <string>notequal.cap</string> + <string>notequal.case</string> <string>plus</string> - <string>plus.cap</string> + <string>plus.case</string> <string>minus</string> - <string>minus.cap</string> + <string>minus.case</string> <string>multiply</string> - <string>multiply.cap</string> + <string>multiply.case</string> <string>divide</string> - <string>divide.cap</string> + <string>divide.case</string> <string>plusminus</string> + <string>plusminus.case</string> <string>approxequal</string> <string>asciitilde</string> <string>logicalnot</string> @@ -584,6 +587,7 @@ <string>daggerdbl</string> <string>asciicircum</string> <string>asterisk</string> + <string>asterisk.case</string> <string>registered</string> <string>trademark</string> <string>servicemark</string> @@ -692,13 +696,13 @@ <string>hairspace</string> <string>zerowidthspace</string> <string>arrowleft</string> - <string>arrowleft.cap</string> + <string>arrowleft.case</string> <string>arrowup</string> - <string>arrowup.cap</string> + <string>arrowup.case</string> <string>arrowright</string> - <string>arrowright.cap</string> + <string>arrowright.case</string> <string>arrowdown</string> - <string>arrowdown.cap</string> + <string>arrowdown.case</string> <string>triagrt</string> <string>triagdn</string> <string>triagup</string> @@ -1861,7 +1865,6 @@ <string>uni1AB9</string> <string>uni1AB8</string> <string>uni1D61</string> - <string>colon.pnum</string> <string>glottalstopbarrev</string> <string>uni1D66</string> <string>cyrillichook</string> @@ -2727,19 +2730,19 @@ <string>question</string> <string>questiondown</string> <string>parenleft</string> - <string>parenleft.cap</string> + <string>parenleft.case</string> <string>parenright</string> - <string>parenright.cap</string> + <string>parenright.case</string> <string>bracketleft</string> - <string>bracketleft.cap</string> + <string>bracketleft.case</string> <string>bracketright</string> - <string>bracketright.cap</string> + <string>bracketright.case</string> <string>braceleft</string> - <string>braceleft.cap</string> + <string>braceleft.case</string> <string>braceright</string> - <string>braceright.cap</string> + <string>braceright.case</string> <string>at</string> - <string>at.cap</string> + <string>at.case</string> <string>numbersign</string> <string>currency</string> <string>slash</string> @@ -2748,15 +2751,15 @@ <string>backslash</string> <string>hyphenbullet</string> <string>hyphen</string> - <string>hyphen.cap</string> + <string>hyphen.case</string> <string>endash</string> - <string>endash.cap</string> + <string>endash.case</string> <string>figuredash</string> - <string>figuredash.cap</string> + <string>figuredash.case</string> <string>emdash</string> - <string>emdash.cap</string> + <string>emdash.case</string> <string>bullet</string> - <string>bullet.cap</string> + <string>bullet.case</string> <string>quoteleft</string> <string>quoteright</string> <string>primetripl1</string> @@ -2768,8 +2771,10 @@ <string>quotesinglbase</string> <string>comma</string> <string>period</string> + <string>period.num</string> <string>ellipsis</string> <string>colon</string> + <string>colon.case</string> <string>semicolon</string> <string>guilsinglleft</string> <string>guilsinglright</string> @@ -2780,18 +2785,19 @@ <string>lessequal</string> <string>greaterequal</string> <string>equal</string> - <string>equal.cap</string> + <string>equal.case</string> <string>notequal</string> - <string>notequal.cap</string> + <string>notequal.case</string> <string>plus</string> - <string>plus.cap</string> + <string>plus.case</string> <string>minus</string> - <string>minus.cap</string> + <string>minus.case</string> <string>multiply</string> - <string>multiply.cap</string> + <string>multiply.case</string> <string>divide</string> - <string>divide.cap</string> + <string>divide.case</string> <string>plusminus</string> + <string>plusminus.case</string> <string>approxequal</string> <string>asciitilde</string> <string>logicalnot</string> @@ -2803,6 +2809,7 @@ <string>daggerdbl</string> <string>asciicircum</string> <string>asterisk</string> + <string>asterisk.case</string> <string>registered</string> <string>trademark</string> <string>servicemark</string> @@ -2911,13 +2918,13 @@ <string>hairspace</string> <string>zerowidthspace</string> <string>arrowleft</string> - <string>arrowleft.cap</string> + <string>arrowleft.case</string> <string>arrowup</string> - <string>arrowup.cap</string> + <string>arrowup.case</string> <string>arrowright</string> - <string>arrowright.cap</string> + <string>arrowright.case</string> <string>arrowdown</string> - <string>arrowdown.cap</string> + <string>arrowdown.case</string> <string>triagrt</string> <string>triagdn</string> <string>triagup</string> @@ -4080,7 +4087,6 @@ <string>uni1AB9</string> <string>uni1AB8</string> <string>uni1D61</string> - <string>colon.pnum</string> <string>glottalstopbarrev</string> <string>uni1D66</string> <string>cyrillichook</string> diff --git a/src/Interface-Regular.ufo/features.fea b/src/Interface-Regular.ufo/features.fea index 0a80632fd..2ac1bc2c7 100644 --- a/src/Interface-Regular.ufo/features.fea +++ b/src/Interface-Regular.ufo/features.fea @@ -1,7 +1,7 @@ include(../features.fea); -@TNUM_L = [one seven four.1 six.1 nine.1]; -@TNUM_R = [one.tnum seven.tnum four.tnum.1 six.tnum.1 nine.tnum.1]; +@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]; feature tnum { sub @TNUM_L by @TNUM_R; diff --git a/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowdown.case.glif index 1135c16e1..6a2c90ab6 100644 --- a/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/arrowdown.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowdown.cap" format="1"> +<glyph name="arrowdown.case" format="1"> <advance width="1792"/> <outline> <component base="arrowdown" yOffset="256"/> diff --git a/src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowleft.case.glif index 5df173709..bfbb1008d 100644 --- a/src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/arrowleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowleft.cap" format="1"> +<glyph name="arrowleft.case" format="1"> <advance width="3072"/> <outline> <component base="arrowleft" yOffset="128"/> diff --git a/src/Interface-Regular.ufo/glyphs/arrowright.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowright.case.glif index 5371d1042..cad231432 100644 --- a/src/Interface-Regular.ufo/glyphs/arrowright.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/arrowright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowright.cap" format="1"> +<glyph name="arrowright.case" format="1"> <advance width="3072.0"/> <outline> <component base="arrowright" yOffset="128"/> diff --git a/src/Interface-Regular.ufo/glyphs/arrowup.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowup.case.glif index 8e8a3743b..f5001d609 100644 --- a/src/Interface-Regular.ufo/glyphs/arrowup.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/arrowup.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="arrowup.cap" format="1"> +<glyph name="arrowup.case" format="1"> <advance width="1792"/> <outline> <component base="arrowup" yOffset="256"/> diff --git a/src/Interface-Regular.ufo/glyphs/asterisk.case.glif b/src/Interface-Regular.ufo/glyphs/asterisk.case.glif new file mode 100644 index 000000000..bd0e59016 --- /dev/null +++ b/src/Interface-Regular.ufo/glyphs/asterisk.case.glif @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="asterisk.case" format="1"> + <advance width="1536"/> + <note> + Recipe: + 1. make horizontal rect + 2. copy rect and paste + 3. rotate by 60 deg + 4. enter transform mode and center it + 5. copy the rotated piece and paste + 6. flip on vertical axis + 7. enter transform mode and center it + </note> + <outline> + <contour> + <point x="544" y="428" type="line"/> + <point x="760" y="820" type="line"/> + <point x="776" y="820" type="line"/> + <point x="992" y="428" type="line"/> + <point x="1172" y="532" type="line"/> + <point x="936" y="916" type="line"/> + <point x="944" y="932" type="line"/> + <point x="1396" y="920" type="line"/> + <point x="1396" y="1128" type="line"/> + <point x="952" y="1116" type="line"/> + <point x="944" y="1132" type="line"/> + <point x="1176" y="1516" type="line"/> + <point x="992" y="1620" type="line"/> + <point x="776" y="1224" type="line"/> + <point x="760" y="1224" type="line"/> + <point x="544" y="1620" type="line"/> + <point x="360" y="1516" type="line"/> + <point x="596" y="1132" type="line"/> + <point x="588" y="1116" type="line"/> + <point x="140" y="1128" type="line"/> + <point x="140" y="920" type="line"/> + <point x="592" y="932" type="line"/> + <point x="600" y="916" type="line"/> + <point x="364" y="532" type="line"/> + </contour> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.guides</key> + <array> + <dict> + <key>angle</key> + <integer>0</integer> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>name</key> + <string></string> + <key>x</key> + <integer>1072</integer> + <key>y</key> + <integer>1024</integer> + </dict> + <dict> + <key>angle</key> + <integer>0</integer> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>name</key> + <string></string> + <key>x</key> + <integer>1132</integer> + <key>y</key> + <integer>1448</integer> + </dict> + <dict> + <key>angle</key> + <integer>0</integer> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>name</key> + <string></string> + <key>x</key> + <integer>1132</integer> + <key>y</key> + <integer>460</integer> + </dict> + <dict> + <key>angle</key> + <integer>0</integer> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>name</key> + <string></string> + <key>x</key> + <integer>940</integer> + <key>y</key> + <integer>352</integer> + </dict> + <dict> + <key>angle</key> + <real>90.0</real> + <key>isGlobal</key> + <false/> + <key>magnetic</key> + <integer>5</integer> + <key>name</key> + <string></string> + <key>x</key> + <integer>768</integer> + <key>y</key> + <integer>1708</integer> + </dict> + </array> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Regular.ufo/glyphs/at.cap.glif b/src/Interface-Regular.ufo/glyphs/at.case.glif index d77a33166..e78088bcd 100644 --- a/src/Interface-Regular.ufo/glyphs/at.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/at.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="at.cap" format="1"> +<glyph name="at.case" format="1"> <advance width="2560"/> <outline> <component base="at" yOffset="300"/> diff --git a/src/Interface-Regular.ufo/glyphs/braceleft.cap.glif b/src/Interface-Regular.ufo/glyphs/braceleft.case.glif index bf5f8c93c..5bb77e00f 100644 --- a/src/Interface-Regular.ufo/glyphs/braceleft.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/braceleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="braceleft.cap" format="1"> +<glyph name="braceleft.case" format="1"> <advance width="768"/> <outline> <component base="braceleft" yOffset="172"/> diff --git a/src/Interface-Regular.ufo/glyphs/braceright.cap.glif b/src/Interface-Regular.ufo/glyphs/braceright.case.glif index 2d0f0ab51..1e19378d8 100644 --- a/src/Interface-Regular.ufo/glyphs/braceright.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/braceright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="braceright.cap" format="1"> +<glyph name="braceright.case" format="1"> <advance width="768"/> <outline> <component base="braceright" yOffset="172"/> diff --git a/src/Interface-Regular.ufo/glyphs/bracketleft.cap.glif b/src/Interface-Regular.ufo/glyphs/bracketleft.case.glif index e80b0f206..709eec679 100644 --- a/src/Interface-Regular.ufo/glyphs/bracketleft.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/bracketleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="bracketleft.cap" format="1"> +<glyph name="bracketleft.case" format="1"> <advance width="640"/> <outline> <component base="bracketleft" yOffset="128"/> diff --git a/src/Interface-Regular.ufo/glyphs/bracketright.cap.glif b/src/Interface-Regular.ufo/glyphs/bracketright.case.glif index 6de1774f3..66b7880e0 100644 --- a/src/Interface-Regular.ufo/glyphs/bracketright.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/bracketright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="bracketright.cap" format="1"> +<glyph name="bracketright.case" format="1"> <advance width="640"/> <outline> <component base="bracketright" yOffset="128"/> diff --git a/src/Interface-Regular.ufo/glyphs/bullet.cap.glif b/src/Interface-Regular.ufo/glyphs/bullet.case.glif index bb066b3f0..3600925e6 100644 --- a/src/Interface-Regular.ufo/glyphs/bullet.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/bullet.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="bullet.cap" format="1"> +<glyph name="bullet.case" format="1"> <advance width="1280"/> <outline> <component base="bullet" yOffset="124"/> diff --git a/src/Interface-Regular.ufo/glyphs/c.glif b/src/Interface-Regular.ufo/glyphs/c.glif index 4717aafa7..f1bc95ccd 100644 --- a/src/Interface-Regular.ufo/glyphs/c.glif +++ b/src/Interface-Regular.ufo/glyphs/c.glif @@ -4,32 +4,32 @@ <unicode hex="0063"/> <outline> <contour> - <point x="1440" y="1076" type="line"/> - <point x="1400" y="1340"/> - <point x="1180" y="1556"/> - <point x="820" y="1556" type="curve" smooth="yes"/> - <point x="404" y="1556"/> - <point x="140" y="1228"/> - <point x="140" y="768" type="curve" smooth="yes"/> - <point x="140" y="296"/> - <point x="408" y="-32"/> - <point x="820" y="-32" type="curve" smooth="yes"/> - <point x="1176" y="-32"/> - <point x="1400" y="176"/> - <point x="1440" y="448" type="curve"/> - <point x="1204" y="448" type="line"/> - <point x="1160" y="280"/> - <point x="1020" y="184"/> - <point x="820" y="184" type="curve" smooth="yes"/> - <point x="556" y="184"/> - <point x="384" y="424"/> - <point x="384" y="768" type="curve" smooth="yes"/> - <point x="384" y="1104"/> - <point x="556" y="1344"/> - <point x="824" y="1344" type="curve" smooth="yes"/> - <point x="1036" y="1344"/> - <point x="1164" y="1224"/> - <point x="1204" y="1076" type="curve"/> + <point x="1436" y="1076" type="line"/> + <point x="1396" y="1340"/> + <point x="1176" y="1556"/> + <point x="816" y="1556" type="curve" smooth="yes"/> + <point x="400" y="1556"/> + <point x="136" y="1228"/> + <point x="136" y="768" type="curve" smooth="yes"/> + <point x="136" y="296"/> + <point x="404" y="-32"/> + <point x="816" y="-32" type="curve" smooth="yes"/> + <point x="1172" y="-32"/> + <point x="1396" y="176"/> + <point x="1436" y="448" type="curve"/> + <point x="1200" y="448" type="line"/> + <point x="1156" y="280"/> + <point x="1016" y="180"/> + <point x="816" y="180" type="curve" smooth="yes"/> + <point x="560" y="180"/> + <point x="372" y="416"/> + <point x="372" y="768" type="curve" smooth="yes"/> + <point x="372" y="1104"/> + <point x="552" y="1344"/> + <point x="820" y="1344" type="curve" smooth="yes"/> + <point x="1032" y="1344"/> + <point x="1160" y="1224"/> + <point x="1200" y="1076" type="curve"/> </contour> <contour> <point x="824" y="1792" type="move" name="top"/> @@ -70,7 +70,7 @@ <integer>0</integer> <integer>0</integer> <integer>1</integer> - <integer>-8</integer> + <integer>0</integer> <integer>0</integer> </array> </dict> diff --git a/src/Interface-Regular.ufo/glyphs/colon.case.glif b/src/Interface-Regular.ufo/glyphs/colon.case.glif new file mode 100644 index 000000000..b51b061a6 --- /dev/null +++ b/src/Interface-Regular.ufo/glyphs/colon.case.glif @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="colon.case" format="1"> + <advance width="800"/> + <outline> + <component base="period" yOffset="324"/> + <component base="period" yOffset="1360"/> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.94</real> + <real>0.94</real> + <real>0.94</real> + <real>1.0</real> + </array> + <key>interface.gridadjust.original</key> + <string>{'width': 829, 'leftMargin': 271, 'rightMargin': 222}</string> + <key>interface.width-adjustments</key> + <array> + <integer>-16</integer> + </array> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Regular.ufo/glyphs/colon.glif b/src/Interface-Regular.ufo/glyphs/colon.glif index b11fca477..97beb65c6 100644 --- a/src/Interface-Regular.ufo/glyphs/colon.glif +++ b/src/Interface-Regular.ufo/glyphs/colon.glif @@ -4,7 +4,7 @@ <unicode hex="003A"/> <outline> <component base="period"/> - <component base="period" yOffset="1204"/> + <component base="period" yOffset="1140"/> </outline> <lib> <dict> diff --git a/src/Interface-Regular.ufo/glyphs/colon.pnum.glif b/src/Interface-Regular.ufo/glyphs/colon.pnum.glif deleted file mode 100644 index 261e84432..000000000 --- a/src/Interface-Regular.ufo/glyphs/colon.pnum.glif +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<glyph name="colon.pnum" format="1"> - <advance width="736"/> - <unicode hex="EE01"/> - <outline> - <component base="period" xOffset="-16" yOffset="248"/> - <component base="period" xOffset="-16" yOffset="1448"/> - </outline> - <lib> - <dict> - <key>interface.gridadjust.original</key> - <string>{'width': 829, 'leftMargin': 271, 'rightMargin': 222}</string> - <key>interface.width-adjustments</key> - <array> - <integer>-16</integer> - </array> - </dict> - </lib> -</glyph> diff --git a/src/Interface-Regular.ufo/glyphs/contents.plist b/src/Interface-Regular.ufo/glyphs/contents.plist index 6e217c256..0dec83584 100644 --- a/src/Interface-Regular.ufo/glyphs/contents.plist +++ b/src/Interface-Regular.ufo/glyphs/contents.plist @@ -398,8 +398,8 @@ <string>archdblsubnosp.glif</string> <key>arrowdown</key> <string>arrowdown.glif</string> - <key>arrowdown.cap</key> - <string>arrowdown.cap.glif</string> + <key>arrowdown.case</key> + <string>arrowdown.case.glif</string> <key>arrowheaddownmod</key> <string>arrowheaddownmod.glif</string> <key>arrowheadleftmod</key> @@ -410,16 +410,16 @@ <string>arrowheadupmod.glif</string> <key>arrowleft</key> <string>arrowleft.glif</string> - <key>arrowleft.cap</key> - <string>arrowleft.cap.glif</string> + <key>arrowleft.case</key> + <string>arrowleft.case.glif</string> <key>arrowright</key> <string>arrowright.glif</string> - <key>arrowright.cap</key> - <string>arrowright.cap.glif</string> + <key>arrowright.case</key> + <string>arrowright.case.glif</string> <key>arrowup</key> <string>arrowup.glif</string> - <key>arrowup.cap</key> - <string>arrowup.cap.glif</string> + <key>arrowup.case</key> + <string>arrowup.case.glif</string> <key>asciicircum</key> <string>asciicircum.glif</string> <key>asciitilde</key> @@ -434,12 +434,14 @@ <string>ascriptturn_uni02DE__.glif</string> <key>asterisk</key> <string>asterisk.glif</string> + <key>asterisk.case</key> + <string>asterisk.case.glif</string> <key>asterism</key> <string>asterism.glif</string> <key>at</key> <string>at.glif</string> - <key>at.cap</key> - <string>at.cap.glif</string> + <key>at.case</key> + <string>at.case.glif</string> <key>aturn</key> <string>aturn.glif</string> <key>aturn_uni02DE</key> @@ -478,20 +480,20 @@ <string>blackleftpointingtriangle.glif</string> <key>braceleft</key> <string>braceleft.glif</string> - <key>braceleft.cap</key> - <string>braceleft.cap.glif</string> + <key>braceleft.case</key> + <string>braceleft.case.glif</string> <key>braceright</key> <string>braceright.glif</string> - <key>braceright.cap</key> - <string>braceright.cap.glif</string> + <key>braceright.case</key> + <string>braceright.case.glif</string> <key>bracketleft</key> <string>bracketleft.glif</string> - <key>bracketleft.cap</key> - <string>bracketleft.cap.glif</string> + <key>bracketleft.case</key> + <string>bracketleft.case.glif</string> <key>bracketright</key> <string>bracketright.glif</string> - <key>bracketright.cap</key> - <string>bracketright.cap.glif</string> + <key>bracketright.case</key> + <string>bracketright.case.glif</string> <key>breve</key> <string>breve.glif</string> <key>breveacutecomb</key> @@ -524,8 +526,8 @@ <string>btopbar.glif</string> <key>bullet</key> <string>bullet.glif</string> - <key>bullet.cap</key> - <string>bullet.cap.glif</string> + <key>bullet.case</key> + <string>bullet.case.glif</string> <key>bullseye</key> <string>bullseye.glif</string> <key>c</key> @@ -596,8 +598,8 @@ <string>circumflextildecomb.glif</string> <key>colon</key> <string>colon.glif</string> - <key>colon.pnum</key> - <string>colon.pnum.glif</string> + <key>colon.case</key> + <string>colon.case.glif</string> <key>coloncurrency</key> <string>coloncurrency.glif</string> <key>colontriangularhalfmod</key> @@ -716,8 +718,8 @@ <string>digamma.glif</string> <key>divide</key> <string>divide.glif</string> - <key>divide.cap</key> - <string>divide.cap.glif</string> + <key>divide.case</key> + <string>divide.case.glif</string> <key>djecyrillic</key> <string>djecyrillic.glif</string> <key>dollar</key> @@ -792,8 +794,8 @@ <string>emcyrillic.glif</string> <key>emdash</key> <string>emdash.glif</string> - <key>emdash.cap</key> - <string>emdash.cap.glif</string> + <key>emdash.case</key> + <string>emdash.case.glif</string> <key>emquad</key> <string>emquad.glif</string> <key>emspace</key> @@ -802,8 +804,8 @@ <string>encyrillic.glif</string> <key>endash</key> <string>endash.glif</string> - <key>endash.cap</key> - <string>endash.cap.glif</string> + <key>endash.case</key> + <string>endash.case.glif</string> <key>endescendercyrillic</key> <string>endescendercyrillic.glif</string> <key>eng</key> @@ -834,8 +836,8 @@ <string>epsilonclosed.glif</string> <key>equal</key> <string>equal.glif</string> - <key>equal.cap</key> - <string>equal.cap.glif</string> + <key>equal.case</key> + <string>equal.case.glif</string> <key>equalsub</key> <string>equalsub.glif</string> <key>equalsuperior</key> @@ -880,8 +882,8 @@ <string>f.glif</string> <key>figuredash</key> <string>figuredash.glif</string> - <key>figuredash.cap</key> - <string>figuredash.cap.glif</string> + <key>figuredash.case</key> + <string>figuredash.case.glif</string> <key>figurespace</key> <string>figurespace.glif</string> <key>finalkaf</key> @@ -1040,8 +1042,8 @@ <string>hv.glif</string> <key>hyphen</key> <string>hyphen.glif</string> - <key>hyphen.cap</key> - <string>hyphen.cap.glif</string> + <key>hyphen.case</key> + <string>hyphen.case.glif</string> <key>hyphen__</key> <string>hyphen__.glif</string> <key>hyphenbullet</key> @@ -1212,8 +1214,8 @@ <string>mill.glif</string> <key>minus</key> <string>minus.glif</string> - <key>minus.cap</key> - <string>minus.cap.glif</string> + <key>minus.case</key> + <string>minus.case.glif</string> <key>minusmod</key> <string>minusmod.glif</string> <key>minussub</key> @@ -1230,8 +1232,8 @@ <string>mu.glif</string> <key>multiply</key> <string>multiply.glif</string> - <key>multiply.cap</key> - <string>multiply.cap.glif</string> + <key>multiply.case</key> + <string>multiply.case.glif</string> <key>n</key> <string>n.glif</string> <key>naira</key> @@ -1258,8 +1260,8 @@ <string>nlfthook.glif</string> <key>notequal</key> <string>notequal.glif</string> - <key>notequal.cap</key> - <string>notequal.cap.glif</string> + <key>notequal.case</key> + <string>notequal.case.glif</string> <key>nrthook</key> <string>nrthook.glif</string> <key>nsuperior</key> @@ -1352,16 +1354,16 @@ <string>paragraph.glif</string> <key>parenleft</key> <string>parenleft.glif</string> - <key>parenleft.cap</key> - <string>parenleft.cap.glif</string> + <key>parenleft.case</key> + <string>parenleft.case.glif</string> <key>parenleftinferior</key> <string>parenleftinferior.glif</string> <key>parenleftsuperior</key> <string>parenleftsuperior.glif</string> <key>parenright</key> <string>parenright.glif</string> - <key>parenright.cap</key> - <string>parenright.cap.glif</string> + <key>parenright.case</key> + <string>parenright.case.glif</string> <key>parenrightsub</key> <string>parenrightsub.glif</string> <key>parenrightsuperior</key> @@ -1376,6 +1378,8 @@ <string>percent.glif</string> <key>period</key> <string>period.glif</string> + <key>period.num</key> + <string>period.num.glif</string> <key>periodcentered</key> <string>periodcentered.glif</string> <key>perispomenigreekcmb</key> @@ -1414,10 +1418,12 @@ <string>placeofinterestsign.specz.medium.glif</string> <key>plus</key> <string>plus.glif</string> - <key>plus.cap</key> - <string>plus.cap.glif</string> + <key>plus.case</key> + <string>plus.case.glif</string> <key>plusminus</key> <string>plusminus.glif</string> + <key>plusminus.case</key> + <string>plusminus.case.glif</string> <key>plusmod</key> <string>plusmod.glif</string> <key>plussub</key> @@ -1808,6 +1814,8 @@ <string>two.glif</string> <key>two.sup</key> <string>two.sup.glif</string> + <key>two.tnum</key> + <string>two.tnum.glif</string> <key>twodotleader</key> <string>twodotleader.glif</string> <key>tworoman</key> diff --git a/src/Interface-Regular.ufo/glyphs/divide.cap.glif b/src/Interface-Regular.ufo/glyphs/divide.case.glif index 5e81c3b50..46a73bed7 100644 --- a/src/Interface-Regular.ufo/glyphs/divide.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/divide.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="divide.cap" format="1"> +<glyph name="divide.case" format="1"> <advance width="1792"/> <outline> <component base="divide" yOffset="136"/> diff --git a/src/Interface-Regular.ufo/glyphs/e.glif b/src/Interface-Regular.ufo/glyphs/e.glif index c3e7e747e..0c904be81 100644 --- a/src/Interface-Regular.ufo/glyphs/e.glif +++ b/src/Interface-Regular.ufo/glyphs/e.glif @@ -6,33 +6,33 @@ <contour> <point x="840" y="-32" type="curve"/> <point x="1148" y="-32"/> - <point x="1348" y="116"/> - <point x="1432" y="316" type="curve"/> - <point x="1216" y="412" type="line"/> - <point x="1156" y="272"/> - <point x="1028" y="184"/> - <point x="840" y="184" type="curve" smooth="yes"/> - <point x="552" y="184"/> - <point x="384.0" y="424.0"/> - <point x="384.0" y="768.0" type="curve"/> - <point x="384.0" y="1104.0"/> - <point x="556.0" y="1344.0"/> - <point x="824.0" y="1344.0" type="curve" smooth="yes"/> - <point x="1036.0" y="1344.0"/> - <point x="1240.0" y="1176.0"/> - <point x="1240.0" y="872.0" type="curve"/> - <point x="308.0" y="872.0" type="line"/> - <point x="308.0" y="668.0" type="line"/> - <point x="1476.0" y="668.0" type="line"/> - <point x="1476.0" y="768.0" type="line" smooth="yes"/> - <point x="1476.0" y="1352.0"/> - <point x="1180.0" y="1556.0"/> - <point x="820.0" y="1556.0" type="curve" smooth="yes"/> - <point x="408.0" y="1556.0"/> - <point x="140.0" y="1228.0"/> - <point x="140.0" y="768.0" type="curve"/> - <point x="140.0" y="296.0"/> - <point x="404" y="-32"/> + <point x="1348" y="112"/> + <point x="1436" y="316" type="curve"/> + <point x="1220" y="412" type="line"/> + <point x="1156" y="268"/> + <point x="1028" y="180"/> + <point x="840" y="180" type="curve" smooth="yes"/> + <point x="548" y="180"/> + <point x="372" y="420"/> + <point x="372" y="768" type="curve"/> + <point x="372" y="1104"/> + <point x="552" y="1344"/> + <point x="820" y="1344" type="curve" smooth="yes"/> + <point x="1088" y="1344"/> + <point x="1252" y="1176"/> + <point x="1252" y="872" type="curve"/> + <point x="304" y="872" type="line"/> + <point x="304" y="668" type="line"/> + <point x="1480" y="668" type="line"/> + <point x="1480" y="768" type="line" smooth="yes"/> + <point x="1480" y="1352"/> + <point x="1176" y="1556"/> + <point x="816" y="1556" type="curve" smooth="yes"/> + <point x="404" y="1556"/> + <point x="136" y="1228"/> + <point x="136" y="768" type="curve"/> + <point x="136" y="296"/> + <point x="400" y="-32"/> </contour> <contour> <point x="820" y="1792" type="move" name="top"/> diff --git a/src/Interface-Regular.ufo/glyphs/emdash.cap.glif b/src/Interface-Regular.ufo/glyphs/emdash.case.glif index 14c9036ad..e120f89f5 100644 --- a/src/Interface-Regular.ufo/glyphs/emdash.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/emdash.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="emdash.cap" format="1"> +<glyph name="emdash.case" format="1"> <advance width="2560"/> <outline> <component base="emdash" yOffset="148"/> diff --git a/src/Interface-Regular.ufo/glyphs/endash.cap.glif b/src/Interface-Regular.ufo/glyphs/endash.case.glif index 806d2c64b..80a8ad053 100644 --- a/src/Interface-Regular.ufo/glyphs/endash.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/endash.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="endash.cap" format="1"> +<glyph name="endash.case" format="1"> <advance width="1280"/> <outline> <component base="endash" yOffset="148"/> diff --git a/src/Interface-Regular.ufo/glyphs/equal.cap.glif b/src/Interface-Regular.ufo/glyphs/equal.case.glif index 833b6ede1..a56e0dfa2 100644 --- a/src/Interface-Regular.ufo/glyphs/equal.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/equal.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="equal.cap" format="1"> +<glyph name="equal.case" format="1"> <advance width="1664"/> <outline> <component base="equal" yOffset="144"/> diff --git a/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif b/src/Interface-Regular.ufo/glyphs/figuredash.case.glif index 16422005b..f5aab3d76 100644 --- a/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/figuredash.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="figuredash.cap" format="1"> +<glyph name="figuredash.case" format="1"> <advance width="1792"/> <outline> <component base="figuredash" yOffset="148"/> diff --git a/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif b/src/Interface-Regular.ufo/glyphs/hyphen.case.glif index 4f4846a72..5bdc5d250 100644 --- a/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/hyphen.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="hyphen.cap" format="1"> +<glyph name="hyphen.case" format="1"> <advance width="1248"/> <outline> <component base="hyphen" yOffset="148"/> diff --git a/src/Interface-Regular.ufo/glyphs/hyphen.glif b/src/Interface-Regular.ufo/glyphs/hyphen.glif index 9c31dc9a9..9f8cade74 100644 --- a/src/Interface-Regular.ufo/glyphs/hyphen.glif +++ b/src/Interface-Regular.ufo/glyphs/hyphen.glif @@ -4,10 +4,10 @@ <unicode hex="002D"/> <outline> <contour> - <point x="1064" y="988" type="line"/> - <point x="216" y="988" type="line"/> - <point x="216" y="768" type="line"/> - <point x="1064" y="768" type="line"/> + <point x="1088" y="988" type="line"/> + <point x="192" y="988" type="line"/> + <point x="192" y="768" type="line"/> + <point x="1088" y="768" type="line"/> </contour> </outline> <lib> diff --git a/src/Interface-Regular.ufo/glyphs/minus.cap.glif b/src/Interface-Regular.ufo/glyphs/minus.case.glif index 8b733dc62..f3209deb6 100644 --- a/src/Interface-Regular.ufo/glyphs/minus.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/minus.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="minus.cap" format="1"> +<glyph name="minus.case" format="1"> <advance width="1280"/> <outline> <component base="minus" yOffset="140"/> diff --git a/src/Interface-Regular.ufo/glyphs/multiply.cap.glif b/src/Interface-Regular.ufo/glyphs/multiply.case.glif index d8f37238e..d4e30f2b2 100644 --- a/src/Interface-Regular.ufo/glyphs/multiply.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/multiply.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="multiply.cap" format="1"> +<glyph name="multiply.case" format="1"> <advance width="1536"/> <outline> <component base="multiply" yOffset="96"/> diff --git a/src/Interface-Regular.ufo/glyphs/notequal.cap.glif b/src/Interface-Regular.ufo/glyphs/notequal.case.glif index 3a773ca9e..74dad9f2f 100644 --- a/src/Interface-Regular.ufo/glyphs/notequal.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/notequal.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="notequal.cap" format="1"> +<glyph name="notequal.case" format="1"> <advance width="1664"/> <outline> <component base="notequal" yOffset="144"/> diff --git a/src/Interface-Regular.ufo/glyphs/o.glif b/src/Interface-Regular.ufo/glyphs/o.glif index bfa86bd99..8537be3e2 100644 --- a/src/Interface-Regular.ufo/glyphs/o.glif +++ b/src/Interface-Regular.ufo/glyphs/o.glif @@ -4,32 +4,32 @@ <unicode hex="006F"/> <outline> <contour> - <point x="828" y="184" type="curve" smooth="yes"/> - <point x="536" y="184"/> - <point x="384" y="440"/> - <point x="384" y="768" type="curve" smooth="yes"/> - <point x="384" y="1100"/> - <point x="552" y="1344"/> - <point x="828" y="1344" type="curve" smooth="yes"/> - <point x="1116" y="1344"/> - <point x="1268" y="1132"/> - <point x="1268" y="768" type="curve" smooth="yes"/> - <point x="1268" y="400"/> - <point x="1116" y="184"/> + <point x="824" y="180" type="curve" smooth="yes"/> + <point x="532" y="180"/> + <point x="372" y="440"/> + <point x="372" y="768" type="curve" smooth="yes"/> + <point x="372" y="1100"/> + <point x="548" y="1344"/> + <point x="824" y="1344" type="curve" smooth="yes"/> + <point x="1112" y="1344"/> + <point x="1292" y="1132"/> + <point x="1292" y="768" type="curve" smooth="yes"/> + <point x="1292" y="400"/> + <point x="1112" y="180"/> </contour> <contour> - <point x="828" y="-32" type="curve" smooth="yes"/> - <point x="1264" y="-32"/> - <point x="1524" y="276"/> - <point x="1524" y="768" type="curve" smooth="yes"/> - <point x="1524" y="1256"/> - <point x="1264" y="1556"/> - <point x="828" y="1556" type="curve" smooth="yes"/> - <point x="400" y="1556"/> - <point x="140" y="1224"/> - <point x="140" y="768" type="curve" smooth="yes"/> - <point x="140" y="296"/> - <point x="400" y="-32"/> + <point x="824" y="-32" type="curve" smooth="yes"/> + <point x="1260" y="-32"/> + <point x="1528" y="276"/> + <point x="1528" y="768" type="curve" smooth="yes"/> + <point x="1528" y="1256"/> + <point x="1260" y="1556"/> + <point x="824" y="1556" type="curve" smooth="yes"/> + <point x="396" y="1556"/> + <point x="136" y="1224"/> + <point x="136" y="768" type="curve" smooth="yes"/> + <point x="136" y="296"/> + <point x="396" y="-32"/> </contour> <contour> <point x="828" y="1792" type="move" name="top"/> @@ -63,14 +63,14 @@ <array> <dict> <key>baseGlyph</key> - <string>c</string> + <string>e</string> <key>transformation</key> <array> <integer>1</integer> <integer>0</integer> <integer>0</integer> <integer>1</integer> - <integer>0</integer> + <integer>-2</integer> <integer>0</integer> </array> </dict> diff --git a/src/Interface-Regular.ufo/glyphs/parenleft.cap.glif b/src/Interface-Regular.ufo/glyphs/parenleft.case.glif index cf436bdfa..c2803e11e 100644 --- a/src/Interface-Regular.ufo/glyphs/parenleft.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/parenleft.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="parenleft.cap" format="1"> +<glyph name="parenleft.case" format="1"> <advance width="984"/> <outline> <component base="parenleft" yOffset="192"/> diff --git a/src/Interface-Regular.ufo/glyphs/parenright.cap.glif b/src/Interface-Regular.ufo/glyphs/parenright.case.glif index f20aee477..393f1e28f 100644 --- a/src/Interface-Regular.ufo/glyphs/parenright.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/parenright.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="parenright.cap" format="1"> +<glyph name="parenright.case" format="1"> <advance width="984"/> <outline> <component base="parenright" yOffset="192"/> diff --git a/src/Interface-Regular.ufo/glyphs/period.glif b/src/Interface-Regular.ufo/glyphs/period.glif index 35e1d0aec..400a86c27 100644 --- a/src/Interface-Regular.ufo/glyphs/period.glif +++ b/src/Interface-Regular.ufo/glyphs/period.glif @@ -4,18 +4,18 @@ <unicode hex="002E"/> <outline> <contour> - <point x="216" y="132" type="curve" smooth="yes"/> - <point x="216" y="44"/> - <point x="272" y="-28"/> <point x="384" y="-28" type="curve" smooth="yes"/> - <point x="488" y="-28"/> - <point x="552" y="44"/> - <point x="552" y="132" type="curve" smooth="yes"/> - <point x="552" y="220"/> - <point x="488" y="292"/> - <point x="384" y="292" type="curve" smooth="yes"/> - <point x="272" y="292"/> - <point x="216" y="220"/> + <point x="484" y="-28"/> + <point x="564" y="52"/> + <point x="564" y="152" type="curve" smooth="yes"/> + <point x="564" y="248"/> + <point x="484" y="328"/> + <point x="384" y="328" type="curve" smooth="yes"/> + <point x="288" y="328"/> + <point x="204" y="248"/> + <point x="204" y="152" type="curve" smooth="yes"/> + <point x="204" y="52"/> + <point x="288" y="-28"/> </contour> </outline> <lib> diff --git a/src/Interface-Regular.ufo/glyphs/period.num.glif b/src/Interface-Regular.ufo/glyphs/period.num.glif new file mode 100644 index 000000000..1a008c9bb --- /dev/null +++ b/src/Interface-Regular.ufo/glyphs/period.num.glif @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="period.num" format="1"> + <advance width="822"/> + <outline> + <component base="period" xOffset="28"/> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.94</real> + <real>0.94</real> + <real>0.94</real> + <real>1.0</real> + </array> + <key>interface.width-adjustments</key> + <array> + <integer>-16</integer> + </array> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Regular.ufo/glyphs/plus.cap.glif b/src/Interface-Regular.ufo/glyphs/plus.case.glif index 229b6ebb0..c554586de 100644 --- a/src/Interface-Regular.ufo/glyphs/plus.cap.glif +++ b/src/Interface-Regular.ufo/glyphs/plus.case.glif @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<glyph name="plus.cap" format="1"> +<glyph name="plus.case" format="1"> <advance width="1792"/> <outline> <component base="plus" yOffset="128"/> diff --git a/src/Interface-Regular.ufo/glyphs/plusminus.case.glif b/src/Interface-Regular.ufo/glyphs/plusminus.case.glif new file mode 100644 index 000000000..450db5c88 --- /dev/null +++ b/src/Interface-Regular.ufo/glyphs/plusminus.case.glif @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="plusminus.case" format="1"> + <advance width="1792"/> + <outline> + <component base="plusminus" yOffset="296"/> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.8</real> + <real>0.94</real> + <real>0.95</real> + <real>1.0</real> + </array> + <key>interface.width-adjustments</key> + <array> + <integer>-16</integer> + </array> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Regular.ufo/glyphs/semicolon.glif b/src/Interface-Regular.ufo/glyphs/semicolon.glif index 6d21cf1d1..8981832df 100644 --- a/src/Interface-Regular.ufo/glyphs/semicolon.glif +++ b/src/Interface-Regular.ufo/glyphs/semicolon.glif @@ -3,7 +3,7 @@ <advance width="768"/> <unicode hex="003B"/> <outline> - <component base="period" xOffset="-4" yOffset="1204"/> + <component base="period" yOffset="1140"/> <component base="comma" xOffset="16"/> </outline> <lib> diff --git a/src/Interface-Regular.ufo/glyphs/two.tnum.glif b/src/Interface-Regular.ufo/glyphs/two.tnum.glif new file mode 100644 index 000000000..ca8bdf7d8 --- /dev/null +++ b/src/Interface-Regular.ufo/glyphs/two.tnum.glif @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<glyph name="two.tnum" format="1"> + <advance width="1664"/> + <outline> + <component base="two"/> + </outline> + <lib> + <dict> + <key>com.typemytype.robofont.mark</key> + <array> + <real>0.9230863777</real> + <real>0.9647658846</real> + <real>0.7857136537</real> + <real>1.0</real> + </array> + </dict> + </lib> +</glyph> diff --git a/src/Interface-Regular.ufo/glyphs/uni20DB__.glif b/src/Interface-Regular.ufo/glyphs/uni20DB__.glif index 86c5454ed..3c8e5cc93 100644 --- a/src/Interface-Regular.ufo/glyphs/uni20DB__.glif +++ b/src/Interface-Regular.ufo/glyphs/uni20DB__.glif @@ -3,12 +3,12 @@ <advance width="0"/> <unicode hex="20DB"/> <outline> - <contour> - <point x="-829" y="1609" type="move" name="_marktop"/> - </contour> <component base="period" xOffset="-1788" yOffset="1788"/> <component base="period" xOffset="-1178" yOffset="1788"/> <component base="period" xOffset="-601" yOffset="1788"/> + <contour> + <point x="-829" y="1609" type="move" name="_marktop"/> + </contour> </outline> <lib> <dict> diff --git a/src/Interface-Regular.ufo/glyphs/uni20DC__.glif b/src/Interface-Regular.ufo/glyphs/uni20DC__.glif index a9336ba75..c9ce3b5ae 100644 --- a/src/Interface-Regular.ufo/glyphs/uni20DC__.glif +++ b/src/Interface-Regular.ufo/glyphs/uni20DC__.glif @@ -3,13 +3,13 @@ <advance width="0"/> <unicode hex="20DC"/> <outline> - <contour> - <point x="-822" y="1609" type="move" name="_marktop"/> - </contour> <component base="period" xOffset="-2063" yOffset="1788"/> <component base="period" xOffset="-1453" yOffset="1788"/> <component base="period" xOffset="-876" yOffset="1788"/> <component base="period" xOffset="-312" yOffset="1788"/> + <contour> + <point x="-822" y="1609" type="move" name="_marktop"/> + </contour> </outline> <lib> <dict> diff --git a/src/Interface-Regular.ufo/groups.plist b/src/Interface-Regular.ufo/groups.plist index e83643f2e..9de31a2c3 100644 --- a/src/Interface-Regular.ufo/groups.plist +++ b/src/Interface-Regular.ufo/groups.plist @@ -370,6 +370,7 @@ <string>ellipsis</string> <string>comma</string> <string>period</string> + <string>period.num</string> </array> <key>@KERN_LEFT_dagger</key> <array> @@ -945,6 +946,7 @@ <key>@KERN_RIGHT_colon</key> <array> <string>colon</string> + <string>colon.case</string> <string>semicolon</string> </array> <key>@KERN_RIGHT_colon.case</key> @@ -956,6 +958,7 @@ <string>ellipsis</string> <string>comma</string> <string>period</string> + <string>period.num</string> </array> <key>@KERN_RIGHT_dagger</key> <array> diff --git a/src/Interface-Regular.ufo/kerning.plist b/src/Interface-Regular.ufo/kerning.plist index 4c0585f77..3fbcdba7b 100644 --- a/src/Interface-Regular.ufo/kerning.plist +++ b/src/Interface-Regular.ufo/kerning.plist @@ -1763,6 +1763,8 @@ <integer>-41</integer> <key>@KERN_RIGHT_Y</key> <integer>-124</integer> + <key>@KERN_RIGHT_c</key> + <integer>-16</integer> <key>@KERN_RIGHT_dagger</key> <integer>-28</integer> <key>@KERN_RIGHT_f</key> @@ -1818,122 +1820,12 @@ </dict> <key>@KERN_LEFT_comma</key> <dict> - <key>@KERN_RIGHT_C</key> - <integer>-164</integer> - <key>@KERN_RIGHT_Djecyrillic</key> - <integer>-233</integer> - <key>@KERN_RIGHT_Ecyrillic</key> - <integer>-124</integer> - <key>@KERN_RIGHT_Omicrongreek</key> - <integer>-166</integer> - <key>@KERN_RIGHT_T</key> - <integer>-233</integer> - <key>@KERN_RIGHT_U</key> - <integer>-123</integer> - <key>@KERN_RIGHT_Ucyrillic</key> - <integer>-84</integer> - <key>@KERN_RIGHT_V</key> - <integer>-276</integer> - <key>@KERN_RIGHT_W</key> - <integer>-274</integer> - <key>@KERN_RIGHT_Y</key> - <integer>-276</integer> - <key>@KERN_RIGHT_alphagreek</key> - <integer>-55</integer> - <key>@KERN_RIGHT_asciicircum</key> + <key>grave</key> + <integer>-384</integer> + <key>quotedblreversed</key> + <integer>-384</integer> + <key>quotereversed</key> <integer>-384</integer> - <key>@KERN_RIGHT_c</key> - <integer>-55</integer> - <key>@KERN_RIGHT_deltagreek</key> - <integer>-54</integer> - <key>@KERN_RIGHT_eight.sups</key> - <integer>-304</integer> - <key>@KERN_RIGHT_epsilongreek</key> - <integer>-55</integer> - <key>@KERN_RIGHT_etagreek</key> - <integer>-56</integer> - <key>@KERN_RIGHT_f</key> - <integer>-82</integer> - <key>@KERN_RIGHT_gammagreek</key> - <integer>-205</integer> - <key>@KERN_RIGHT_iotadieresisgreek</key> - <integer>-55</integer> - <key>@KERN_RIGHT_omegagreek</key> - <integer>-54</integer> - <key>@KERN_RIGHT_quotedbl</key> - <integer>-261</integer> - <key>@KERN_RIGHT_quotedblleft</key> - <integer>-535</integer> - <key>@KERN_RIGHT_quotedblright</key> - <integer>-372</integer> - <key>@KERN_RIGHT_six</key> - <integer>-110</integer> - <key>@KERN_RIGHT_t</key> - <integer>-54</integer> - <key>@KERN_RIGHT_v</key> - <integer>-206</integer> - <key>@KERN_RIGHT_w</key> - <integer>-205</integer> - <key>Psi</key> - <integer>-274</integer> - <key>Tbar</key> - <integer>-315</integer> - <key>afii10038</key> - <integer>-68</integer> - <key>afii10041</key> - <integer>-206</integer> - <key>afii10044</key> - <integer>-219</integer> - <key>afii10047</key> - <integer>-125</integer> - <key>afii10049</key> - <integer>-42</integer> - <key>ampersand</key> - <integer>-96</integer> - <key>backslash</key> - <integer>-110</integer> - <key>becyrillic</key> - <integer>-55</integer> - <key>checyrillic</key> - <integer>-165</integer> - <key>decyrillic</key> - <integer>109</integer> - <key>eight</key> - <integer>-96</integer> - <key>five</key> - <integer>-88</integer> - <key>four</key> - <integer>-82</integer> - <key>hryvnia</key> - <integer>-27</integer> - <key>nine</key> - <integer>-109</integer> - <key>nine.1</key> - <integer>-109</integer> - <key>one</key> - <integer>-96</integer> - <key>pi</key> - <integer>-55</integer> - <key>rho</key> - <integer>-56</integer> - <key>slash</key> - <integer>111</integer> - <key>tau</key> - <integer>-55</integer> - <key>tecyrillic</key> - <integer>-137</integer> - <key>tenge</key> - <integer>-205</integer> - <key>theta</key> - <integer>-55</integer> - <key>three</key> - <integer>-83</integer> - <key>two</key> - <integer>-56</integer> - <key>xi</key> - <integer>-56</integer> - <key>zeta</key> - <integer>-54</integer> </dict> <key>@KERN_LEFT_dagger</key> <dict> @@ -2774,7 +2666,7 @@ <key>@KERN_RIGHT_asciicircum</key> <integer>-29</integer> <key>@KERN_RIGHT_comma</key> - <integer>-110</integer> + <integer>-302</integer> <key>@KERN_RIGHT_gammagreek</key> <integer>-27</integer> <key>@KERN_RIGHT_quotedbl</key> @@ -3627,6 +3519,16 @@ <key>seven</key> <integer>-27</integer> </dict> + <key>A</key> + <dict> + <key>asterisk.case</key> + <integer>-96</integer> + </dict> + <key>Delta</key> + <dict> + <key>asterisk.case</key> + <integer>-96</integer> + </dict> <key>F</key> <dict> <key>r</key> @@ -3717,13 +3619,25 @@ <key>b</key> <integer>-16</integer> </dict> + <key>K</key> + <dict> + <key>asterisk.case</key> + <integer>-96</integer> + </dict> <key>L</key> <dict> + <key>asterisk.case</key> + <integer>-96</integer> <key>quotedblreversed</key> <integer>-128</integer> <key>quotereversed</key> <integer>-128</integer> </dict> + <key>Lambda</key> + <dict> + <key>asterisk.case</key> + <integer>-96</integer> + </dict> <key>Lslash</key> <dict> <key>@KERN_RIGHT_C</key> @@ -3864,6 +3778,8 @@ <integer>-28</integer> <key>@KERN_RIGHT_six</key> <integer>-27</integer> + <key>asterisk.case</key> + <integer>-96</integer> <key>four</key> <integer>-68</integer> <key>less</key> @@ -3881,6 +3797,11 @@ <key>zeta</key> <integer>-70</integer> </dict> + <key>T</key> + <dict> + <key>asterisk.case</key> + <integer>-96</integer> + </dict> <key>Tbar</key> <dict> <key>@KERN_RIGHT_A</key> @@ -3940,6 +3861,21 @@ <key>idieresisacute</key> <integer>164</integer> </dict> + <key>V</key> + <dict> + <key>asterisk.case</key> + <integer>-48</integer> + </dict> + <key>Y</key> + <dict> + <key>asterisk.case</key> + <integer>-32</integer> + </dict> + <key>Z</key> + <dict> + <key>asterisk.case</key> + <integer>-32</integer> + </dict> <key>afii10018</key> <dict> <key>@KERN_RIGHT_Djecyrillic</key> @@ -4219,6 +4155,27 @@ <key>tenge</key> <integer>-41</integer> </dict> + <key>asterisk.case</key> + <dict> + <key>A</key> + <integer>-96</integer> + <key>Delta</key> + <integer>-96</integer> + <key>Lambda</key> + <integer>-96</integer> + <key>Sigma</key> + <integer>-48</integer> + <key>T</key> + <integer>-96</integer> + <key>V</key> + <integer>-48</integer> + <key>Y</key> + <integer>-32</integer> + <key>Z</key> + <integer>-32</integer> + <key>seven</key> + <integer>-32</integer> + </dict> <key>at</key> <dict> <key>@KERN_RIGHT_V</key> @@ -4317,6 +4274,11 @@ <key>@KERN_RIGHT_quotedblleft</key> <integer>-96</integer> </dict> + <key>colon.case</key> + <dict> + <key>seven</key> + <integer>-32</integer> + </dict> <key>comma</key> <dict> <key>quotedblreversed</key> @@ -4431,6 +4393,8 @@ <integer>-27</integer> <key>one</key> <integer>-28</integer> + <key>period</key> + <integer>-96</integer> <key>tecyrillic</key> <integer>-29</integer> <key>tenge</key> @@ -4758,6 +4722,8 @@ <integer>-176</integer> <key>nine.1</key> <integer>-64</integer> + <key>period.num</key> + <integer>-302</integer> <key>seven</key> <integer>-103</integer> <key>slash</key> @@ -4807,12 +4773,51 @@ </dict> <key>period</key> <dict> - <key>grave</key> - <integer>-384</integer> - <key>quotedblreversed</key> - <integer>-384</integer> - <key>quotereversed</key> - <integer>-384</integer> + <key>eight</key> + <integer>-96</integer> + <key>five</key> + <integer>-32</integer> + <key>nine</key> + <integer>-32</integer> + <key>nine.1</key> + <integer>-144</integer> + <key>one</key> + <integer>-144</integer> + <key>six</key> + <integer>-112</integer> + <key>six.1</key> + <integer>-112</integer> + <key>three</key> + <integer>-96</integer> + <key>zero</key> + <integer>-110</integer> + </dict> + <key>period.num</key> + <dict> + <key>eight</key> + <integer>-96</integer> + <key>five</key> + <integer>-80</integer> + <key>four</key> + <integer>0</integer> + <key>four.1</key> + <integer>0</integer> + <key>nine</key> + <integer>-32</integer> + <key>nine.1</key> + <integer>-144</integer> + <key>one</key> + <integer>-112</integer> + <key>seven</key> + <integer>-64</integer> + <key>six</key> + <integer>-112</integer> + <key>six.1</key> + <integer>-112</integer> + <key>three</key> + <integer>-96</integer> + <key>zero</key> + <integer>-110</integer> </dict> <key>periodcentered</key> <dict> diff --git a/src/Interface-Regular.ufo/lib.plist b/src/Interface-Regular.ufo/lib.plist index 87734e702..f0227fca0 100644 --- a/src/Interface-Regular.ufo/lib.plist +++ b/src/Interface-Regular.ufo/lib.plist @@ -571,6 +571,7 @@ <string>one</string> <string>one.tnum</string> <string>two</string> + <string>two.tnum</string> <string>three</string> <string>four</string> <string>four.1</string> @@ -591,19 +592,19 @@ <string>question</string> <string>questiondown</string> <string>parenleft</string> - <string>parenleft.cap</string> + <string>parenleft.case</string> <string>parenright</string> - <string>parenright.cap</string> + <string>parenright.case</string> <string>bracketleft</string> - <string>bracketleft.cap</string> + <string>bracketleft.case</string> <string>bracketright</string> - <string>bracketright.cap</string> + <string>bracketright.case</string> <string>braceleft</string> - <string>braceleft.cap</string> + <string>braceleft.case</string> <string>braceright</string> - <string>braceright.cap</string> + <string>braceright.case</string> <string>at</string> - <string>at.cap</string> + <string>at.case</string> <string>numbersign</string> <string>currency</string> <string>slash</string> @@ -612,15 +613,15 @@ <string>backslash</string> <string>hyphenbullet</string> <string>hyphen</string> - <string>hyphen.cap</string> + <string>hyphen.case</string> <string>endash</string> - <string>endash.cap</string> + <string>endash.case</string> <string>figuredash</string> - <string>figuredash.cap</string> + <string>figuredash.case</string> <string>emdash</string> - <string>emdash.cap</string> + <string>emdash.case</string> <string>bullet</string> - <string>bullet.cap</string> + <string>bullet.case</string> <string>quoteleft</string> <string>quoteright</string> <string>primetripl1</string> @@ -632,8 +633,10 @@ <string>quotesinglbase</string> <string>comma</string> <string>period</string> + <string>period.num</string> <string>ellipsis</string> <string>colon</string> + <string>colon.case</string> <string>semicolon</string> <string>guilsinglleft</string> <string>guilsinglright</string> @@ -644,18 +647,19 @@ <string>lessequal</string> <string>greaterequal</string> <string>equal</string> - <string>equal.cap</string> + <string>equal.case</string> <string>notequal</string> - <string>notequal.cap</string> + <string>notequal.case</string> <string>plus</string> - <string>plus.cap</string> + <string>plus.case</string> <string>minus</string> - <string>minus.cap</string> + <string>minus.case</string> <string>multiply</string> - <string>multiply.cap</string> + <string>multiply.case</string> <string>divide</string> - <string>divide.cap</string> + <string>divide.case</string> <string>plusminus</string> + <string>plusminus.case</string> <string>approxequal</string> <string>asciitilde</string> <string>logicalnot</string> @@ -667,6 +671,7 @@ <string>daggerdbl</string> <string>asciicircum</string> <string>asterisk</string> + <string>asterisk.case</string> <string>registered</string> <string>trademark</string> <string>servicemark</string> @@ -775,13 +780,13 @@ <string>hairspace</string> <string>zerowidthspace</string> <string>arrowleft</string> - <string>arrowleft.cap</string> + <string>arrowleft.case</string> <string>arrowup</string> - <string>arrowup.cap</string> + <string>arrowup.case</string> <string>arrowright</string> - <string>arrowright.cap</string> + <string>arrowright.case</string> <string>arrowdown</string> - <string>arrowdown.cap</string> + <string>arrowdown.case</string> <string>triagrt</string> <string>triagdn</string> <string>triagup</string> @@ -1940,7 +1945,6 @@ <string>uni1AB9</string> <string>uni1AB8</string> <string>uni1D61</string> - <string>colon.pnum</string> <string>glottalstopbarrev</string> <string>uni1D66</string> <string>cyrillichook</string> @@ -2785,6 +2789,7 @@ <string>one</string> <string>one.tnum</string> <string>two</string> + <string>two.tnum</string> <string>three</string> <string>four</string> <string>four.1</string> @@ -2805,19 +2810,19 @@ <string>question</string> <string>questiondown</string> <string>parenleft</string> - <string>parenleft.cap</string> + <string>parenleft.case</string> <string>parenright</string> - <string>parenright.cap</string> + <string>parenright.case</string> <string>bracketleft</string> - <string>bracketleft.cap</string> + <string>bracketleft.case</string> <string>bracketright</string> - <string>bracketright.cap</string> + <string>bracketright.case</string> <string>braceleft</string> - <string>braceleft.cap</string> + <string>braceleft.case</string> <string>braceright</string> - <string>braceright.cap</string> + <string>braceright.case</string> <string>at</string> - <string>at.cap</string> + <string>at.case</string> <string>numbersign</string> <string>currency</string> <string>slash</string> @@ -2826,15 +2831,15 @@ <string>backslash</string> <string>hyphenbullet</string> <string>hyphen</string> - <string>hyphen.cap</string> + <string>hyphen.case</string> <string>endash</string> - <string>endash.cap</string> + <string>endash.case</string> <string>figuredash</string> - <string>figuredash.cap</string> + <string>figuredash.case</string> <string>emdash</string> - <string>emdash.cap</string> + <string>emdash.case</string> <string>bullet</string> - <string>bullet.cap</string> + <string>bullet.case</string> <string>quoteleft</string> <string>quoteright</string> <string>primetripl1</string> @@ -2846,8 +2851,10 @@ <string>quotesinglbase</string> <string>comma</string> <string>period</string> + <string>period.num</string> <string>ellipsis</string> <string>colon</string> + <string>colon.case</string> <string>semicolon</string> <string>guilsinglleft</string> <string>guilsinglright</string> @@ -2858,18 +2865,19 @@ <string>lessequal</string> <string>greaterequal</string> <string>equal</string> - <string>equal.cap</string> + <string>equal.case</string> <string>notequal</string> - <string>notequal.cap</string> + <string>notequal.case</string> <string>plus</string> - <string>plus.cap</string> + <string>plus.case</string> <string>minus</string> - <string>minus.cap</string> + <string>minus.case</string> <string>multiply</string> - <string>multiply.cap</string> + <string>multiply.case</string> <string>divide</string> - <string>divide.cap</string> + <string>divide.case</string> <string>plusminus</string> + <string>plusminus.case</string> <string>approxequal</string> <string>asciitilde</string> <string>logicalnot</string> @@ -2881,6 +2889,7 @@ <string>daggerdbl</string> <string>asciicircum</string> <string>asterisk</string> + <string>asterisk.case</string> <string>registered</string> <string>trademark</string> <string>servicemark</string> @@ -2989,13 +2998,13 @@ <string>hairspace</string> <string>zerowidthspace</string> <string>arrowleft</string> - <string>arrowleft.cap</string> + <string>arrowleft.case</string> <string>arrowup</string> - <string>arrowup.cap</string> + <string>arrowup.case</string> <string>arrowright</string> - <string>arrowright.cap</string> + <string>arrowright.case</string> <string>arrowdown</string> - <string>arrowdown.cap</string> + <string>arrowdown.case</string> <string>triagrt</string> <string>triagdn</string> <string>triagup</string> @@ -4154,7 +4163,6 @@ <string>uni1AB9</string> <string>uni1AB8</string> <string>uni1D61</string> - <string>colon.pnum</string> <string>glottalstopbarrev</string> <string>uni1D66</string> <string>cyrillichook</string> diff --git a/src/features.fea b/src/features.fea index 3a3bc94f6..0b69d8593 100644 --- a/src/features.fea +++ b/src/features.fea @@ -45,10 +45,32 @@ languagesystem grek dflt; @GDEF_COMPONENT = [ acutedotcomb breveacutecomb brevegravecomb brevehookcomb brevetildecomb carondotcomb circumflexacutecomb circumflexgravecomb circumflexhookcomb circumflextildecomb commaaccentrotate dieresisacutecomb dieresiscaroncomb dieresisgravecomb dieresismacroncomb dotmacroncomb macronacutecomb macrondieresiscomb macrongravecomb ringacute tildeacutecomb tildedieresiscomb tildemacroncomb tonebarextrahighmod tonebarhighmod tonebarmidmod tonebarlowmod tonebarextralowmod uni1AB9 uni1ABA uni1ABD ]; table GDEF { - GlyphClassDef @GDEF_BASE, @GDEF_LIGATURE, @GDEF_MARK, @GDEF_COMPONENT; + GlyphClassDef @GDEF_BASE, @GDEF_LIGATURE, @GDEF_MARK, @GDEF_COMPONENT; } GDEF; +feature aalt { # Access All Alternates + feature locl; + feature frac; + feature numr; + feature dnom; + feature tnum; + feature ss01; + feature zero; + feature calt; +} aalt; + +feature locl { + script latn; language dflt; #set comment (#) for FDK 2.5 + language MOL exclude_dflt; # Moldavian + sub [Scedilla scedilla] by [Scommaaccent scommaaccent]; + language ROM exclude_dflt; # Romanian + sub [Scedilla scedilla] by [Scommaaccent scommaaccent]; + language FRA exclude_dflt; # French + sub [thinspace] by [uni2009.fra]; +} locl; + + feature mark { ;#insert from script mark } mark; @@ -834,73 +856,131 @@ feature numr { sub @frac1 by @frac2; } numr; +@CASE_L = [ + asterisk + at + multiply + minus + plus + plusminus + divide + equal + notequal + endash + figuredash + emdash + hyphen + bullet + arrowleft + arrowup + arrowright + arrowdown + notequal + braceleft braceright + bracketleft bracketright + parenleft parenright + colon +]; +@CASE_R = [ + asterisk.case + at.case + multiply.case + minus.case + plus.case + plusminus.case + divide.case + equal.case + notequal.case + endash.case + figuredash.case + emdash.case + hyphen.case + bullet.case + arrowleft.case + arrowup.case + arrowright.case + arrowdown.case + notequal.case + braceleft.case braceright.case + bracketleft.case bracketright.case + parenleft.case parenright.case + colon.case +]; + +feature case { + sub @CASE_L by @CASE_R; +} case; + feature calt { @UC = [ @UC_ROMAN @UC_SET1 exclam question ]; - sub @UC at' @UC by at.cap; + sub @UC at' @UC by at.case; + sub @UC asterisk' by asterisk.case; + + sub multiply' @UC by multiply.case; + sub @UC multiply' by multiply.case; + + sub minus' @UC by minus.case; + sub @UC minus' by minus.case; + + sub plus' @UC by plus.case; + sub @UC plus' by plus.case; - sub @NUM x' by multiply.cap; - sub x' @NUM by multiply.cap; - sub multiply' @UC by multiply.cap; - sub @UC multiply' by multiply.cap; + sub plusminus' @UC by plusminus.case; + sub @UC plusminus' by plusminus.case; - sub hyphen' @NUM by minus.cap; - sub @NUM hyphen' by minus.cap; - sub minus' @UC by minus.cap; - sub @UC minus' by minus.cap; + sub divide' @UC by divide.case; + sub @UC divide' by divide.case; - sub plus' @UC by plus.cap; - sub @UC plus' by plus.cap; + sub equal' @UC by equal.case; + sub @UC equal' by equal.case; - sub divide' @UC by divide.cap; - sub @UC divide' by divide.cap; + sub notequal' @UC by notequal.case; + sub @UC notequal' by notequal.case; - sub equal' @UC by equal.cap; - sub @UC equal' by equal.cap; + sub endash' @UC by endash.case; + sub @UC endash' by endash.case; - sub notequal' @UC by notequal.cap; - sub @UC notequal' by notequal.cap; + sub figuredash' @UC by figuredash.case; + sub @UC figuredash' by figuredash.case; - sub endash' @UC by endash.cap; - sub @UC endash' by endash.cap; + sub emdash' @UC by emdash.case; + sub @UC emdash' by emdash.case; - sub figuredash' @UC by figuredash.cap; - sub @UC figuredash' by figuredash.cap; + sub hyphen' @UC by hyphen.case; + sub @UC hyphen' by hyphen.case; - sub emdash' @UC by emdash.cap; - sub @UC emdash' by emdash.cap; + sub bullet' @UC by bullet.case; + sub @UC bullet' by bullet.case; - sub hyphen' @UC by hyphen.cap; - sub @UC hyphen' by hyphen.cap; + sub arrowleft' @UC by arrowleft.case; + sub @UC arrowleft' by arrowleft.case; - sub @UC bullet' by bullet.cap; - sub bullet' @SPACE @SPACE @UC by bullet.cap; - sub bullet' @SPACE @UC by bullet.cap; - sub bullet' @UC by bullet.cap; + sub arrowup' @UC by arrowup.case; + sub @UC arrowup' by arrowup.case; - sub arrowleft' @UC by arrowleft.cap; - sub @UC arrowleft' by arrowleft.cap; + sub arrowright' @UC by arrowright.case; + sub @UC arrowright' by arrowright.case; - sub arrowup' @UC by arrowup.cap; - sub @UC arrowup' by arrowup.cap; + sub arrowdown' @UC by arrowdown.case; + sub @UC arrowdown' by arrowdown.case; - sub arrowright' @UC by arrowright.cap; - sub @UC arrowright' by arrowright.cap; + sub notequal' @UC by notequal.case; + sub @UC notequal' by notequal.case; - sub arrowdown' @UC by arrowdown.cap; - sub @UC arrowdown' by arrowdown.cap; + sub braceleft' @UC by braceleft.case; + sub @UC braceright' by braceright.case; - sub notequal' @UC by notequal.cap; - sub @UC notequal' by notequal.cap; + sub bracketleft' @UC by bracketleft.case; + sub @UC bracketright' by bracketright.case; - sub braceleft' @UC by braceleft.cap; - sub @UC braceright' by braceright.cap; + sub parenleft' @UC by parenleft.case; + sub @UC parenright' by parenright.case; - sub bracketleft' @UC by bracketleft.cap; - sub @UC bracketright' by bracketright.cap; + sub colon' @UC by colon.case; + sub @UC colon' by colon.case; - sub parenleft' @UC by parenleft.cap; - sub @UC parenright' by parenright.cap; + sub period' @NUM by period.num; } calt; # Stylistic set 1: open digits diff --git a/src/glyphorder.txt b/src/glyphorder.txt index d52027208..23d992c76 100644 --- a/src/glyphorder.txt +++ b/src/glyphorder.txt @@ -1619,7 +1619,6 @@ uniA799 uni1AB9 uni1AB8 uni1D61 -colon.pnum glottalstopbarrev uni1D66 cyrillichook |