Reworked thorn (upper and lower case) in all weights

2 files changed, 29 insertions, 57 deletions

diff --git a/src/Inter-UI-Regular.ufo/glyphs/Thorn_.glif b/src/Inter-UI-Regular.ufo/glyphs/Thorn_.glif
index a7fadfd48..05bb739fa 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/Thorn_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/Thorn_.glif
@@ -4,30 +4,30 @@
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="224" y="2004" type="line"/>
+      <point x="224" y="2048" type="line"/>
       <point x="224" y="0" type="line"/>
       <point x="472" y="0" type="line"/>
-      <point x="472" y="2004" type="line"/>
+      <point x="472" y="2048" type="line"/>
     </contour>
     <contour>
-      <point x="336" y="1604" type="line"/>
-      <point x="472" y="1384" type="line"/>
-      <point x="868" y="1384" type="line" smooth="yes"/>
-      <point x="1152" y="1384"/>
-      <point x="1268" y="1200"/>
-      <point x="1268" y="1012" type="curve" smooth="yes"/>
-      <point x="1268" y="828"/>
-      <point x="1152" y="648"/>
-      <point x="868" y="648" type="curve" smooth="yes"/>
-      <point x="416" y="648" type="line"/>
-      <point x="416" y="428" type="line"/>
-      <point x="868" y="428" type="line" smooth="yes"/>
-      <point x="1304" y="428"/>
-      <point x="1544" y="680"/>
-      <point x="1544" y="1016" type="curve" smooth="yes"/>
-      <point x="1544" y="1352"/>
-      <point x="1304" y="1604"/>
-      <point x="868" y="1604" type="curve" smooth="yes"/>
+      <point x="340" y="1624" type="line"/>
+      <point x="340" y="1404" type="line"/>
+      <point x="868" y="1404" type="line" smooth="yes"/>
+      <point x="1152" y="1404"/>
+      <point x="1308" y="1264"/>
+      <point x="1308" y="1032" type="curve" smooth="yes"/>
+      <point x="1308" y="800"/>
+      <point x="1152" y="668"/>
+      <point x="868" y="668" type="curve" smooth="yes"/>
+      <point x="340" y="668" type="line"/>
+      <point x="340" y="448" type="line"/>
+      <point x="868" y="448" type="line" smooth="yes"/>
+      <point x="1304" y="448"/>
+      <point x="1544" y="712"/>
+      <point x="1544" y="1036" type="curve" smooth="yes"/>
+      <point x="1544" y="1360"/>
+      <point x="1304" y="1624"/>
+      <point x="868" y="1624" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Regular.ufo/glyphs/thorn.glif b/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
index 5622f46e3..59d3b82f5 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/thorn.glif
@@ -1,46 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="thorn" format="1">
-  <advance width="1520"/>
+  <advance width="1628"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
-      <point x="392" y="2112" type="line"/>
-      <point x="116" y="2112" type="line"/>
-      <point x="116" y="-572" type="line"/>
-      <point x="392" y="-572" type="line"/>
-    </contour>
-    <contour>
-      <point x="1388" y="756" type="line"/>
-      <point x="1388" y="1208"/>
-      <point x="1180" y="1516"/>
-      <point x="804" y="1516" type="curve" smooth="yes"/>
-      <point x="424" y="1516"/>
-      <point x="232" y="1240"/>
-      <point x="188" y="788" type="curve"/>
-      <point x="188" y="672" type="line"/>
-      <point x="232" y="240"/>
-      <point x="424" y="-28"/>
-      <point x="808" y="-28" type="curve" smooth="yes"/>
-      <point x="1180" y="-28"/>
-      <point x="1388" y="296"/>
-      <point x="1388" y="728" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="1112" y="728" type="line"/>
-      <point x="1112" y="440"/>
-      <point x="992" y="192"/>
-      <point x="724" y="192" type="curve" smooth="yes"/>
-      <point x="480" y="192"/>
-      <point x="376" y="368"/>
-      <point x="320" y="560" type="curve"/>
-      <point x="320" y="900" type="line"/>
-      <point x="364" y="1104"/>
-      <point x="480" y="1288"/>
-      <point x="720" y="1288" type="curve" smooth="yes"/>
-      <point x="992" y="1288"/>
-      <point x="1112" y="1044"/>
-      <point x="1112" y="756" type="curve" smooth="yes"/>
+      <point x="224" y="2048" type="line"/>
+      <point x="224" y="-576" type="line"/>
+      <point x="460" y="-576" type="line"/>
+      <point x="460" y="288" type="line"/>
+      <point x="368" y="784" type="line"/>
+      <point x="460" y="1172" type="line"/>
+      <point x="460" y="2048" type="line"/>
     </contour>
+    <component base="rightloop.cn" xOffset="-16"/>
   </outline>
   <lib>
     <dict>