From 66d89e754fbdc0ae9e5bdeaf5bea04424ab16305 Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sat, 26 Aug 2017 13:35:55 -0700
Subject: Adds and improves a lot of case and calt ".case" glyphs used with
 tall letterforms

---
 .../glyphs/arrowdown.cap.glif                      |  22 ----
 .../glyphs/arrowdown.case.glif                     |  22 ++++
 .../glyphs/arrowleft.cap.glif                      |  22 ----
 .../glyphs/arrowleft.case.glif                     |  22 ++++
 .../glyphs/arrowright.cap.glif                     |  22 ----
 .../glyphs/arrowright.case.glif                    |  22 ++++
 src/Interface-Regular.ufo/glyphs/arrowup.cap.glif  |  24 -----
 src/Interface-Regular.ufo/glyphs/arrowup.case.glif |  24 +++++
 .../glyphs/asterisk.case.glif                      | 119 +++++++++++++++++++++
 src/Interface-Regular.ufo/glyphs/at.cap.glif       |  22 ----
 src/Interface-Regular.ufo/glyphs/at.case.glif      |  22 ++++
 .../glyphs/braceleft.cap.glif                      |  18 ----
 .../glyphs/braceleft.case.glif                     |  18 ++++
 .../glyphs/braceright.cap.glif                     |  18 ----
 .../glyphs/braceright.case.glif                    |  18 ++++
 .../glyphs/bracketleft.cap.glif                    |  18 ----
 .../glyphs/bracketleft.case.glif                   |  18 ++++
 .../glyphs/bracketright.cap.glif                   |  18 ----
 .../glyphs/bracketright.case.glif                  |  18 ++++
 src/Interface-Regular.ufo/glyphs/bullet.cap.glif   |  22 ----
 src/Interface-Regular.ufo/glyphs/bullet.case.glif  |  22 ++++
 src/Interface-Regular.ufo/glyphs/c.glif            |  54 +++++-----
 src/Interface-Regular.ufo/glyphs/colon.case.glif   |  25 +++++
 src/Interface-Regular.ufo/glyphs/colon.glif        |   2 +-
 src/Interface-Regular.ufo/glyphs/colon.pnum.glif   |  19 ----
 src/Interface-Regular.ufo/glyphs/contents.plist    | 100 +++++++++--------
 src/Interface-Regular.ufo/glyphs/divide.cap.glif   |  22 ----
 src/Interface-Regular.ufo/glyphs/divide.case.glif  |  22 ++++
 src/Interface-Regular.ufo/glyphs/e.glif            |  54 +++++-----
 src/Interface-Regular.ufo/glyphs/emdash.cap.glif   |  18 ----
 src/Interface-Regular.ufo/glyphs/emdash.case.glif  |  18 ++++
 src/Interface-Regular.ufo/glyphs/endash.cap.glif   |  18 ----
 src/Interface-Regular.ufo/glyphs/endash.case.glif  |  18 ++++
 src/Interface-Regular.ufo/glyphs/equal.cap.glif    |  24 -----
 src/Interface-Regular.ufo/glyphs/equal.case.glif   |  24 +++++
 .../glyphs/figuredash.cap.glif                     |  20 ----
 .../glyphs/figuredash.case.glif                    |  20 ++++
 src/Interface-Regular.ufo/glyphs/hyphen.cap.glif   |  22 ----
 src/Interface-Regular.ufo/glyphs/hyphen.case.glif  |  22 ++++
 src/Interface-Regular.ufo/glyphs/hyphen.glif       |   8 +-
 src/Interface-Regular.ufo/glyphs/minus.cap.glif    |  22 ----
 src/Interface-Regular.ufo/glyphs/minus.case.glif   |  22 ++++
 src/Interface-Regular.ufo/glyphs/multiply.cap.glif |  22 ----
 .../glyphs/multiply.case.glif                      |  22 ++++
 src/Interface-Regular.ufo/glyphs/notequal.cap.glif |  24 -----
 .../glyphs/notequal.case.glif                      |  24 +++++
 src/Interface-Regular.ufo/glyphs/o.glif            |  52 ++++-----
 .../glyphs/parenleft.cap.glif                      |  81 --------------
 .../glyphs/parenleft.case.glif                     |  81 ++++++++++++++
 .../glyphs/parenright.cap.glif                     |  22 ----
 .../glyphs/parenright.case.glif                    |  22 ++++
 src/Interface-Regular.ufo/glyphs/period.glif       |  22 ++--
 src/Interface-Regular.ufo/glyphs/period.num.glif   |  22 ++++
 src/Interface-Regular.ufo/glyphs/plus.cap.glif     |  22 ----
 src/Interface-Regular.ufo/glyphs/plus.case.glif    |  22 ++++
 .../glyphs/plusminus.case.glif                     |  22 ++++
 src/Interface-Regular.ufo/glyphs/semicolon.glif    |   2 +-
 src/Interface-Regular.ufo/glyphs/two.tnum.glif     |  18 ++++
 src/Interface-Regular.ufo/glyphs/uni20DB__.glif    |   6 +-
 src/Interface-Regular.ufo/glyphs/uni20DC__.glif    |   6 +-
 60 files changed, 886 insertions(+), 691 deletions(-)
 delete mode 100644 src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowdown.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowleft.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/arrowright.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowright.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/arrowup.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/arrowup.case.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/asterisk.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/at.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/at.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/braceleft.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/braceleft.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/braceright.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/braceright.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/bracketleft.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/bracketleft.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/bracketright.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/bracketright.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/bullet.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/bullet.case.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/colon.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/colon.pnum.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/divide.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/divide.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/emdash.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/emdash.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/endash.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/endash.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/equal.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/equal.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/figuredash.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/figuredash.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/hyphen.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/hyphen.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/minus.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/minus.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/multiply.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/multiply.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/notequal.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/notequal.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/parenleft.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/parenleft.case.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/parenright.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/parenright.case.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/period.num.glif
 delete mode 100644 src/Interface-Regular.ufo/glyphs/plus.cap.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/plus.case.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/plusminus.case.glif
 create mode 100644 src/Interface-Regular.ufo/glyphs/two.tnum.glif

(limited to 'src/Interface-Regular.ufo/glyphs')

diff --git a/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif
deleted file mode 100644
index 1135c16e1..000000000
--- a/src/Interface-Regular.ufo/glyphs/arrowdown.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowdown.cap" format="1">
-  <advance width="1792"/>
-  <outline>
-    <component base="arrowdown" yOffset="256"/>
-  </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/arrowdown.case.glif b/src/Interface-Regular.ufo/glyphs/arrowdown.case.glif
new file mode 100644
index 000000000..6a2c90ab6
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowdown.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowdown.case" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="arrowdown" yOffset="256"/>
+  </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/arrowleft.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif
deleted file mode 100644
index 5df173709..000000000
--- a/src/Interface-Regular.ufo/glyphs/arrowleft.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowleft.cap" format="1">
-  <advance width="3072"/>
-  <outline>
-    <component base="arrowleft" yOffset="128"/>
-  </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/arrowleft.case.glif b/src/Interface-Regular.ufo/glyphs/arrowleft.case.glif
new file mode 100644
index 000000000..bfbb1008d
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowleft.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowleft.case" format="1">
+  <advance width="3072"/>
+  <outline>
+    <component base="arrowleft" yOffset="128"/>
+  </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/arrowright.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowright.cap.glif
deleted file mode 100644
index 5371d1042..000000000
--- a/src/Interface-Regular.ufo/glyphs/arrowright.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowright.cap" format="1">
-  <advance width="3072.0"/>
-  <outline>
-    <component base="arrowright" yOffset="128"/>
-  </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/arrowright.case.glif b/src/Interface-Regular.ufo/glyphs/arrowright.case.glif
new file mode 100644
index 000000000..cad231432
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowright.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowright.case" format="1">
+  <advance width="3072.0"/>
+  <outline>
+    <component base="arrowright" yOffset="128"/>
+  </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/arrowup.cap.glif b/src/Interface-Regular.ufo/glyphs/arrowup.cap.glif
deleted file mode 100644
index 8e8a3743b..000000000
--- a/src/Interface-Regular.ufo/glyphs/arrowup.cap.glif
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="arrowup.cap" format="1">
-  <advance width="1792"/>
-  <outline>
-    <component base="arrowup" yOffset="256"/>
-  </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': 1800, 'leftMargin': 296, 'rightMargin': 304}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/arrowup.case.glif b/src/Interface-Regular.ufo/glyphs/arrowup.case.glif
new file mode 100644
index 000000000..f5001d609
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/arrowup.case.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="arrowup.case" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="arrowup" yOffset="256"/>
+  </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': 1800, 'leftMargin': 296, 'rightMargin': 304}</string>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
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.cap.glif
deleted file mode 100644
index d77a33166..000000000
--- a/src/Interface-Regular.ufo/glyphs/at.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="at.cap" format="1">
-  <advance width="2560"/>
-  <outline>
-    <component base="at" yOffset="300"/>
-  </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/at.case.glif b/src/Interface-Regular.ufo/glyphs/at.case.glif
new file mode 100644
index 000000000..e78088bcd
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/at.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="at.case" format="1">
+  <advance width="2560"/>
+  <outline>
+    <component base="at" yOffset="300"/>
+  </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/braceleft.cap.glif b/src/Interface-Regular.ufo/glyphs/braceleft.cap.glif
deleted file mode 100644
index bf5f8c93c..000000000
--- a/src/Interface-Regular.ufo/glyphs/braceleft.cap.glif
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceleft.cap" format="1">
-  <advance width="768"/>
-  <outline>
-    <component base="braceleft" yOffset="172"/>
-  </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>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/braceleft.case.glif b/src/Interface-Regular.ufo/glyphs/braceleft.case.glif
new file mode 100644
index 000000000..5bb77e00f
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/braceleft.case.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="braceleft.case" format="1">
+  <advance width="768"/>
+  <outline>
+    <component base="braceleft" yOffset="172"/>
+  </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>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/braceright.cap.glif b/src/Interface-Regular.ufo/glyphs/braceright.cap.glif
deleted file mode 100644
index 2d0f0ab51..000000000
--- a/src/Interface-Regular.ufo/glyphs/braceright.cap.glif
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="braceright.cap" format="1">
-  <advance width="768"/>
-  <outline>
-    <component base="braceright" yOffset="172"/>
-  </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>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/braceright.case.glif b/src/Interface-Regular.ufo/glyphs/braceright.case.glif
new file mode 100644
index 000000000..1e19378d8
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/braceright.case.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="braceright.case" format="1">
+  <advance width="768"/>
+  <outline>
+    <component base="braceright" yOffset="172"/>
+  </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>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/bracketleft.cap.glif b/src/Interface-Regular.ufo/glyphs/bracketleft.cap.glif
deleted file mode 100644
index e80b0f206..000000000
--- a/src/Interface-Regular.ufo/glyphs/bracketleft.cap.glif
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketleft.cap" format="1">
-  <advance width="640"/>
-  <outline>
-    <component base="bracketleft" yOffset="128"/>
-  </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>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/bracketleft.case.glif b/src/Interface-Regular.ufo/glyphs/bracketleft.case.glif
new file mode 100644
index 000000000..709eec679
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/bracketleft.case.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="bracketleft.case" format="1">
+  <advance width="640"/>
+  <outline>
+    <component base="bracketleft" yOffset="128"/>
+  </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>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/bracketright.cap.glif b/src/Interface-Regular.ufo/glyphs/bracketright.cap.glif
deleted file mode 100644
index 6de1774f3..000000000
--- a/src/Interface-Regular.ufo/glyphs/bracketright.cap.glif
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bracketright.cap" format="1">
-  <advance width="640"/>
-  <outline>
-    <component base="bracketright" yOffset="128"/>
-  </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>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/bracketright.case.glif b/src/Interface-Regular.ufo/glyphs/bracketright.case.glif
new file mode 100644
index 000000000..66b7880e0
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/bracketright.case.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="bracketright.case" format="1">
+  <advance width="640"/>
+  <outline>
+    <component base="bracketright" yOffset="128"/>
+  </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>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/bullet.cap.glif b/src/Interface-Regular.ufo/glyphs/bullet.cap.glif
deleted file mode 100644
index bb066b3f0..000000000
--- a/src/Interface-Regular.ufo/glyphs/bullet.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="bullet.cap" format="1">
-  <advance width="1280"/>
-  <outline>
-    <component base="bullet" yOffset="124"/>
-  </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/bullet.case.glif b/src/Interface-Regular.ufo/glyphs/bullet.case.glif
new file mode 100644
index 000000000..3600925e6
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/bullet.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="bullet.case" format="1">
+  <advance width="1280"/>
+  <outline>
+    <component base="bullet" yOffset="124"/>
+  </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/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.cap.glif
deleted file mode 100644
index 5e81c3b50..000000000
--- a/src/Interface-Regular.ufo/glyphs/divide.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="divide.cap" format="1">
-  <advance width="1792"/>
-  <outline>
-    <component base="divide" yOffset="136"/>
-  </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/divide.case.glif b/src/Interface-Regular.ufo/glyphs/divide.case.glif
new file mode 100644
index 000000000..46a73bed7
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/divide.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="divide.case" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="divide" yOffset="136"/>
+  </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/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.cap.glif
deleted file mode 100644
index 14c9036ad..000000000
--- a/src/Interface-Regular.ufo/glyphs/emdash.cap.glif
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="emdash.cap" format="1">
-  <advance width="2560"/>
-  <outline>
-    <component base="emdash" yOffset="148"/>
-  </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>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/emdash.case.glif b/src/Interface-Regular.ufo/glyphs/emdash.case.glif
new file mode 100644
index 000000000..e120f89f5
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/emdash.case.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="emdash.case" format="1">
+  <advance width="2560"/>
+  <outline>
+    <component base="emdash" yOffset="148"/>
+  </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>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/endash.cap.glif b/src/Interface-Regular.ufo/glyphs/endash.cap.glif
deleted file mode 100644
index 806d2c64b..000000000
--- a/src/Interface-Regular.ufo/glyphs/endash.cap.glif
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="endash.cap" format="1">
-  <advance width="1280"/>
-  <outline>
-    <component base="endash" yOffset="148"/>
-  </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>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/endash.case.glif b/src/Interface-Regular.ufo/glyphs/endash.case.glif
new file mode 100644
index 000000000..80a8ad053
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/endash.case.glif
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="endash.case" format="1">
+  <advance width="1280"/>
+  <outline>
+    <component base="endash" yOffset="148"/>
+  </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>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/equal.cap.glif b/src/Interface-Regular.ufo/glyphs/equal.cap.glif
deleted file mode 100644
index 833b6ede1..000000000
--- a/src/Interface-Regular.ufo/glyphs/equal.cap.glif
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="equal.cap" format="1">
-  <advance width="1664"/>
-  <outline>
-    <component base="equal" yOffset="144"/>
-  </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': 1664, 'leftMargin': 256, 'rightMargin': 256}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/equal.case.glif b/src/Interface-Regular.ufo/glyphs/equal.case.glif
new file mode 100644
index 000000000..a56e0dfa2
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/equal.case.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="equal.case" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="equal" yOffset="144"/>
+  </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': 1664, 'leftMargin': 256, 'rightMargin': 256}</string>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif b/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif
deleted file mode 100644
index 16422005b..000000000
--- a/src/Interface-Regular.ufo/glyphs/figuredash.cap.glif
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="figuredash.cap" format="1">
-  <advance width="1792"/>
-  <outline>
-    <component base="figuredash" yOffset="148"/>
-  </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': 1610, 'leftMargin': 256, 'rightMargin': 330}</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/figuredash.case.glif b/src/Interface-Regular.ufo/glyphs/figuredash.case.glif
new file mode 100644
index 000000000..f5aab3d76
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/figuredash.case.glif
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="figuredash.case" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="figuredash" yOffset="148"/>
+  </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': 1610, 'leftMargin': 256, 'rightMargin': 330}</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif b/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif
deleted file mode 100644
index 4f4846a72..000000000
--- a/src/Interface-Regular.ufo/glyphs/hyphen.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="hyphen.cap" format="1">
-  <advance width="1248"/>
-  <outline>
-    <component base="hyphen" yOffset="148"/>
-  </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/hyphen.case.glif b/src/Interface-Regular.ufo/glyphs/hyphen.case.glif
new file mode 100644
index 000000000..5bdc5d250
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/hyphen.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="hyphen.case" format="1">
+  <advance width="1248"/>
+  <outline>
+    <component base="hyphen" yOffset="148"/>
+  </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/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.cap.glif
deleted file mode 100644
index 8b733dc62..000000000
--- a/src/Interface-Regular.ufo/glyphs/minus.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="minus.cap" format="1">
-  <advance width="1280"/>
-  <outline>
-    <component base="minus" yOffset="140"/>
-  </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/minus.case.glif b/src/Interface-Regular.ufo/glyphs/minus.case.glif
new file mode 100644
index 000000000..f3209deb6
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/minus.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="minus.case" format="1">
+  <advance width="1280"/>
+  <outline>
+    <component base="minus" yOffset="140"/>
+  </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/multiply.cap.glif b/src/Interface-Regular.ufo/glyphs/multiply.cap.glif
deleted file mode 100644
index d8f37238e..000000000
--- a/src/Interface-Regular.ufo/glyphs/multiply.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="multiply.cap" format="1">
-  <advance width="1536"/>
-  <outline>
-    <component base="multiply" yOffset="96"/>
-  </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/multiply.case.glif b/src/Interface-Regular.ufo/glyphs/multiply.case.glif
new file mode 100644
index 000000000..d4e30f2b2
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/multiply.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="multiply.case" format="1">
+  <advance width="1536"/>
+  <outline>
+    <component base="multiply" yOffset="96"/>
+  </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/notequal.cap.glif b/src/Interface-Regular.ufo/glyphs/notequal.cap.glif
deleted file mode 100644
index 3a773ca9e..000000000
--- a/src/Interface-Regular.ufo/glyphs/notequal.cap.glif
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="notequal.cap" format="1">
-  <advance width="1664"/>
-  <outline>
-    <component base="notequal" yOffset="144"/>
-  </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': 1543, 'leftMargin': 256, 'rightMargin': 135}</string>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/notequal.case.glif b/src/Interface-Regular.ufo/glyphs/notequal.case.glif
new file mode 100644
index 000000000..74dad9f2f
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/notequal.case.glif
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="notequal.case" format="1">
+  <advance width="1664"/>
+  <outline>
+    <component base="notequal" yOffset="144"/>
+  </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': 1543, 'leftMargin': 256, 'rightMargin': 135}</string>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
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.cap.glif
deleted file mode 100644
index cf436bdfa..000000000
--- a/src/Interface-Regular.ufo/glyphs/parenleft.cap.glif
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenleft.cap" format="1">
-  <advance width="984"/>
-  <outline>
-    <component base="parenleft" yOffset="192"/>
-  </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>384</integer>
-          <key>y</key>
-          <integer>-128</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>584</integer>
-          <key>y</key>
-          <integer>4</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>388</integer>
-          <key>y</key>
-          <integer>1752</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>556</integer>
-          <key>y</key>
-          <integer>1640</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>
-      <key>interface.width-adjustments</key>
-      <array>
-        <integer>-16</integer>
-      </array>
-    </dict>
-  </lib>
-</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/parenleft.case.glif b/src/Interface-Regular.ufo/glyphs/parenleft.case.glif
new file mode 100644
index 000000000..c2803e11e
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/parenleft.case.glif
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="parenleft.case" format="1">
+  <advance width="984"/>
+  <outline>
+    <component base="parenleft" yOffset="192"/>
+  </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>384</integer>
+          <key>y</key>
+          <integer>-128</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>584</integer>
+          <key>y</key>
+          <integer>4</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>388</integer>
+          <key>y</key>
+          <integer>1752</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>556</integer>
+          <key>y</key>
+          <integer>1640</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>
+      <key>interface.width-adjustments</key>
+      <array>
+        <integer>-16</integer>
+      </array>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Interface-Regular.ufo/glyphs/parenright.cap.glif b/src/Interface-Regular.ufo/glyphs/parenright.cap.glif
deleted file mode 100644
index f20aee477..000000000
--- a/src/Interface-Regular.ufo/glyphs/parenright.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="parenright.cap" format="1">
-  <advance width="984"/>
-  <outline>
-    <component base="parenright" yOffset="192"/>
-  </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/parenright.case.glif b/src/Interface-Regular.ufo/glyphs/parenright.case.glif
new file mode 100644
index 000000000..393f1e28f
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/parenright.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="parenright.case" format="1">
+  <advance width="984"/>
+  <outline>
+    <component base="parenright" yOffset="192"/>
+  </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/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.cap.glif
deleted file mode 100644
index 229b6ebb0..000000000
--- a/src/Interface-Regular.ufo/glyphs/plus.cap.glif
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="plus.cap" format="1">
-  <advance width="1792"/>
-  <outline>
-    <component base="plus" yOffset="128"/>
-  </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/plus.case.glif b/src/Interface-Regular.ufo/glyphs/plus.case.glif
new file mode 100644
index 000000000..c554586de
--- /dev/null
+++ b/src/Interface-Regular.ufo/glyphs/plus.case.glif
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="plus.case" format="1">
+  <advance width="1792"/>
+  <outline>
+    <component base="plus" yOffset="128"/>
+  </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/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>
-- 
cgit v1.2.3