Modifying glyph names and build code

mybigman · Nov 13, 2019 · 8ae1407 · 8ae1407
1 parent 42cbdf3
commit 8ae1407
Show file tree

Hide file tree

Showing 18 changed files with 144 additions and 26 deletions.
diff --git a/build.py b/build.py
@@ -59,8 +59,8 @@
         setattr(instancePL.info,"openTypeHheaDescender",instancePL.info.openTypeOS2TypoDescender)
         setattr(instancePL.info,"openTypeHheaLineGap",instancePL.info.openTypeOS2TypoLineGap)
 
-        setattr(instanceNF.info, "familyName","Cascadia Code NF")
-        setattr(instancePL.info, "familyName","Cascadia Code PL")
+        instanceNF.info.familyName = "Cascadia Code NL"
+        instancePL.info.familyName = "Cascadia Code PL"
 
         #4.2 GET BACK TO WORK
 
@@ -70,15 +70,11 @@
         #4.5 Adding glyphs
         print ("Adding Nerd Font glyphs")
         for glyph in NF_UFO.glyphOrder:
-            if glyph in instanceNF.glyphOrder:
-                pass
-            else:
+            if glyph not in instanceNF.glyphOrder:
                 instanceNF.addGlyph(NF_UFO.get(glyph))
 
         for glyph in PL_UFO.glyphOrder:
-            if glyph in instancePL.glyphOrder:
-                pass
-            else:
+            if glyph not in instancePL.glyphOrder:
                 instancePL.addGlyph(PL_UFO.get(glyph))
 
         # 5. Generate non-Ligature versions
@@ -90,13 +86,13 @@
         with open(INPUT_DIR / "features" / "features.fea", 'r') as feaCode:
             noLIG_fea = feaCode.read()
 
-        setattr(instance_noLIG.features,"text",noLIG_fea)
-        setattr(instanceNF_noLIG.features,"text",noLIG_fea)
-        setattr(instancePL_noLIG.features,"text",noLIG_fea)
+        instance_noLIG.features.text = noLIG_fea
+        instanceNF_noLIG.features.text = noLIG_fea
+        instancePL_noLIG.features.text = noLIG_fea
 
-        setattr(instance_noLIG.info, "familyName","Cascadia Code N")
-        setattr(instanceNF_noLIG.info, "familyName","Cascadia Code NLN")
-        setattr(instancePL_noLIG.info, "familyName","Cascadia Code PLN")
+        instance_noLIG.info.familyName = "Cascadia Mono"
+        instanceNF_noLIG.info.familyName = "Cascadia Mono NF"
+        instancePL_noLIG.info.familyName = "Cascadia Mono PL"
 
         # 6. Compile all TTFs
         print ("Compiling")
@@ -116,9 +112,9 @@
         instanceNF_font.save(file_path.with_name("CascadiaNF.ttf"))
         instancePL_font.save(file_path.with_name("CascadiaPL.ttf"))
 
-        instance_noLIG_font.save(file_path.with_name("Cascadia_noLIG.ttf"))
-        instanceNF_noLIG_font.save(file_path.with_name("CascadiaNF_noLIG.ttf"))
-        instancePL_noLIG_font.save(file_path.with_name("CascadiaPL_noLIG.ttf"))
+        instance_noLIG_font.save(file_path.with_name("CascadiaMono.ttf"))
+        instanceNF_noLIG_font.save(file_path.with_name("CascadiaMonoNF.ttf"))
+        instancePL_noLIG_font.save(file_path.with_name("CascadiaMonoPL.ttf"))
 
         print ("All done")
         print ("*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***")
diff --git a/build/Cascadia.ttf b/build/Cascadia.ttf
diff --git a/build/Cascadia_noLIG.ttf → build/CascadiaMono.ttf b/build/Cascadia_noLIG.ttf → build/CascadiaMono.ttf
diff --git a/build/CascadiaNF_noLIG.ttf → build/CascadiaMonoNF.ttf b/build/CascadiaNF_noLIG.ttf → build/CascadiaMonoNF.ttf
diff --git a/build/CascadiaPL_noLIG.ttf → build/CascadiaMonoPL.ttf b/build/CascadiaPL_noLIG.ttf → build/CascadiaMonoPL.ttf
diff --git a/build/CascadiaNF.ttf b/build/CascadiaNF.ttf
diff --git a/build/CascadiaPL.ttf b/build/CascadiaPL.ttf
diff --git a/sources/CascadiaCode-Regular.ufo/fontinfo.plist b/sources/CascadiaCode-Regular.ufo/fontinfo.plist
@@ -200,10 +200,6 @@ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
       <integer>0</integer>
       <integer>4</integer>
     </array>
-    <key>openTypeOS2Selection</key>
-    <array>
-      <integer>7</integer>
-    </array>
     <key>openTypeOS2Type</key>
     <array>
       <integer>3</integer>

diff --git a/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39.background/contents.plist b/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39.background/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>copyright</key>
+    <string>copyright.glif</string>
+  </dict>
+</plist>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39.background/copyright.glif b/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39.background/copyright.glif
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="copyright" format="2">
+  <outline>
+    <contour>
+      <point x="600" y="-20" type="curve" smooth="yes"/>
+      <point x="948" y="-20"/>
+      <point x="1124" y="218"/>
+      <point x="1124" y="700" type="curve" smooth="yes"/>
+      <point x="1124" y="1194"/>
+      <point x="948" y="1440"/>
+      <point x="600" y="1440" type="curve" smooth="yes"/>
+      <point x="252" y="1440"/>
+      <point x="76" y="1194"/>
+      <point x="76" y="700" type="curve" smooth="yes"/>
+      <point x="76" y="218"/>
+      <point x="252" y="-20"/>
+    </contour>
+    <contour>
+      <point x="600" y="144" type="curve" smooth="yes"/>
+      <point x="378" y="144"/>
+      <point x="266" y="329"/>
+      <point x="266" y="700" type="curve" smooth="yes"/>
+      <point x="266" y="1085"/>
+      <point x="378" y="1276"/>
+      <point x="600" y="1276" type="curve" smooth="yes"/>
+      <point x="822" y="1276"/>
+      <point x="934" y="1085"/>
+      <point x="934" y="700" type="curve" smooth="yes"/>
+      <point x="934" y="329"/>
+      <point x="822" y="144"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39/contents.plist b/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39/contents.plist
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>copyright</key>
+    <string>copyright.glif</string>
+  </dict>
+</plist>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39/copyright.glif b/sources/CascadiaCode-Regular.ufo/glyphs.N_ov 12 19, 17_39/copyright.glif
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="copyright" format="2">
+  <advance width="1200"/>
+  <unicode hex="00A9"/>
+  <outline>
+    <contour>
+      <point x="600" y="15" type="curve" smooth="yes"/>
+      <point x="965" y="15"/>
+      <point x="1174" y="263"/>
+      <point x="1174" y="695" type="curve" smooth="yes"/>
+      <point x="1174" y="1146"/>
+      <point x="965" y="1405"/>
+      <point x="600" y="1405" type="curve" smooth="yes"/>
+      <point x="235" y="1405"/>
+      <point x="26" y="1146"/>
+      <point x="26" y="695" type="curve" smooth="yes"/>
+      <point x="26" y="263"/>
+      <point x="235" y="15"/>
+    </contour>
+    <contour>
+      <point x="848" y="566" type="line"/>
+      <point x="793" y="550"/>
+      <point x="735" y="540"/>
+      <point x="676" y="540" type="curve" smooth="yes"/>
+      <point x="547" y="540"/>
+      <point x="476" y="604"/>
+      <point x="476" y="722" type="curve" smooth="yes"/>
+      <point x="476" y="823"/>
+      <point x="534" y="880"/>
+      <point x="636" y="880" type="curve" smooth="yes"/>
+      <point x="689" y="880"/>
+      <point x="736" y="853"/>
+      <point x="764" y="807" type="curve"/>
+      <point x="887" y="920" type="line"/>
+      <point x="851" y="996"/>
+      <point x="762" y="1040"/>
+      <point x="644" y="1040" type="curve" smooth="yes"/>
+      <point x="415" y="1040"/>
+      <point x="286" y="919"/>
+      <point x="286" y="712" type="curve" smooth="yes"/>
+      <point x="286" y="498"/>
+      <point x="419" y="380"/>
+      <point x="652" y="380" type="curve" smooth="yes"/>
+      <point x="725" y="380"/>
+      <point x="802" y="386"/>
+      <point x="872" y="410" type="curve"/>
+    </contour>
+    <contour>
+      <point x="600" y="169" type="curve" smooth="yes"/>
+      <point x="343" y="169"/>
+      <point x="196" y="361"/>
+      <point x="196" y="695" type="curve" smooth="yes"/>
+      <point x="196" y="1048"/>
+      <point x="343" y="1251"/>
+      <point x="600" y="1251" type="curve" smooth="yes"/>
+      <point x="857" y="1251"/>
+      <point x="1004" y="1048"/>
+      <point x="1004" y="695" type="curve" smooth="yes"/>
+      <point x="1004" y="361"/>
+      <point x="857" y="169"/>
+    </contour>
+  </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.lastChange</key>
+      <string>2019/11/13 06:15:58</string>
+    </dict>
+  </lib>
+</glyph>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs.O_ct 22 19, 11_36/at.glif b/sources/CascadiaCode-Regular.ufo/glyphs.O_ct 22 19, 11_36/at.glif
@@ -82,7 +82,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2019/11/12 09:33:13</string>
+      <string>2019/11/13 06:15:33</string>
     </dict>
   </lib>
 </glyph>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs/at.glif b/sources/CascadiaCode-Regular.ufo/glyphs/at.glif
@@ -78,7 +78,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2019/11/12 09:33:13</string>
+      <string>2019/11/13 06:15:33</string>
     </dict>
   </lib>
 </glyph>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs/copyright.glif b/sources/CascadiaCode-Regular.ufo/glyphs/copyright.glif
@@ -63,7 +63,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2019/11/05 15:26:22</string>
+      <string>2019/11/13 06:15:58</string>
     </dict>
   </lib>
 </glyph>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs/published.glif b/sources/CascadiaCode-Regular.ufo/glyphs/published.glif
@@ -61,7 +61,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2019/10/23 05:34:12</string>
+      <string>2019/11/13 06:16:22</string>
     </dict>
   </lib>
 </glyph>
diff --git a/sources/CascadiaCode-Regular.ufo/glyphs/registered.glif b/sources/CascadiaCode-Regular.ufo/glyphs/registered.glif
@@ -67,7 +67,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2019/09/26 20:29:40</string>
+      <string>2019/11/13 06:16:12</string>
     </dict>
   </lib>
 </glyph>
diff --git a/sources/CascadiaCode-Regular.ufo/layercontents.plist b/sources/CascadiaCode-Regular.ufo/layercontents.plist
@@ -206,6 +206,14 @@
       <string>Oct 22 19, 11:36.background</string>
       <string>glyphs.O_ct 22 19, 11_36.background</string>
     </array>
+    <array>
+      <string>Nov 12 19, 17:39</string>
+      <string>glyphs.N_ov 12 19, 17_39</string>
+    </array>
+    <array>
+      <string>Nov 12 19, 17:39.background</string>
+      <string>glyphs.N_ov 12 19, 17_39.background</string>
+    </array>
     <array>
       <string>Oct 22 19, 23:52</string>
       <string>glyphs.O_ct 22 19, 23_52</string>