From 3f2f269ac665545a0a0a2d95b7da62dbca8871a8 Mon Sep 17 00:00:00 2001
From: Aaron <aaron@sajatypeworks.com>
Date: Tue, 25 May 2021 16:37:42 -0700
Subject: [PATCH 1/5] Updating build script to remove unnecessary "Italic" from
 static instances

For whatever reason glyphslib sets the familyName of the font to include the "Italic" name. I had corrected the variable font instance, but not the static instances.
---
 build.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.py b/build.py
index c3fe61536..e65cf3be8 100644
--- a/build.py
+++ b/build.py
@@ -202,9 +202,13 @@ def build_font_static(
     name: str,
 ) -> None:
     prepare_fonts(designspace, name)
+
     generator = fontmake.instantiator.Instantiator.from_designspace(designspace)
     instance = generator.generate_instance(instance_descriptor)
-    compile_static_and_save(instance, name)
+    instance.info.familyName = instance.info.familyName.replace(" Italic","")
+    if instance.info.styleMapFamilyName:
+        instance.info.styleMapFamilyName = instance.info.styleMapFamilyName.replace(" Italic","")
+    compile_static_and_save(instance, name.replace(" Italic",""))
 
 
 # Export fonts

From f50057f8e69ad9c0a4e59f699bf7c9492b20c9dd Mon Sep 17 00:00:00 2001
From: Aaron <aaron@sajatypeworks.com>
Date: Wed, 26 May 2021 10:11:14 -0700
Subject: [PATCH 2/5] Fixing interpolation bugs

Double-checked to make sure that the hinting didn't break in fixing these.
---
 .../glyphs/bar_bar_equal_middle.seq.glif         |  2 +-
 .../CascadiaCode-BoldItalic.ufo/glyphs/fi.glif   |  4 ++--
 .../glyphs/baht.B_R_A_C_K_E_T_.600.glif          |  4 ++--
 .../glyphs/bar_bar_equal_middle.seq.glif         |  2 +-
 .../glyphs/dollar.B_R_A_C_K_E_T_.600.glif        | 12 ++++++------
 .../glyphs/fi.glif                               |  4 ++--
 .../glyphs/numbersign_question.liga.glif         | 16 ++++++++--------
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sources/CascadiaCode-BoldItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif b/sources/CascadiaCode-BoldItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif
index 15cdcdee3..6a1ce2cee 100644
--- a/sources/CascadiaCode-BoldItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif
+++ b/sources/CascadiaCode-BoldItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif
@@ -26,8 +26,8 @@
       <point x="2460" y="583" type="line"/>
       <point x="1553" y="583" type="line"/>
     </contour>
-    <component base="bar" xOffset="1020"/>
     <component base="bar" xOffset="180"/>
+    <component base="bar" xOffset="1020"/>
   </outline>
   <lib>
     <dict>
diff --git a/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif b/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif
index 51cfdb396..a5db7a641 100644
--- a/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif
+++ b/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif
@@ -4,16 +4,16 @@
   <unicode hex="FB01"/>
   <outline>
     <contour>
-      <point x="66" y="617" type="line"/>
       <point x="1064" y="617" type="line"/>
       <point x="1105" y="849" type="line"/>
       <point x="107" y="849" type="line"/>
+      <point x="66" y="617" type="line"/>
     </contour>
     <contour>
-      <point x="685" y="0" type="line"/>
       <point x="955" y="0" type="line"/>
       <point x="1105" y="849" type="line"/>
       <point x="835" y="849" type="line"/>
+      <point x="685" y="0" type="line"/>
     </contour>
     <contour>
       <point x="-251" y="-477" type="line"/>
diff --git a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/baht.B_R_A_C_K_E_T_.600.glif b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/baht.B_R_A_C_K_E_T_.600.glif
index 857f73bc9..86e6690a2 100644
--- a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/baht.B_R_A_C_K_E_T_.600.glif
+++ b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/baht.B_R_A_C_K_E_T_.600.glif
@@ -3,16 +3,16 @@
   <advance width="1200"/>
   <outline>
     <contour>
+      <point x="435" y="40" type="line"/>
       <point x="372" y="-320" type="line"/>
       <point x="468" y="-320" type="line"/>
       <point x="531" y="40" type="line"/>
-      <point x="435" y="40" type="line"/>
     </contour>
     <contour>
-      <point x="674" y="1392" type="line"/>
       <point x="770" y="1392" type="line"/>
       <point x="831" y="1740" type="line"/>
       <point x="735" y="1740" type="line"/>
+      <point x="674" y="1392" type="line"/>
     </contour>
     <component base="B"/>
   </outline>
diff --git a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif
index 89fa939b2..847241643 100644
--- a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif
+++ b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/bar_bar_equal_middle.seq.glif
@@ -26,8 +26,8 @@
       <point x="2445" y="504" type="line"/>
       <point x="1613" y="504" type="line"/>
     </contour>
-    <component base="bar" xOffset="1022"/>
     <component base="bar" xOffset="182"/>
+    <component base="bar" xOffset="1022"/>
   </outline>
   <lib>
     <dict>
diff --git a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/dollar.B_R_A_C_K_E_T_.600.glif b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/dollar.B_R_A_C_K_E_T_.600.glif
index 70db682bf..dde585ae8 100644
--- a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/dollar.B_R_A_C_K_E_T_.600.glif
+++ b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/dollar.B_R_A_C_K_E_T_.600.glif
@@ -2,18 +2,18 @@
 <glyph name="dollar.BRACKET.600" format="2">
   <advance width="1200"/>
   <outline>
-    <contour>
-      <point x="424" y="-320" type="line"/>
-      <point x="520" y="-320" type="line"/>
-      <point x="584" y="41" type="line"/>
-      <point x="488" y="41" type="line"/>
-    </contour>
     <contour>
       <point x="725" y="1387" type="line"/>
       <point x="821" y="1387" type="line"/>
       <point x="883" y="1740" type="line"/>
       <point x="787" y="1740" type="line"/>
     </contour>
+    <contour>
+      <point x="424" y="-320" type="line"/>
+      <point x="520" y="-320" type="line"/>
+      <point x="584" y="41" type="line"/>
+      <point x="488" y="41" type="line"/>
+    </contour>
     <component base="S"/>
   </outline>
   <lib>
diff --git a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif
index f3f081cab..6dde7689e 100644
--- a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif
+++ b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif
@@ -4,16 +4,16 @@
   <unicode hex="FB01"/>
   <outline>
     <contour>
-      <point x="120" y="688" type="line"/>
       <point x="992" y="688" type="line"/>
       <point x="1008" y="778" type="line"/>
       <point x="136" y="778" type="line"/>
+      <point x="120" y="688" type="line"/>
     </contour>
     <contour>
-      <point x="821" y="0" type="line"/>
       <point x="915" y="0" type="line"/>
       <point x="1052" y="778" type="line"/>
       <point x="958" y="778" type="line"/>
+      <point x="821" y="0" type="line"/>
     </contour>
     <contour>
       <point x="-216" y="-476" type="line"/>
diff --git a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_question.liga.glif b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_question.liga.glif
index e2c31e754..ed3262bc3 100644
--- a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_question.liga.glif
+++ b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_question.liga.glif
@@ -3,10 +3,10 @@
   <advance width="1200"/>
   <outline>
     <contour>
-      <point x="359" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="819" y="1420" type="line"/>
-      <point x="725" y="1420" type="line"/>
+      <point x="805" y="0" type="line"/>
+      <point x="899" y="0" type="line"/>
+      <point x="1265" y="1420" type="line"/>
+      <point x="1171" y="1420" type="line"/>
     </contour>
     <contour>
       <point x="285" y="419" type="line"/>
@@ -15,10 +15,10 @@
       <point x="301" y="509" type="line"/>
     </contour>
     <contour>
-      <point x="805" y="0" type="line"/>
-      <point x="899" y="0" type="line"/>
-      <point x="1265" y="1420" type="line"/>
-      <point x="1171" y="1420" type="line"/>
+      <point x="359" y="0" type="line"/>
+      <point x="453" y="0" type="line"/>
+      <point x="819" y="1420" type="line"/>
+      <point x="725" y="1420" type="line"/>
     </contour>
     <contour>
       <point x="372" y="911" type="line"/>

From 29024683ce72144cd210dc57861409bdc47c2f39 Mon Sep 17 00:00:00 2001
From: Aaron <aaron@sajatypeworks.com>
Date: Wed, 26 May 2021 10:11:30 -0700
Subject: [PATCH 3/5] Update build.py

---
 build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.py b/build.py
index e65cf3be8..1cf24879f 100644
--- a/build.py
+++ b/build.py
@@ -23,7 +23,7 @@
 from vttmisc import tsi1, tsic
 
 VERSION_YEAR_MONTH = 2105
-VERSION_DAY = 24
+VERSION_DAY = 26
 
 OUTPUT_DIR = Path("build")
 OUTPUT_OTF_DIR = OUTPUT_DIR / "otf"

From 28da1e7741fc66ce2eeac544f1bd16e2a714cba3 Mon Sep 17 00:00:00 2001
From: Aaron <aaron@sajatypeworks.com>
Date: Wed, 26 May 2021 10:18:45 -0700
Subject: [PATCH 4/5] Minor tweak to fi ligature shape

I was there. I updated it.
---
 .../glyphs/fi.glif                            | 20 ++++++++--------
 .../glyphs/fi.glif                            | 24 +++++++++----------
 .../CascadiaCode-Italic.ufo/glyphs/fi.glif    | 24 +++++++++----------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif b/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif
index a5db7a641..b79e152ec 100644
--- a/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif
+++ b/sources/CascadiaCode-BoldItalic.ufo/glyphs/fi.glif
@@ -23,16 +23,16 @@
       <point x="455" y="154" type="curve" smooth="yes"/>
       <point x="610" y="1030" type="line" smooth="yes"/>
       <point x="640" y="1200"/>
-      <point x="739" y="1268"/>
-      <point x="948" y="1268" type="curve" smooth="yes"/>
-      <point x="1002" y="1268"/>
-      <point x="1056" y="1264"/>
-      <point x="1129" y="1254" type="curve"/>
-      <point x="1192" y="1500" type="line"/>
-      <point x="1121" y="1511"/>
-      <point x="1056" y="1520"/>
-      <point x="975" y="1520" type="curve" smooth="yes"/>
-      <point x="587" y="1520"/>
+      <point x="743" y="1268"/>
+      <point x="958" y="1268" type="curve" smooth="yes"/>
+      <point x="1015" y="1268"/>
+      <point x="1072" y="1264"/>
+      <point x="1149" y="1254" type="curve"/>
+      <point x="1212" y="1500" type="line"/>
+      <point x="1144" y="1511"/>
+      <point x="1070" y="1520"/>
+      <point x="985" y="1520" type="curve" smooth="yes"/>
+      <point x="591" y="1520"/>
       <point x="405" y="1377"/>
       <point x="342" y="1020" type="curve" smooth="yes"/>
       <point x="183" y="122" type="line" smooth="yes"/>
diff --git a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif
index 6dde7689e..46ef73a6c 100644
--- a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif
+++ b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/fi.glif
@@ -22,18 +22,18 @@
       <point x="305" y="-239"/>
       <point x="360" y="74" type="curve" smooth="yes"/>
       <point x="530" y="1047" type="line" smooth="yes"/>
-      <point x="576" y="1311"/>
-      <point x="736" y="1428"/>
-      <point x="993" y="1428" type="curve" smooth="yes"/>
-      <point x="1077" y="1428"/>
-      <point x="1156" y="1420"/>
-      <point x="1244" y="1401" type="curve"/>
-      <point x="1272" y="1490" type="line"/>
-      <point x="1193" y="1511"/>
-      <point x="1113" y="1520"/>
-      <point x="1015" y="1520" type="curve" smooth="yes"/>
-      <point x="688" y="1520"/>
-      <point x="492" y="1370"/>
+      <point x="576" y="1310"/>
+      <point x="718" y="1428"/>
+      <point x="953" y="1428" type="curve" smooth="yes"/>
+      <point x="1020" y="1428"/>
+      <point x="1084" y="1422"/>
+      <point x="1154" y="1407" type="curve"/>
+      <point x="1182" y="1496" type="line"/>
+      <point x="1118" y="1513"/>
+      <point x="1054" y="1520"/>
+      <point x="975" y="1520" type="curve" smooth="yes"/>
+      <point x="671" y="1520"/>
+      <point x="492" y="1369"/>
       <point x="434" y="1037" type="curve" smooth="yes"/>
       <point x="261" y="42" type="line" smooth="yes"/>
       <point x="219" y="-200"/>
diff --git a/sources/CascadiaCode-Italic.ufo/glyphs/fi.glif b/sources/CascadiaCode-Italic.ufo/glyphs/fi.glif
index 0b7d0662d..5e3eedc12 100644
--- a/sources/CascadiaCode-Italic.ufo/glyphs/fi.glif
+++ b/sources/CascadiaCode-Italic.ufo/glyphs/fi.glif
@@ -22,18 +22,18 @@
       <point x="353" y="-264"/>
       <point x="416" y="94" type="curve" smooth="yes"/>
       <point x="572" y="980" type="line" smooth="yes"/>
-      <point x="614" y="1216"/>
-      <point x="765" y="1330"/>
-      <point x="988" y="1330" type="curve" smooth="yes"/>
-      <point x="1050" y="1330"/>
-      <point x="1113" y="1326"/>
-      <point x="1199" y="1316" type="curve"/>
-      <point x="1254" y="1500" type="line"/>
-      <point x="1179" y="1514"/>
-      <point x="1111" y="1520"/>
-      <point x="1027" y="1520" type="curve" smooth="yes"/>
-      <point x="655" y="1520"/>
-      <point x="420" y="1340"/>
+      <point x="614" y="1215"/>
+      <point x="751" y="1330"/>
+      <point x="958" y="1330" type="curve" smooth="yes"/>
+      <point x="1011" y="1330"/>
+      <point x="1065" y="1326"/>
+      <point x="1139" y="1316" type="curve"/>
+      <point x="1194" y="1500" type="line"/>
+      <point x="1129" y="1514"/>
+      <point x="1070" y="1520"/>
+      <point x="997" y="1520" type="curve" smooth="yes"/>
+      <point x="642" y="1520"/>
+      <point x="420" y="1339"/>
       <point x="355" y="970" type="curve" smooth="yes"/>
       <point x="195" y="62" type="line" smooth="yes"/>
       <point x="152" y="-180"/>

From fb338e29e38ee1ed8e850792e634a976e22ff13b Mon Sep 17 00:00:00 2001
From: Aaron <aaron@sajatypeworks.com>
Date: Wed, 26 May 2021 10:21:35 -0700
Subject: [PATCH 5/5] Last one?

---
 .../glyphs/numbersign_underscore_parenleft.liga.glif            | 2 +-
 .../glyphs/numbersign_underscore_parenleft.liga.glif            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources/CascadiaCode-BoldItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif b/sources/CascadiaCode-BoldItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif
index c5a4e678a..f39ce01f0 100644
--- a/sources/CascadiaCode-BoldItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif
+++ b/sources/CascadiaCode-BoldItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif
@@ -49,10 +49,10 @@
       <point x="366" y="1110" type="line"/>
     </contour>
     <contour>
-      <point x="765" y="-241" type="line"/>
       <point x="3255" y="-241" type="line"/>
       <point x="3067" y="0" type="line"/>
       <point x="809" y="0" type="line"/>
+      <point x="765" y="-241" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif
index 068970c4e..16609ab0a 100644
--- a/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif
+++ b/sources/CascadiaCode-ExtraLightItalic.ufo/glyphs/numbersign_underscore_parenleft.liga.glif
@@ -49,10 +49,10 @@
       <point x="387" y="1001" type="line"/>
     </contour>
     <contour>
-      <point x="821" y="-90" type="line"/>
       <point x="3216" y="-90" type="line"/>
       <point x="3177" y="0" type="line"/>
       <point x="837" y="0" type="line"/>
+      <point x="821" y="-90" type="line"/>
     </contour>
   </outline>
   <lib>