Fixes master compatibility for sunWithRays

3 files changed, 89 insertions, 104 deletions

diff --git a/src/Inter-UI-Black.ufo/fontinfo.plist b/src/Inter-UI-Black.ufo/fontinfo.plist
index 38eea741d..f1dfd37cf 100644
--- a/src/Inter-UI-Black.ufo/fontinfo.plist
+++ b/src/Inter-UI-Black.ufo/fontinfo.plist
@@ -97,9 +97,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Black:2018:61b0aaa4a</string>
+    <string>Inter UI Black:2018:a9bbc2f5d</string>
     <key>openTypeNameVersion</key>
-    <string>3.0;61b0aaa4a</string>
+    <string>3.0;a9bbc2f5d</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif b/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
index fe5b9f86a..3d2287796 100644
--- a/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
@@ -6,35 +6,35 @@
   <outline>
     <contour>
       <point x="1332.0" y="604.0" type="curve" smooth="yes"/>
-      <point x="1580.0" y="604.0"/>
-      <point x="1784.0" y="808.0"/>
+      <point x="1579.0" y="604.0"/>
+      <point x="1782.0" y="807.0"/>
       <point x="1784.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1784.0" y="1304.0"/>
-      <point x="1580.0" y="1508.0"/>
+      <point x="1782.0" y="1305.0"/>
+      <point x="1579.0" y="1508.0"/>
       <point x="1332.0" y="1508.0" type="curve" smooth="yes"/>
-      <point x="1080.0" y="1508.0"/>
-      <point x="880.0" y="1304.0"/>
+      <point x="1081.0" y="1508.0"/>
+      <point x="878.0" y="1305.0"/>
       <point x="880.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="880.0" y="808.0"/>
-      <point x="1080.0" y="604.0"/>
+      <point x="878.0" y="807.0"/>
+      <point x="1081.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="528.0" y="76.0" type="line"/>
-      <point x="960.0" y="508.0" type="line"/>
-      <point x="784.0" y="684.0" type="line"/>
-      <point x="352.0" y="252.0" type="line"/>
+      <point x="1208.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="2316.0" type="line"/>
+      <point x="1208.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="72.0" y="932.0" type="line"/>
-      <point x="680.0" y="932.0" type="line"/>
-      <point x="680.0" y="1180.0" type="line"/>
-      <point x="72.0" y="1180.0" type="line"/>
+      <point x="1880.0" y="1428.0" type="line"/>
+      <point x="2312.0" y="1860.0" type="line"/>
+      <point x="2136.0" y="2036.0" type="line"/>
+      <point x="1704.0" y="1604.0" type="line"/>
     </contour>
     <contour>
-      <point x="1208.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="404.0" type="line"/>
-      <point x="1208.0" y="404.0" type="line"/>
+      <point x="1984.0" y="932.0" type="line"/>
+      <point x="2592.0" y="932.0" type="line"/>
+      <point x="2592.0" y="1180.0" type="line"/>
+      <point x="1984.0" y="1180.0" type="line"/>
     </contour>
     <contour>
       <point x="2136.0" y="76.0" type="line"/>
@@ -43,28 +43,28 @@
       <point x="1704.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="784.0" y="1428.0" type="line"/>
-      <point x="960.0" y="1604.0" type="line"/>
-      <point x="528.0" y="2036.0" type="line"/>
-      <point x="352.0" y="1860.0" type="line"/>
+      <point x="1208.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="404.0" type="line"/>
+      <point x="1208.0" y="404.0" type="line"/>
     </contour>
     <contour>
-      <point x="1984.0" y="932.0" type="line"/>
-      <point x="2592.0" y="932.0" type="line"/>
-      <point x="2592.0" y="1180.0" type="line"/>
-      <point x="1984.0" y="1180.0" type="line"/>
+      <point x="528.0" y="76.0" type="line"/>
+      <point x="960.0" y="508.0" type="line"/>
+      <point x="784.0" y="684.0" type="line"/>
+      <point x="352.0" y="252.0" type="line"/>
     </contour>
     <contour>
-      <point x="1208.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="2316.0" type="line"/>
+      <point x="72.0" y="932.0" type="line"/>
+      <point x="680.0" y="932.0" type="line"/>
+      <point x="680.0" y="1180.0" type="line"/>
+      <point x="72.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1880.0" y="1428.0" type="line"/>
-      <point x="2312.0" y="1860.0" type="line"/>
-      <point x="2136.0" y="2036.0" type="line"/>
-      <point x="1704.0" y="1604.0" type="line"/>
+      <point x="784.0" y="1428.0" type="line"/>
+      <point x="960.0" y="1604.0" type="line"/>
+      <point x="528.0" y="2036.0" type="line"/>
+      <point x="352.0" y="1860.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -80,18 +80,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>932.0</real>
+            <real>248.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -100,18 +95,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>3.0</real>
+            <real>1208.0</real>
+            <real>248.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>3.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -120,18 +110,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>932.0</real>
+            <real>248.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>2.0</real>
-            <real>2.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif b/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
index 4db66185a..e1ed74dd9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
@@ -20,24 +20,6 @@
       <point x="1081.0" y="604.0"/>
     </contour>
     <contour>
-      <point x="528.0" y="76.0" type="line"/>
-      <point x="960.0" y="508.0" type="line"/>
-      <point x="784.0" y="684.0" type="line"/>
-      <point x="352.0" y="252.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="72.0" y="932.0" type="line"/>
-      <point x="680.0" y="932.0" type="line"/>
-      <point x="680.0" y="1180.0" type="line"/>
-      <point x="72.0" y="1180.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1208.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="-204.0" type="line"/>
-      <point x="1456.0" y="404.0" type="line"/>
-      <point x="1208.0" y="404.0" type="line"/>
-    </contour>
-    <contour>
       <point x="1332.0" y="872.0" type="curve" smooth="yes"/>
       <point x="1228.0" y="872.0"/>
       <point x="1146.0" y="954.0"/>
@@ -52,16 +34,16 @@
       <point x="1432.0" y="872.0"/>
     </contour>
     <contour>
-      <point x="2136.0" y="76.0" type="line"/>
-      <point x="2312.0" y="252.0" type="line"/>
-      <point x="1880.0" y="684.0" type="line"/>
-      <point x="1704.0" y="508.0" type="line"/>
+      <point x="1208.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="2316.0" type="line"/>
+      <point x="1208.0" y="2316.0" type="line"/>
     </contour>
     <contour>
-      <point x="784.0" y="1428.0" type="line"/>
-      <point x="960.0" y="1604.0" type="line"/>
-      <point x="528.0" y="2036.0" type="line"/>
-      <point x="352.0" y="1860.0" type="line"/>
+      <point x="1880.0" y="1428.0" type="line"/>
+      <point x="2312.0" y="1860.0" type="line"/>
+      <point x="2136.0" y="2036.0" type="line"/>
+      <point x="1704.0" y="1604.0" type="line"/>
     </contour>
     <contour>
       <point x="1984.0" y="932.0" type="line"/>
@@ -70,16 +52,34 @@
       <point x="1984.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1208.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="2316.0" type="line"/>
+      <point x="2136.0" y="76.0" type="line"/>
+      <point x="2312.0" y="252.0" type="line"/>
+      <point x="1880.0" y="684.0" type="line"/>
+      <point x="1704.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="1880.0" y="1428.0" type="line"/>
-      <point x="2312.0" y="1860.0" type="line"/>
-      <point x="2136.0" y="2036.0" type="line"/>
-      <point x="1704.0" y="1604.0" type="line"/>
+      <point x="1208.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="404.0" type="line"/>
+      <point x="1208.0" y="404.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="528.0" y="76.0" type="line"/>
+      <point x="960.0" y="508.0" type="line"/>
+      <point x="784.0" y="684.0" type="line"/>
+      <point x="352.0" y="252.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="72.0" y="932.0" type="line"/>
+      <point x="680.0" y="932.0" type="line"/>
+      <point x="680.0" y="1180.0" type="line"/>
+      <point x="72.0" y="1180.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="784.0" y="1428.0" type="line"/>
+      <point x="960.0" y="1604.0" type="line"/>
+      <point x="528.0" y="2036.0" type="line"/>
+      <point x="352.0" y="1860.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -93,14 +93,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>5.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>5.0</real>
             <real>3.0</real>
           </array>
           <key>type</key>
@@ -113,14 +113,14 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>7.0</real>
             <real>1.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
+            <real>7.0</real>
             <real>2.0</real>
           </array>
           <key>type</key>
@@ -133,14 +133,14 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>5.0</real>
+            <real>2.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
+            <real>5.0</real>
             <real>3.0</real>
           </array>
           <key>type</key>