Rework on loops (d, q, b, g, etc)

10 files changed, 594 insertions, 358 deletions

diff --git a/src/Inter-UI-Black.ufo/glyphs/b.glif b/src/Inter-UI-Black.ufo/glyphs/b.glif
index 9ca795c16..63752398f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/b.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/b.glif
@@ -6,27 +6,27 @@
     <contour>
       <point x="128" y="2048" type="line"/>
       <point x="128" y="0" type="line"/>
-      <point x="580" y="0" type="line"/>
-      <point x="580" y="304" type="line"/>
+      <point x="584" y="0" type="line"/>
+      <point x="584" y="304" type="line"/>
       <point x="420" y="744" type="line"/>
       <point x="588" y="1272" type="line"/>
       <point x="588" y="2048" type="line"/>
     </contour>
     <component base="rightloop.cn" xOffset="-36"/>
     <contour>
-      <point x="1048" y="2200" type="move" name="top"/>
+      <point x="1048.0" y="2200.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="916" y="0" type="move" name="bottom"/>
+      <point x="916.0" y="0.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1704" y="2200" type="move" name="top_dd"/>
+      <point x="1704.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="1704" y="-560" type="move" name="bottom_dd"/>
+      <point x="1704.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="1704" y="2200" type="move" name="top0315"/>
+      <point x="1704.0" y="2200.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/d.glif b/src/Inter-UI-Black.ufo/glyphs/d.glif
index ce58fa4ba..2d8f510c8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/d.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/d.glif
@@ -9,8 +9,8 @@
       <point x="1032" y="2048" type="line"/>
       <point x="1032" y="1256" type="line"/>
       <point x="1188" y="732" type="line"/>
-      <point x="1040" y="308" type="line"/>
-      <point x="1040" y="0" type="line"/>
+      <point x="1036" y="308" type="line"/>
+      <point x="1036" y="0" type="line"/>
     </contour>
     <component base="leftloop.cn"/>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/g.glif b/src/Inter-UI-Black.ufo/glyphs/g.glif
index d34b9b79f..8199dd596 100644
--- a/src/Inter-UI-Black.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/g.glif
@@ -4,11 +4,11 @@
   <unicode hex="0067"/>
   <outline>
     <contour>
-      <point x="1076" y="1528" type="line"/>
-      <point x="1040" y="1240" type="line"/>
+      <point x="1036" y="1528" type="line"/>
+      <point x="1036" y="1240" type="line"/>
       <point x="1216" y="740" type="line"/>
-      <point x="996" y="148" type="line"/>
-      <point x="1044" y="108" type="line"/>
+      <point x="1016" y="192" type="line"/>
+      <point x="1044" y="176" type="line"/>
       <point x="1044" y="92" type="line"/>
       <point x="1044" y="-140"/>
       <point x="936" y="-232"/>
@@ -25,54 +25,7 @@
       <point x="1492" y="68" type="curve" smooth="yes"/>
       <point x="1492" y="1528" type="line"/>
     </contour>
-    <contour>
-      <point x="1236" y="1040" type="line"/>
-      <point x="1188" y="1320"/>
-      <point x="1060" y="1556"/>
-      <point x="736" y="1556" type="curve" smooth="yes"/>
-      <point x="356" y="1556"/>
-      <point x="80" y="1228"/>
-      <point x="80" y="784" type="curve"/>
-      <point x="80" y="332"/>
-      <point x="356" y="12"/>
-      <point x="740" y="12" type="curve"/>
-      <point x="1060" y="12"/>
-      <point x="1196" y="236"/>
-      <point x="1236" y="500" type="curve"/>
-      <point x="1256" y="804" type="line"/>
-      <point x="1084" y="804" type="line"/>
-      <point x="1084" y="740"/>
-      <point x="1076" y="636"/>
-      <point x="1060" y="572" type="curve"/>
-      <point x="1040" y="488"/>
-      <point x="968" y="368"/>
-      <point x="796" y="368" type="curve" smooth="yes"/>
-      <point x="588" y="368"/>
-      <point x="516" y="544"/>
-      <point x="516" y="784" type="curve"/>
-      <point x="516" y="1016"/>
-      <point x="588" y="1200"/>
-      <point x="792" y="1200" type="curve"/>
-      <point x="992" y="1200"/>
-      <point x="1048" y="1032"/>
-      <point x="1064" y="964" type="curve"/>
-      <point x="1080" y="904"/>
-      <point x="1084" y="836"/>
-      <point x="1084" y="772" type="curve"/>
-      <point x="1256" y="772" type="line"/>
-    </contour>
-    <contour>
-      <point x="1004" y="96" type="line"/>
-      <point x="1148" y="96" type="line"/>
-      <point x="1148" y="312" type="line"/>
-      <point x="1004" y="312" type="line"/>
-    </contour>
-    <contour>
-      <point x="1028" y="1192" type="line"/>
-      <point x="1176" y="1192" type="line"/>
-      <point x="1176" y="1440" type="line"/>
-      <point x="1028" y="1440" type="line"/>
-    </contour>
+    <component base="leftloop.cn"/>
     <contour>
       <point x="760.0" y="1776.0" type="move" name="top"/>
     </contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif b/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
index 1f32b3662..513ac435e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/leftloop.cn.glif
@@ -1,88 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="leftloop.cn" format="1">
-  <advance width="1526"/>
+  <advance width="1544"/>
   <outline>
     <contour>
-      <point x="1236" y="1024" type="line"/>
-      <point x="1188" y="1316"/>
-      <point x="1060" y="1556"/>
-      <point x="736" y="1556" type="curve" smooth="yes"/>
-      <point x="356" y="1556"/>
-      <point x="80" y="1220"/>
-      <point x="80" y="764" type="curve"/>
-      <point x="80" y="304"/>
-      <point x="356" y="-28"/>
-      <point x="740" y="-28" type="curve"/>
-      <point x="1060" y="-28"/>
-      <point x="1196" y="200"/>
-      <point x="1236" y="476" type="curve"/>
-      <point x="1256" y="784" type="line"/>
-      <point x="1068" y="784" type="line"/>
-      <point x="1068" y="720"/>
-      <point x="1056" y="612"/>
-      <point x="1044" y="548" type="curve"/>
-      <point x="1024" y="464"/>
-      <point x="968" y="340"/>
-      <point x="796" y="340" type="curve" smooth="yes"/>
-      <point x="588" y="340"/>
-      <point x="516" y="520"/>
-      <point x="516" y="764" type="curve"/>
-      <point x="516" y="1000"/>
-      <point x="588" y="1192"/>
-      <point x="792" y="1192" type="curve"/>
-      <point x="992" y="1192"/>
-      <point x="1036" y="1004"/>
-      <point x="1048" y="948" type="curve"/>
-      <point x="1060" y="888"/>
-      <point x="1068" y="816"/>
-      <point x="1068" y="752" type="curve"/>
-      <point x="1256" y="752" type="line"/>
-    </contour>
-    <contour>
-      <point x="1004" y="60" type="line"/>
-      <point x="1148" y="60" type="line"/>
-      <point x="1148" y="276" type="line"/>
-      <point x="1004" y="276" type="line"/>
+      <point x="1216" y="1340" type="line"/>
+      <point x="1024" y="1340" type="line"/>
+      <point x="984" y="1460"/>
+      <point x="868" y="1556"/>
+      <point x="692" y="1556" type="curve" smooth="yes"/>
+      <point x="396" y="1556"/>
+      <point x="80" y="1284"/>
+      <point x="80" y="768" type="curve" smooth="yes"/>
+      <point x="80" y="248"/>
+      <point x="392" y="-32"/>
+      <point x="684" y="-32" type="curve" smooth="yes"/>
+      <point x="860" y="-32"/>
+      <point x="984" y="68"/>
+      <point x="1024" y="188" type="curve"/>
+      <point x="1216" y="188" type="line"/>
     </contour>
     <contour>
-      <point x="1000" y="1220" type="line"/>
-      <point x="1148" y="1220" type="line"/>
-      <point x="1148" y="1468" type="line"/>
-      <point x="1000" y="1468" type="line"/>
+      <point x="516" y="768" type="curve" smooth="yes"/>
+      <point x="516" y="1000"/>
+      <point x="596" y="1192"/>
+      <point x="808" y="1192" type="curve" smooth="yes"/>
+      <point x="1020" y="1192"/>
+      <point x="1084" y="1000"/>
+      <point x="1084" y="768" type="curve" smooth="yes"/>
+      <point x="1084" y="532"/>
+      <point x="1016" y="340"/>
+      <point x="808" y="340" type="curve" smooth="yes"/>
+      <point x="600" y="340"/>
+      <point x="516" y="532"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.typemytype.robofont.guides</key>
       <array>
-        <dict>
-          <key>angle</key>
-          <real>90.0</real>
-          <key>isGlobal</key>
-          <false/>
-          <key>magnetic</key>
-          <integer>5</integer>
-          <key>name</key>
-          <string></string>
-          <key>x</key>
-          <integer>356</integer>
-          <key>y</key>
-          <integer>1492</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>1060</integer>
-          <key>y</key>
-          <integer>1332</integer>
-        </dict>
       </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
@@ -95,7 +50,7 @@
           <array>
             <dict>
               <key>baseGlyph</key>
-              <string>c</string>
+              <string>o</string>
               <key>transformation</key>
               <array>
                 <integer>1</integer>
@@ -119,7 +74,7 @@
           <array>
           </array>
           <key>width</key>
-          <integer>1526</integer>
+          <integer>1544</integer>
         </dict>
       </dict>
       <key>com.typemytype.robofont.mark</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/p.glif b/src/Inter-UI-Black.ufo/glyphs/p.glif
index 9d47b829f..e642e0ada 100644
--- a/src/Inter-UI-Black.ufo/glyphs/p.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/p.glif
@@ -8,9 +8,9 @@
       <point x="588" y="-576" type="line"/>
       <point x="588" y="292" type="line"/>
       <point x="420" y="736" type="line"/>
-      <point x="580" y="1192" type="line"/>
-      <point x="580" y="1244" type="line"/>
-      <point x="580" y="1536" type="line"/>
+      <point x="584" y="1192" type="line"/>
+      <point x="584" y="1244" type="line"/>
+      <point x="584" y="1536" type="line"/>
       <point x="128" y="1536" type="line"/>
     </contour>
     <component base="rightloop.cn" xOffset="-36"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/q.glif b/src/Inter-UI-Black.ufo/glyphs/q.glif
index 30227d1f2..70dc4ed3e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/q.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/q.glif
@@ -5,9 +5,9 @@
   <outline>
     <contour>
       <point x="1492" y="1536" type="line"/>
-      <point x="1040" y="1536" type="line"/>
-      <point x="1040" y="1264" type="line"/>
-      <point x="1040" y="1196" type="line"/>
+      <point x="1036" y="1536" type="line"/>
+      <point x="1036" y="1264" type="line"/>
+      <point x="1036" y="1196" type="line"/>
       <point x="1184" y="748" type="line"/>
       <point x="1032" y="276" type="line"/>
       <point x="1032" y="-576" type="line"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif b/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
index f891dfd9d..acfbc3130 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rightloop.cn.glif
@@ -3,56 +3,476 @@
   <advance width="1792"/>
   <outline>
     <contour>
-      <point x="420" y="1024" type="curve"/>
-      <point x="400" y="752" type="line"/>
-      <point x="588" y="752" type="line"/>
-      <point x="588" y="816"/>
-      <point x="596" y="888"/>
-      <point x="608" y="948" type="curve"/>
-      <point x="620" y="1004"/>
-      <point x="664" y="1192"/>
-      <point x="864" y="1192" type="curve"/>
-      <point x="1068" y="1192"/>
-      <point x="1140" y="1000"/>
-      <point x="1140" y="764" type="curve"/>
-      <point x="1140" y="520"/>
-      <point x="1068" y="340"/>
-      <point x="860" y="340" type="curve" smooth="yes"/>
-      <point x="688" y="340"/>
-      <point x="632" y="464"/>
-      <point x="612" y="548" type="curve"/>
-      <point x="600" y="612"/>
-      <point x="588" y="720"/>
-      <point x="588" y="784" type="curve"/>
-      <point x="400" y="784" type="line"/>
-      <point x="420" y="476" type="line"/>
-      <point x="460" y="200"/>
-      <point x="596" y="-28"/>
-      <point x="916" y="-28" type="curve"/>
-      <point x="1300" y="-28"/>
-      <point x="1576" y="304"/>
-      <point x="1576" y="764" type="curve"/>
-      <point x="1576" y="1220"/>
-      <point x="1300" y="1556"/>
-      <point x="920" y="1556" type="curve" smooth="yes"/>
-      <point x="596" y="1556"/>
-      <point x="468" y="1316"/>
-    </contour>
-    <contour>
-      <point x="644" y="60" type="line"/>
-      <point x="644" y="276" type="line"/>
-      <point x="500" y="276" type="line"/>
-      <point x="500" y="60" type="line"/>
+      <point x="440" y="1340" type="line"/>
+      <point x="440" y="188" type="line"/>
+      <point x="632" y="188" type="line"/>
+      <point x="672" y="68"/>
+      <point x="796" y="-32"/>
+      <point x="972" y="-32" type="curve" smooth="yes"/>
+      <point x="1264" y="-32"/>
+      <point x="1576" y="248"/>
+      <point x="1576" y="768" type="curve" smooth="yes"/>
+      <point x="1576" y="1284"/>
+      <point x="1260" y="1556"/>
+      <point x="964" y="1556" type="curve" smooth="yes"/>
+      <point x="788" y="1556"/>
+      <point x="672" y="1460"/>
+      <point x="632" y="1340" type="curve"/>
     </contour>
     <contour>
-      <point x="656" y="1220" type="line"/>
-      <point x="656" y="1468" type="line"/>
-      <point x="508" y="1468" type="line"/>
-      <point x="508" y="1220" type="line"/>
+      <point x="1140" y="768" type="curve" smooth="yes"/>
+      <point x="1140" y="532"/>
+      <point x="1056" y="340"/>
+      <point x="848" y="340" type="curve" smooth="yes"/>
+      <point x="640" y="340"/>
+      <point x="572" y="532"/>
+      <point x="572" y="768" type="curve" smooth="yes"/>
+      <point x="572" y="1000"/>
+      <point x="636" y="1192"/>
+      <point x="848" y="1192" type="curve" smooth="yes"/>
+      <point x="1060" y="1192"/>
+      <point x="1140" y="1000"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.typemytype.robofont.guides</key>
+      <array>
+        <dict>
+          <key>angle</key>
+          <real>90.0</real>
+          <key>isGlobal</key>
+          <false/>
+          <key>magnetic</key>
+          <integer>5</integer>
+          <key>name</key>
+          <string></string>
+          <key>x</key>
+          <integer>1576</integer>
+          <key>y</key>
+          <integer>756</integer>
+        </dict>
+      </array>
+      <key>com.typemytype.robofont.layerData</key>
+      <dict>
+        <key>reference</key>
+        <dict>
+          <key>anchors</key>
+          <array>
+          </array>
+          <key>components</key>
+          <array>
+          </array>
+          <key>contours</key>
+          <array>
+            <dict>
+              <key>points</key>
+              <array>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>420</integer>
+                  <key>y</key>
+                  <integer>1024</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>400</integer>
+                  <key>y</key>
+                  <integer>752</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>588</integer>
+                  <key>y</key>
+                  <integer>752</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>588</integer>
+                  <key>y</key>
+                  <integer>816</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>596</integer>
+                  <key>y</key>
+                  <integer>888</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>608</integer>
+                  <key>y</key>
+                  <integer>948</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>620</integer>
+                  <key>y</key>
+                  <integer>1004</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>664</integer>
+                  <key>y</key>
+                  <integer>1192</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>864</integer>
+                  <key>y</key>
+                  <integer>1192</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1068</integer>
+                  <key>y</key>
+                  <integer>1192</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1140</integer>
+                  <key>y</key>
+                  <integer>1000</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1140</integer>
+                  <key>y</key>
+                  <integer>764</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1140</integer>
+                  <key>y</key>
+                  <integer>520</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1068</integer>
+                  <key>y</key>
+                  <integer>340</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>860</integer>
+                  <key>y</key>
+                  <integer>340</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>688</integer>
+                  <key>y</key>
+                  <integer>340</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>632</integer>
+                  <key>y</key>
+                  <integer>464</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>612</integer>
+                  <key>y</key>
+                  <integer>548</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>600</integer>
+                  <key>y</key>
+                  <integer>612</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>588</integer>
+                  <key>y</key>
+                  <integer>720</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>588</integer>
+                  <key>y</key>
+                  <integer>784</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>400</integer>
+                  <key>y</key>
+                  <integer>784</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>420</integer>
+                  <key>y</key>
+                  <integer>476</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>460</integer>
+                  <key>y</key>
+                  <integer>200</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>596</integer>
+                  <key>y</key>
+                  <integer>-28</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>916</integer>
+                  <key>y</key>
+                  <integer>-28</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1300</integer>
+                  <key>y</key>
+                  <integer>-28</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1576</integer>
+                  <key>y</key>
+                  <integer>304</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1576</integer>
+                  <key>y</key>
+                  <integer>764</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1576</integer>
+                  <key>y</key>
+                  <integer>1220</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>1300</integer>
+                  <key>y</key>
+                  <integer>1556</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>curve</string>
+                  <key>smooth</key>
+                  <true/>
+                  <key>x</key>
+                  <integer>920</integer>
+                  <key>y</key>
+                  <integer>1556</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>596</integer>
+                  <key>y</key>
+                  <integer>1556</integer>
+                </dict>
+                <dict>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>468</integer>
+                  <key>y</key>
+                  <integer>1316</integer>
+                </dict>
+              </array>
+            </dict>
+            <dict>
+              <key>points</key>
+              <array>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>644</integer>
+                  <key>y</key>
+                  <integer>60</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>644</integer>
+                  <key>y</key>
+                  <integer>276</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>500</integer>
+                  <key>y</key>
+                  <integer>276</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>500</integer>
+                  <key>y</key>
+                  <integer>60</integer>
+                </dict>
+              </array>
+            </dict>
+            <dict>
+              <key>points</key>
+              <array>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>656</integer>
+                  <key>y</key>
+                  <integer>1220</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>656</integer>
+                  <key>y</key>
+                  <integer>1468</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>508</integer>
+                  <key>y</key>
+                  <integer>1468</integer>
+                </dict>
+                <dict>
+                  <key>segmentType</key>
+                  <string>line</string>
+                  <key>smooth</key>
+                  <false/>
+                  <key>x</key>
+                  <integer>508</integer>
+                  <key>y</key>
+                  <integer>1220</integer>
+                </dict>
+              </array>
+            </dict>
+          </array>
+          <key>lib</key>
+          <dict>
+          </dict>
+          <key>name</key>
+          <string>rightloop.cn</string>
+          <key>unicodes</key>
+          <array>
+          </array>
+          <key>width</key>
+          <integer>1792</integer>
+        </dict>
+      </dict>
       <key>com.typemytype.robofont.mark</key>
       <array>
         <real>0.77</real>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/g.glif b/src/Inter-UI-Regular.ufo/glyphs/g.glif
index 499c921c5..c8099cf8e 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/g.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/g.glif
@@ -25,68 +25,21 @@
       <point x="1508" y="-32" type="curve" smooth="yes"/>
       <point x="1508" y="1536" type="line"/>
     </contour>
+    <component base="leftloop.cn" yScale="0.9847159828034862" xOffset="24" yOffset="24"/>
     <contour>
-      <point x="1352" y="1088" type="line"/>
-      <point x="1320" y="1284"/>
-      <point x="1204" y="1556"/>
-      <point x="828" y="1556" type="curve" smooth="yes"/>
-      <point x="412" y="1556"/>
-      <point x="136" y="1248"/>
-      <point x="136" y="784" type="curve" smooth="yes"/>
-      <point x="136" y="300"/>
-      <point x="416" y="0"/>
-      <point x="828" y="0" type="curve" smooth="yes"/>
-      <point x="1188" y="0"/>
-      <point x="1320" y="276"/>
-      <point x="1352" y="476" type="curve"/>
-      <point x="1396" y="796" type="line"/>
-      <point x="1288" y="796" type="line"/>
-      <point x="1288" y="768"/>
-      <point x="1288" y="640"/>
-      <point x="1260" y="540" type="curve"/>
-      <point x="1212" y="344"/>
-      <point x="1020" y="216"/>
-      <point x="828" y="216" type="curve" smooth="yes"/>
-      <point x="572" y="216"/>
-      <point x="372" y="420"/>
-      <point x="372" y="784" type="curve" smooth="yes"/>
-      <point x="372" y="1128"/>
-      <point x="564" y="1344"/>
-      <point x="832" y="1344" type="curve" smooth="yes"/>
-      <point x="1036" y="1344"/>
-      <point x="1200" y="1208"/>
-      <point x="1256" y="1028" type="curve"/>
-      <point x="1288" y="916"/>
-      <point x="1288" y="808"/>
-      <point x="1288" y="780" type="curve"/>
-      <point x="1396" y="780" type="line"/>
+      <point x="896.0" y="1792.0" type="move" name="top"/>
     </contour>
     <contour>
-      <point x="1236" y="204" type="line"/>
-      <point x="1320" y="204" type="line"/>
-      <point x="1320" y="396" type="line"/>
-      <point x="1236" y="396" type="line"/>
+      <point x="832.0" y="-616.0" type="move" name="bottom"/>
     </contour>
     <contour>
-      <point x="1236" y="1164" type="line"/>
-      <point x="1320" y="1164" type="line"/>
-      <point x="1320" y="1356" type="line"/>
-      <point x="1236" y="1356" type="line"/>
+      <point x="1652.0" y="2200.0" type="move" name="top_dd"/>
     </contour>
     <contour>
-      <point x="896" y="1792" type="move" name="top"/>
+      <point x="1652.0" y="-560.0" type="move" name="bottom_dd"/>
     </contour>
     <contour>
-      <point x="832" y="-616" type="move" name="bottom"/>
-    </contour>
-    <contour>
-      <point x="1652" y="2200" type="move" name="top_dd"/>
-    </contour>
-    <contour>
-      <point x="1652" y="-560" type="move" name="bottom_dd"/>
-    </contour>
-    <contour>
-      <point x="1652" y="1776" type="move" name="top0315"/>
+      <point x="1652.0" y="1776.0" type="move" name="top0315"/>
     </contour>
   </outline>
   <lib>
@@ -109,7 +62,7 @@
                 <integer>0</integer>
                 <integer>0</integer>
                 <integer>1</integer>
-                <integer>16</integer>
+                <integer>0</integer>
                 <integer>0</integer>
               </array>
             </dict>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif
index 11e7e0829..e2ce2b895 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/leftloop.cn.glif
@@ -3,56 +3,56 @@
   <advance width="1664"/>
   <outline>
     <contour>
-      <point x="1328" y="1076" type="line"/>
-      <point x="1296" y="1276"/>
-      <point x="1164" y="1556"/>
-      <point x="796" y="1556" type="curve" smooth="yes"/>
-      <point x="384" y="1556"/>
+      <point x="1344" y="1328" type="line"/>
+      <point x="1232" y="1328" type="line"/>
+      <point x="1168" y="1456"/>
+      <point x="996" y="1556"/>
+      <point x="780" y="1556" type="curve" smooth="yes"/>
+      <point x="400" y="1556"/>
       <point x="112" y="1248"/>
-      <point x="112" y="768" type="curve" smooth="yes"/>
-      <point x="112" y="284"/>
-      <point x="384" y="-32"/>
-      <point x="796" y="-32" type="curve" smooth="yes"/>
-      <point x="1164" y="-32"/>
-      <point x="1296" y="240"/>
-      <point x="1328" y="448" type="curve"/>
-      <point x="1372" y="776" type="line"/>
-      <point x="1264" y="776" type="line"/>
-      <point x="1264" y="748"/>
-      <point x="1264" y="616"/>
-      <point x="1236" y="512" type="curve"/>
-      <point x="1188" y="312"/>
-      <point x="988" y="180"/>
-      <point x="796" y="180" type="curve" smooth="yes"/>
-      <point x="540" y="180"/>
-      <point x="348" y="412"/>
-      <point x="348" y="768" type="curve" smooth="yes"/>
-      <point x="348" y="1124"/>
-      <point x="540" y="1344"/>
-      <point x="800" y="1344" type="curve" smooth="yes"/>
-      <point x="1000" y="1344"/>
-      <point x="1176" y="1212"/>
-      <point x="1232" y="1024" type="curve"/>
-      <point x="1264" y="912"/>
-      <point x="1264" y="788"/>
-      <point x="1264" y="760" type="curve"/>
-      <point x="1372" y="760" type="line"/>
+      <point x="112" y="764" type="curve" smooth="yes"/>
+      <point x="112" y="276"/>
+      <point x="400" y="-32"/>
+      <point x="780" y="-32" type="curve" smooth="yes"/>
+      <point x="996" y="-32"/>
+      <point x="1168" y="68"/>
+      <point x="1232" y="204" type="curve"/>
+      <point x="1344" y="204" type="line"/>
     </contour>
     <contour>
-      <point x="1212" y="188" type="line"/>
-      <point x="1296" y="188" type="line"/>
-      <point x="1296" y="380" type="line"/>
-      <point x="1212" y="380" type="line"/>
-    </contour>
-    <contour>
-      <point x="1212" y="1152" type="line"/>
-      <point x="1296" y="1152" type="line"/>
-      <point x="1296" y="1344" type="line"/>
-      <point x="1212" y="1344" type="line"/>
+      <point x="348" y="764" type="curve" smooth="yes"/>
+      <point x="348" y="1084"/>
+      <point x="512" y="1344"/>
+      <point x="808" y="1344" type="curve" smooth="yes"/>
+      <point x="1092" y="1344"/>
+      <point x="1272" y="1108"/>
+      <point x="1272" y="764" type="curve" smooth="yes"/>
+      <point x="1272" y="420"/>
+      <point x="1092" y="180"/>
+      <point x="808" y="180" type="curve" smooth="yes"/>
+      <point x="512" y="180"/>
+      <point x="348" y="444"/>
     </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>76</integer>
+          <key>y</key>
+          <integer>764</integer>
+        </dict>
+      </array>
       <key>com.typemytype.robofont.layerData</key>
       <dict>
         <key>reference</key>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif b/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif
index 69321e982..022b2e119 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/rightloop.cn.glif
@@ -3,52 +3,35 @@
   <advance width="1664"/>
   <outline>
     <contour>
-      <point x="312" y="1076" type="curve"/>
-      <point x="268" y="760" type="line"/>
-      <point x="376" y="760" type="line"/>
-      <point x="376" y="788"/>
-      <point x="376" y="912"/>
-      <point x="408" y="1024" type="curve"/>
-      <point x="464" y="1212"/>
-      <point x="640" y="1344"/>
-      <point x="840" y="1344" type="curve" smooth="yes"/>
-      <point x="1100" y="1344"/>
-      <point x="1292" y="1124"/>
-      <point x="1292" y="768" type="curve" smooth="yes"/>
-      <point x="1292" y="412"/>
-      <point x="1100" y="180"/>
-      <point x="844" y="180" type="curve" smooth="yes"/>
-      <point x="652" y="180"/>
-      <point x="452" y="312"/>
-      <point x="404" y="512" type="curve"/>
-      <point x="376" y="616"/>
-      <point x="376" y="748"/>
-      <point x="376" y="776" type="curve"/>
-      <point x="268" y="776" type="line"/>
-      <point x="312" y="448" type="line"/>
-      <point x="344" y="240"/>
-      <point x="476" y="-32"/>
-      <point x="844" y="-32" type="curve" smooth="yes"/>
-      <point x="1256" y="-32"/>
-      <point x="1528" y="284"/>
-      <point x="1528" y="768" type="curve" smooth="yes"/>
+      <point x="296" y="1328" type="line"/>
+      <point x="296" y="204" type="line"/>
+      <point x="408" y="204" type="line"/>
+      <point x="472" y="68"/>
+      <point x="644" y="-32"/>
+      <point x="860" y="-32" type="curve" smooth="yes"/>
+      <point x="1240" y="-32"/>
+      <point x="1528" y="276"/>
+      <point x="1528" y="764" type="curve" smooth="yes"/>
       <point x="1528" y="1248"/>
-      <point x="1256" y="1556"/>
-      <point x="844" y="1556" type="curve" smooth="yes"/>
-      <point x="476" y="1556"/>
-      <point x="344" y="1276"/>
+      <point x="1240" y="1556"/>
+      <point x="860" y="1556" type="curve" smooth="yes"/>
+      <point x="644" y="1556"/>
+      <point x="472" y="1456"/>
+      <point x="408" y="1328" type="curve"/>
     </contour>
     <contour>
-      <point x="428" y="188" type="line"/>
-      <point x="428" y="380" type="line"/>
-      <point x="344" y="380" type="line"/>
-      <point x="344" y="188" type="line"/>
-    </contour>
-    <contour>
-      <point x="428" y="1152" type="line"/>
-      <point x="428" y="1344" type="line"/>
-      <point x="344" y="1344" type="line"/>
-      <point x="344" y="1152" type="line"/>
+      <point x="1292" y="764" type="curve" smooth="yes"/>
+      <point x="1292" y="444"/>
+      <point x="1128" y="180"/>
+      <point x="832" y="180" type="curve" smooth="yes"/>
+      <point x="548" y="180"/>
+      <point x="368" y="420"/>
+      <point x="368" y="764" type="curve" smooth="yes"/>
+      <point x="368" y="1108"/>
+      <point x="548" y="1344"/>
+      <point x="832" y="1344" type="curve" smooth="yes"/>
+      <point x="1128" y="1344"/>
+      <point x="1292" y="1084"/>
     </contour>
   </outline>
   <lib>
@@ -65,41 +48,13 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>1256</integer>
-          <key>y</key>
           <integer>1528</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>1100</integer>
           <key>y</key>
-          <integer>1312</integer>
+          <integer>652</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>1624</integer>
-          <key>y</key>
-          <integer>288</integer>
-        </dict>
-        <dict>
-          <key>angle</key>
-          <integer>0</integer>
+          <real>90.0</real>
           <key>isGlobal</key>
           <false/>
           <key>magnetic</key>
@@ -107,9 +62,9 @@
           <key>name</key>
           <string></string>
           <key>x</key>
-          <integer>1272</integer>
+          <integer>1528</integer>
           <key>y</key>
-          <integer>412</integer>
+          <integer>748</integer>
         </dict>
       </array>
       <key>com.typemytype.robofont.layerData</key>