more work on the light master

11 files changed, 491 insertions, 244 deletions

diff --git a/src/Inter-UI-Black.ufo/glyphs/_part.f_base.glif b/src/Inter-UI-Black.ufo/glyphs/_part.f_base.glif
new file mode 100644
index 000000000..2e254ab9f
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/_part.f_base.glif
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="_part.f_base" format="2">
+  <advance width="1156.0"/>
+  <outline>
+    <contour>
+      <point x="252.0" y="0.0" type="line"/>
+      <point x="804.0" y="0.0" type="line"/>
+      <point x="804.0" y="1604.0" type="line" smooth="yes"/>
+      <point x="804.0" y="1676.0"/>
+      <point x="832.0" y="1724.0"/>
+      <point x="936.0" y="1724.0" type="curve" smooth="yes"/>
+      <point x="976.0" y="1724.0"/>
+      <point x="1036.0" y="1716.0"/>
+      <point x="1076.0" y="1704.0" type="curve"/>
+      <point x="1156.0" y="2100.0" type="line"/>
+      <point x="1092.0" y="2116.0"/>
+      <point x="944.0" y="2144.0"/>
+      <point x="804.0" y="2144.0" type="curve" smooth="yes"/>
+      <point x="468.0" y="2144.0"/>
+      <point x="252.0" y="1960.0"/>
+      <point x="252.0" y="1580.0" type="curve" smooth="yes"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.Export</key>
+      <false/>
+      <key>com.schriftgestaltung.Glyphs.nodeUserData.0.0</key>
+      <dict>
+        <key>name</key>
+        <string>hr00</string>
+      </dict>
+      <key>public.markColor</key>
+      <string>0.04,0.57,0.04,1</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/_part.t_base.glif b/src/Inter-UI-Black.ufo/glyphs/_part.t_base.glif
new file mode 100644
index 000000000..b7d0fda77
--- /dev/null
+++ b/src/Inter-UI-Black.ufo/glyphs/_part.t_base.glif
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="_part.t_base" format="2">
+  <advance width="1140.0"/>
+  <outline>
+    <contour>
+      <point x="240.0" y="1904.0" type="line"/>
+      <point x="240.0" y="448.0" type="line"/>
+      <point x="236.0" y="126.0"/>
+      <point x="435.0" y="-37.0"/>
+      <point x="816.0" y="-16.0" type="curve" smooth="yes"/>
+      <point x="941.0" y="-9.0"/>
+      <point x="1034.0" y="17.0"/>
+      <point x="1084.0" y="32.0" type="curve"/>
+      <point x="1004.0" y="420.0" type="line"/>
+      <point x="983.0" y="415.0"/>
+      <point x="929.0" y="404.0"/>
+      <point x="896.0" y="404.0" type="curve" smooth="yes"/>
+      <point x="824.0" y="404.0"/>
+      <point x="792.0" y="436.0"/>
+      <point x="792.0" y="500.0" type="curve" smooth="yes"/>
+      <point x="792.0" y="1904.0" type="line"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.Export</key>
+      <false/>
+      <key>public.markColor</key>
+      <string>0.04,0.57,0.04,1</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/contents.plist b/src/Inter-UI-Black.ufo/glyphs/contents.plist
index 90958a364..37dd8deee 100644
--- a/src/Inter-UI-Black.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Black.ufo/glyphs/contents.plist
@@ -912,6 +912,10 @@
     <string>Z_hedieresiscyrillic.glif</string>
     <key>Zlinebelow</key>
     <string>Z_linebelow.glif</string>
+    <key>_part.f_base</key>
+    <string>_part.f_base.glif</string>
+    <key>_part.t_base</key>
+    <string>_part.t_base.glif</string>
     <key>a</key>
     <string>a.glif</string>
     <key>a.subs</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/f.glif b/src/Inter-UI-Black.ufo/glyphs/f.glif
index ccc6e5563..1a123d687 100644
--- a/src/Inter-UI-Black.ufo/glyphs/f.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/f.glif
@@ -11,32 +11,10 @@
       <point x="56.0" y="1136.0" type="line"/>
       <point x="1084.0" y="1136.0" type="line"/>
     </contour>
-    <contour>
-      <point x="252.0" y="0.0" type="line"/>
-      <point x="804.0" y="0.0" type="line"/>
-      <point x="804.0" y="1604.0" type="line" smooth="yes"/>
-      <point x="804.0" y="1676.0"/>
-      <point x="832.0" y="1724.0"/>
-      <point x="936.0" y="1724.0" type="curve" smooth="yes"/>
-      <point x="976.0" y="1724.0"/>
-      <point x="1036.0" y="1716.0"/>
-      <point x="1076.0" y="1704.0" type="curve"/>
-      <point x="1156.0" y="2100.0" type="line"/>
-      <point x="1092.0" y="2116.0"/>
-      <point x="944.0" y="2144.0"/>
-      <point x="804.0" y="2144.0" type="curve" smooth="yes"/>
-      <point x="468.0" y="2144.0"/>
-      <point x="252.0" y="1960.0"/>
-      <point x="252.0" y="1580.0" type="curve" smooth="yes"/>
-    </contour>
+    <component base="_part.f_base"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.1.0</key>
-      <dict>
-        <key>name</key>
-        <string>hr00</string>
-      </dict>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -73,8 +51,8 @@
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>1.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
diff --git a/src/Inter-UI-Black.ufo/glyphs/plus.glif b/src/Inter-UI-Black.ufo/glyphs/plus.glif
index 1f2b40ce0..fdada5c20 100644
--- a/src/Inter-UI-Black.ufo/glyphs/plus.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/plus.glif
@@ -45,26 +45,6 @@
         </dict>
         <dict>
           <key>horizontal</key>
-          <false/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>1.0</real>
-            <real>2.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>3.0</real>
-          </array>
-          <key>type</key>
-          <string>Stem</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
           <true/>
           <key>options</key>
           <integer>4</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/slongdotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/slongdotaccent.glif
index 27f8a364d..8165a9baa 100644
--- a/src/Inter-UI-Black.ufo/glyphs/slongdotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/slongdotaccent.glif
@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="slongdotaccent" format="2">
-  <advance width="1044.0"/>
+  <advance width="1156.0"/>
   <unicode hex="1E9B"/>
   <outline>
-    <contour>
-      <point x="140.0" y="0.0" type="line"/>
-      <point x="692.0" y="0.0" type="line"/>
-      <point x="692.0" y="1604.0" type="line" smooth="yes"/>
-      <point x="690.0" y="1676.0"/>
-      <point x="718.0" y="1724.0"/>
-      <point x="824.0" y="1724.0" type="curve" smooth="yes"/>
-      <point x="862.0" y="1724.0"/>
-      <point x="922.0" y="1716.0"/>
-      <point x="964.0" y="1704.0" type="curve"/>
-      <point x="1044.0" y="2100.0" type="line"/>
-      <point x="978.0" y="2116.0"/>
-      <point x="830.0" y="2144.0"/>
-      <point x="692.0" y="2144.0" type="curve" smooth="yes"/>
-      <point x="354.0" y="2144.0"/>
-      <point x="138.0" y="1960.0"/>
-      <point x="140.0" y="1580.0" type="curve" smooth="yes"/>
-    </contour>
-    <component base="dotaccent" xOffset="148.0" yOffset="616.0"/>
+    <component base="_part.f_base"/>
+    <component base="dotaccent" xOffset="240.0" yOffset="532.0"/>
   </outline>
   <lib>
     <dict>
@@ -29,11 +12,11 @@
       <string>i</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>f</string>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.0.0</key>
-      <dict>
-        <key>name</key>
-        <string>hr00</string>
-      </dict>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>1</integer>
+        <integer>1</integer>
+      </array>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -41,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -61,18 +44,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>15.0</real>
+            <real>140.0</real>
+            <real>904.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>8.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -81,10 +59,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/slongstroke.glif b/src/Inter-UI-Black.ufo/glyphs/slongstroke.glif
index f69b17564..bbac1599c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/slongstroke.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/slongstroke.glif
@@ -1,32 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="slongstroke" format="2">
-  <advance width="1172.0"/>
+  <advance width="1156.0"/>
   <unicode hex="1E9C"/>
+  <guideline x="528.0" y="-84.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="268.0" y="0.0" type="line"/>
-      <point x="820.0" y="0.0" type="line"/>
-      <point x="820.0" y="1604.0" type="line" smooth="yes"/>
-      <point x="820.0" y="1676.0"/>
-      <point x="848.0" y="1724.0"/>
-      <point x="952.0" y="1724.0" type="curve" smooth="yes"/>
-      <point x="992.0" y="1724.0"/>
-      <point x="1052.0" y="1716.0"/>
-      <point x="1092.0" y="1704.0" type="curve"/>
-      <point x="1172.0" y="2100.0" type="line"/>
-      <point x="1108.0" y="2116.0"/>
-      <point x="960.0" y="2144.0"/>
-      <point x="820.0" y="2144.0" type="curve" smooth="yes"/>
-      <point x="484.0" y="2144.0"/>
-      <point x="268.0" y="1960.0"/>
-      <point x="268.0" y="1580.0" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="56.0" y="732.0" type="line"/>
-      <point x="1064.0" y="1064.0" type="line"/>
-      <point x="1064.0" y="1368.0" type="line"/>
-      <point x="56.0" y="1040.0" type="line"/>
+      <point x="56.0" y="788.0" type="line"/>
+      <point x="1084.0" y="1120.0" type="line"/>
+      <point x="1084.0" y="1536.0" type="line"/>
+      <point x="56.0" y="1208.0" type="line"/>
     </contour>
+    <component base="_part.f_base"/>
   </outline>
   <lib>
     <dict>
@@ -34,12 +18,7 @@
       <string>f</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>f</string>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.0.0</key>
-      <dict>
-        <key>name</key>
-        <string>hr00</string>
-      </dict>
-      <key>com.schriftgestaltung.Glyphs.nodeUserData.1.1</key>
+      <key>com.schriftgestaltung.Glyphs.nodeUserData.0.1</key>
       <dict>
         <key>name</key>
         <string>hr00</string>
@@ -51,10 +30,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -73,7 +52,7 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
+            <real>0.0</real>
             <real>3.0</real>
           </array>
           <key>stem</key>
@@ -81,7 +60,7 @@
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>8.0</real>
+            <real>1.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -94,7 +73,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/t.glif b/src/Inter-UI-Black.ufo/glyphs/t.glif
index 8deaef42c..92d336177 100644
--- a/src/Inter-UI-Black.ufo/glyphs/t.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/t.glif
@@ -10,24 +10,7 @@
       <point x="44.0" y="1136.0" type="line"/>
       <point x="1056.0" y="1136.0" type="line"/>
     </contour>
-    <contour>
-      <point x="240.0" y="1904.0" type="line"/>
-      <point x="240.0" y="448.0" type="line"/>
-      <point x="236.0" y="126.0"/>
-      <point x="435.0" y="-37.0"/>
-      <point x="816.0" y="-16.0" type="curve" smooth="yes"/>
-      <point x="941.0" y="-9.0"/>
-      <point x="1034.0" y="17.0"/>
-      <point x="1084.0" y="32.0" type="curve"/>
-      <point x="1004.0" y="420.0" type="line"/>
-      <point x="983.0" y="415.0"/>
-      <point x="929.0" y="404.0"/>
-      <point x="896.0" y="404.0" type="curve" smooth="yes"/>
-      <point x="824.0" y="404.0"/>
-      <point x="788.0" y="437.0"/>
-      <point x="792.0" y="500.0" type="curve"/>
-      <point x="792.0" y="1904.0" type="line"/>
-    </contour>
+    <component base="_part.t_base"/>
   </outline>
   <lib>
     <dict>
@@ -69,8 +52,8 @@
           <integer>-2</integer>
           <key>target</key>
           <array>
+            <real>0.0</real>
             <real>1.0</real>
-            <real>14.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tccurl.glif b/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
index 0aa8f286e..3b408f143 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
@@ -1,63 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tccurl" format="2">
-  <advance width="2408.0"/>
+  <advance width="2624.0"/>
   <unicode hex="02A8"/>
   <outline>
     <contour>
-      <point x="752.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1262.0" y="-28.0"/>
-      <point x="1610.0" y="484.0"/>
-      <point x="1744.0" y="484.0" type="curve" smooth="yes"/>
-      <point x="1782.0" y="484.0"/>
-      <point x="1814.0" y="472.0"/>
-      <point x="1812.0" y="444.0" type="curve" smooth="yes"/>
-      <point x="1814.0" y="396.0"/>
-      <point x="1766.0" y="388.0"/>
-      <point x="1704.0" y="388.0" type="curve" smooth="yes"/>
-      <point x="1446.0" y="388.0"/>
-      <point x="1446.0" y="540.0"/>
-      <point x="1444.0" y="724.0" type="curve" smooth="yes"/>
-      <point x="1444.0" y="748.0" type="line" smooth="yes"/>
-      <point x="1446.0" y="952.0"/>
-      <point x="1442.0" y="1144.0"/>
-      <point x="1636.0" y="1144.0" type="curve" smooth="yes"/>
-      <point x="1770.0" y="1144.0"/>
-      <point x="1830.0" y="1060.0"/>
-      <point x="1824.0" y="936.0" type="curve"/>
-      <point x="2316.0" y="936.0" type="line"/>
-      <point x="2322.0" y="1344.0"/>
-      <point x="2042.0" y="1556.0"/>
-      <point x="1648.0" y="1556.0" type="curve" smooth="yes"/>
-      <point x="1138.0" y="1556.0"/>
-      <point x="918.0" y="1188.0"/>
-      <point x="916.0" y="748.0" type="curve" smooth="yes"/>
-      <point x="916.0" y="724.0" type="line" smooth="yes"/>
-      <point x="918.0" y="284.0"/>
-      <point x="1162.0" y="-28.0"/>
-      <point x="1652.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2130.0" y="-28.0"/>
-      <point x="2318.0" y="256.0"/>
-      <point x="2316.0" y="476.0" type="curve" smooth="yes"/>
-      <point x="2318.0" y="680.0"/>
-      <point x="2162.0" y="872.0"/>
-      <point x="1880.0" y="872.0" type="curve" smooth="yes"/>
-      <point x="1434.0" y="872.0"/>
-      <point x="1058.0" y="392.0"/>
-      <point x="864.0" y="392.0" type="curve"/>
-      <point x="770.0" y="392.0"/>
-      <point x="766.0" y="432.0"/>
-      <point x="764.0" y="512.0" type="curve" smooth="yes"/>
-      <point x="764.0" y="1904.0" type="line"/>
-      <point x="240.0" y="1904.0" type="line"/>
-      <point x="240.0" y="512.0" type="line" smooth="yes"/>
-      <point x="242.0" y="124.0"/>
-      <point x="458.0" y="-28.0"/>
+      <point x="1056.0" y="1536.0" type="line"/>
+      <point x="44.0" y="1536.0" type="line"/>
+      <point x="44.0" y="1136.0" type="line"/>
+      <point x="1056.0" y="1136.0" type="line"/>
     </contour>
     <contour>
-      <point x="44.0" y="1136.0" type="line"/>
-      <point x="916.0" y="1136.0" type="line"/>
-      <point x="916.0" y="1536.0" type="line"/>
-      <point x="44.0" y="1536.0" type="line"/>
+      <point x="240.0" y="1904.0" type="line"/>
+      <point x="240.0" y="448.0" type="line"/>
+      <point x="236.0" y="149.0"/>
+      <point x="395.0" y="-16.0"/>
+      <point x="760.0" y="-16.0" type="curve" smooth="yes"/>
+      <point x="1136.0" y="-16.0"/>
+      <point x="1360.0" y="160.0"/>
+      <point x="1540.0" y="304.0" type="curve" smooth="yes"/>
+      <point x="1664.0" y="400.0"/>
+      <point x="1845.0" y="484.0"/>
+      <point x="1956.0" y="484.0" type="curve" smooth="yes"/>
+      <point x="2009.0" y="484.0"/>
+      <point x="2032.0" y="462.0"/>
+      <point x="2032.0" y="440.0" type="curve" smooth="yes"/>
+      <point x="2032.0" y="409.0"/>
+      <point x="2005.0" y="392.0"/>
+      <point x="1912.0" y="392.0" type="curve" smooth="yes"/>
+      <point x="1717.0" y="392.0"/>
+      <point x="1568.0" y="467.0"/>
+      <point x="1568.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="1568.0" y="1020.0"/>
+      <point x="1664.0" y="1144.0"/>
+      <point x="1808.0" y="1144.0" type="curve" smooth="yes"/>
+      <point x="1932.0" y="1144.0"/>
+      <point x="2012.0" y="1056.0"/>
+      <point x="2028.0" y="896.0" type="curve"/>
+      <point x="2540.0" y="896.0" type="line"/>
+      <point x="2536.0" y="1296.0"/>
+      <point x="2252.0" y="1556.0"/>
+      <point x="1800.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="1300.0" y="1556.0"/>
+      <point x="1004.0" y="1236.0"/>
+      <point x="1004.0" y="764.0" type="curve" smooth="yes"/>
+      <point x="1004.0" y="292.0"/>
+      <point x="1299.0" y="-28.0"/>
+      <point x="1808.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="2277.0" y="-28.0"/>
+      <point x="2537.0" y="242.0"/>
+      <point x="2536.0" y="516.0" type="curve" smooth="yes"/>
+      <point x="2535.0" y="740.0"/>
+      <point x="2360.0" y="872.0"/>
+      <point x="2060.0" y="872.0" type="curve" smooth="yes"/>
+      <point x="1803.0" y="872.0"/>
+      <point x="1520.0" y="776.0"/>
+      <point x="1212.0" y="524.0" type="curve" smooth="yes"/>
+      <point x="1073.0" y="410.0"/>
+      <point x="986.0" y="364.0"/>
+      <point x="896.0" y="364.0" type="curve" smooth="yes"/>
+      <point x="824.0" y="364.0"/>
+      <point x="792.0" y="396.0"/>
+      <point x="792.0" y="460.0" type="curve" smooth="yes"/>
+      <point x="792.0" y="1904.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -73,10 +77,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>47.0</real>
+            <real>32.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -93,10 +97,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>22.0</real>
+            <real>1556.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -115,10 +119,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>2.0</real>
+            <real>1536.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -139,8 +143,23 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
+            <real>1.0</real>
+            <real>3.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
             <real>0.0</real>
-            <real>47.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -155,7 +174,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>22.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -166,11 +185,175 @@
           <key>horizontal</key>
           <true/>
           <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>0.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <string>d</string>
+            <string>o</string>
+            <string>w</string>
+            <string>n</string>
+          </array>
+          <key>type</key>
+          <string>TopGhost</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>51.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>1.0</real>
+          </array>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
           <integer>4</integer>
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>2.0</real>
+            <real>3.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>0.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>1.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>0.0</real>
+          </array>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>-28.0</real>
+            <real>21.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <string>u</string>
+            <string>p</string>
+          </array>
+          <key>type</key>
+          <string>BottomGhost</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>1556.0</real>
+            <real>-20.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <string>d</string>
+            <string>o</string>
+            <string>w</string>
+            <string>n</string>
+          </array>
+          <key>type</key>
+          <string>TopGhost</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>place</key>
+          <array>
+            <real>1012.0</real>
+            <real>1476.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>-28.0</real>
+            <real>-2147483648.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>place</key>
+          <array>
+            <real>1556.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tcurl.glif b/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
index 7b56b59c3..5fcd6ba5d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tcurl" format="2">
-  <advance width="1660.0"/>
+  <advance width="1576.0"/>
   <unicode hex="0236"/>
+  <note>
+recipe: offset curve 32, no auto
+</note>
   <outline>
     <contour>
-      <point x="468.0" y="1904.0" type="line"/>
-      <point x="468.0" y="608.0" type="line"/>
-      <point x="466.0" y="128.0"/>
-      <point x="874.0" y="-32.0"/>
-      <point x="1120.0" y="-32.0" type="curve" smooth="yes"/>
-      <point x="1418.0" y="-32.0"/>
-      <point x="1602.0" y="208.0"/>
-      <point x="1604.0" y="416.0" type="curve" smooth="yes"/>
-      <point x="1602.0" y="620.0"/>
-      <point x="1430.0" y="820.0"/>
-      <point x="1164.0" y="820.0" type="curve" smooth="yes"/>
-      <point x="886.0" y="820.0"/>
-      <point x="541.0" y="632.0"/>
-      <point x="208.0" y="428.0" type="curve" smooth="yes"/>
-      <point x="44.0" y="328.0" type="line"/>
-      <point x="292.0" y="32.0" type="line"/>
-      <point x="572.0" y="232.0" type="line" smooth="yes"/>
-      <point x="781.0" y="381.0"/>
-      <point x="987.0" y="472.0"/>
-      <point x="1116.0" y="472.0" type="curve" smooth="yes"/>
-      <point x="1166.0" y="472.0"/>
-      <point x="1196.0" y="445.0"/>
-      <point x="1196.0" y="400.0" type="curve" smooth="yes"/>
-      <point x="1196.0" y="348.0"/>
-      <point x="1170.0" y="316.0"/>
-      <point x="1128.0" y="316.0" type="curve" smooth="yes"/>
-      <point x="1059.0" y="316.0"/>
-      <point x="1018.0" y="374.0"/>
-      <point x="1020.0" y="468.0" type="curve"/>
-      <point x="1020.0" y="1904.0" type="line"/>
+      <point x="384.0" y="1904.0" type="line"/>
+      <point x="384.0" y="528.0" type="line" smooth="yes"/>
+      <point x="384.0" y="48.0"/>
+      <point x="741.0" y="-32.0"/>
+      <point x="988.0" y="-32.0" type="curve" smooth="yes"/>
+      <point x="1415.0" y="-32.0"/>
+      <point x="1520.0" y="236.0"/>
+      <point x="1520.0" y="416.0" type="curve" smooth="yes"/>
+      <point x="1520.0" y="648.0"/>
+      <point x="1341.0" y="820.0"/>
+      <point x="1080.0" y="820.0" type="curve" smooth="yes"/>
+      <point x="822.0" y="820.0"/>
+      <point x="392.0" y="652.0"/>
+      <point x="44.0" y="292.0" type="curve"/>
+      <point x="256.0" y="4.0" type="line"/>
+      <point x="556.0" y="324.0"/>
+      <point x="885.0" y="472.0"/>
+      <point x="1032.0" y="472.0" type="curve" smooth="yes"/>
+      <point x="1079.0" y="472.0"/>
+      <point x="1112.0" y="442.0"/>
+      <point x="1112.0" y="400.0" type="curve" smooth="yes"/>
+      <point x="1112.0" y="351.0"/>
+      <point x="1081.0" y="316.0"/>
+      <point x="1036.0" y="316.0" type="curve" smooth="yes"/>
+      <point x="977.0" y="316.0"/>
+      <point x="936.0" y="359.0"/>
+      <point x="936.0" y="420.0" type="curve" smooth="yes"/>
+      <point x="936.0" y="1904.0" type="line"/>
     </contour>
     <contour>
-      <point x="1284.0" y="1536.0" type="line"/>
-      <point x="272.0" y="1536.0" type="line"/>
-      <point x="272.0" y="1136.0" type="line"/>
-      <point x="1284.0" y="1136.0" type="line"/>
+      <point x="1200.0" y="1536.0" type="line"/>
+      <point x="188.0" y="1536.0" type="line"/>
+      <point x="188.0" y="1136.0" type="line"/>
+      <point x="1200.0" y="1136.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -100,7 +101,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>13.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -135,7 +136,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>29.0</real>
+            <real>27.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/trthook.glif b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
index 08d24ffb5..48ec6c332 100644
--- a/src/Inter-UI-Black.ufo/glyphs/trthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
@@ -12,19 +12,19 @@
     <contour>
       <point x="240.0" y="1904.0" type="line"/>
       <point x="240.0" y="-108.0" type="line"/>
-      <point x="236.0" y="-430.0"/>
-      <point x="435.0" y="-593.0"/>
+      <point x="236.0" y="-432.0"/>
+      <point x="436.0" y="-592.0"/>
       <point x="816.0" y="-572.0" type="curve" smooth="yes"/>
-      <point x="941.0" y="-565.0"/>
-      <point x="1034.0" y="-539.0"/>
+      <point x="940.0" y="-564.0"/>
+      <point x="1036.0" y="-540.0"/>
       <point x="1084.0" y="-524.0" type="curve"/>
       <point x="1004.0" y="-136.0" type="line"/>
-      <point x="983.0" y="-141.0"/>
-      <point x="929.0" y="-152.0"/>
+      <point x="984.0" y="-140.0"/>
+      <point x="928.0" y="-152.0"/>
       <point x="896.0" y="-152.0" type="curve" smooth="yes"/>
       <point x="824.0" y="-152.0"/>
-      <point x="788.0" y="-119.0"/>
-      <point x="792.0" y="-56.0" type="curve"/>
+      <point x="792.0" y="-120.0"/>
+      <point x="792.0" y="-56.0" type="curve" smooth="yes"/>
       <point x="792.0" y="1904.0" type="line"/>
     </contour>
   </outline>
@@ -158,6 +158,98 @@
           <key>type</key>
           <string>Anchor</string>
         </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>0.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <string>d</string>
+            <string>o</string>
+            <string>w</string>
+            <string>n</string>
+          </array>
+          <key>type</key>
+          <string>TopGhost</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>15.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>1.0</real>
+          </array>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>3.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>0.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>1.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>0.0</real>
+          </array>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
       </array>
     </dict>
   </lib>