Remove google fonts submodule; add IBM Plex and Codeface submodules

It turns out that every font we want is in Codeface except for Plex, which has its own git repo. So now all of our source fonts are submodulized!
ToxicFrog · Aug 31, 2018 · 9810633 · 9810633
1 parent d5db9c0
commit 9810633
Show file tree

Hide file tree

Showing 108 changed files with 42 additions and 36 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,12 @@
 [submodule "fira"]
-	path = fira
-	url = https://github.com/tonsky/FiraCode
-[submodule "google-fonts"]
-	path = input-fonts/google
-	url = https://github.com/google/fonts.git
+	path = fonts/fira
+	url = https://github.com/tonsky/FiraCode.git
+	shallow = true
+[submodule "codeface"]
+	path = fonts/codeface
+	url = https://github.com/chrissimpkins/codeface.git
+	shallow = true
+[submodule "plex"]
+	path = fonts/plex
+	url = https://github.com/IBM/plex.git
 	shallow = true
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Here's a couple examples of the fonts generated: SF Mono & Menlo with ligatures
 
 Use automatic mode to easily convert 1 or more font(s).
 
-1.  Put the font(s) you want into `input-fonts/`.
+1.  Put the font(s) you want into `fonts/`.
 1.  Edit `ligatures.py` to disable any ligatures you don't want, and/or enable any (non-ligature) characters you want from Fira Code in addition to the ligatures.
 1.  Edit `build.py` to add your new font(s) to the `prefixed_fonts` list. It supports globbing, so if (e.g.) you want to ligaturize all the different weights of FooFont you can add `'FooFont*'` to the list.
 1.  Run `make`.
@@ -49,7 +49,7 @@ Use automatic mode to easily convert 1 or more font(s).
 
 ### Manual ###
 
-1.  Move/copy the font you want to ligaturize into `input-fonts/` (or somewhere else convenient).
+1.  Move/copy the font you want to ligaturize into `fonts/` (or somewhere else convenient).
 2.  Edit `ligatures.py` to disable any ligatures you don't want.
 3.  Run the script:
 

diff --git a/build.py b/build.py
@@ -25,19 +25,19 @@
 
 prefixed_fonts = [
   # Apache 2.0 license
-  'google/apache/cousine/*.ttf',
-  'Droid*',
-  'Meslo*',
-  'google/apache/robotomono/*.ttf',
+  'fonts/codeface/fonts/cousine/*.ttf',
+  'fonts/codeface/fonts/droid-sans-mono/*.ttf',
+  'fonts/codeface/fonts/meslo/*.ttf',
+  'fonts/codeface/fonts/roboto-mono/*.ttf',
 
   # MIT license
-  'DejaVu*',
-  'Hack*',
+  'fonts/codeface/fonts/dejavu-sans-mono/*.ttf',
+  'fonts/codeface/fonts/hack/*.ttf',
 
   # SIL OFL with no Reserved Font Name
-  'Edlo*',
-  'FantasqueSansMono-Normal/*',
-  'google/ofl/inconsolata/*.ttf',
+  'fonts/codeface/fonts/edlo/*.ttf',
+  'fonts/codeface/fonts/fantasque-sans-mono/*.ttf',
+  'fonts/codeface/fonts/inconsolata/*.ttf',
 ]
 
 #### Fonts that need to be renamed. ####
@@ -48,17 +48,17 @@
 renamed_fonts = {
   # This doesn't have a reserved name, but if we don't rename it it'll collide
   # with its sibling Fantasque Sans Mono Normal, listed above.
-  'FantasqueSansMono-NoLoopK/*': 'Liga Fantasque Sans Mono NoLoopK',
+  'fonts/FantasqueSansMono-NoLoopK/*.otf': 'Liga Fantasque Sans Mono NoLoopK',
 
   # SIL OFL with reserved name
-  'google/ofl/anonymouspro/*.ttf': 'Liganymous',
-  'google/ofl/ibmplexmono/*.ttf': 'Ligalex Mono',
-  'google/ofl/oxygenmono/*.ttf': 'Liga O2 Mono',
-  'google/ofl/sourcecodepro/*.ttf': 'LigaSrc Pro',
-  'SourceCodeVariable*': 'LigaSrc Variable',
+  'fonts/codeface/fonts/anonymous-pro/*.ttf': 'Liganymous',
+  'fonts/plex/IBM-Plex-Mono/fonts/complete/ttf/*.ttf': 'Ligalex Mono',
+  'fonts/codeface/fonts/oxygen-mono/*.otf': 'Liga O2 Mono',
+  'fonts/codeface/fonts/source-code-pro/*.ttf': 'LigaSrc Pro',
+  'fonts/SourceCodeVariable*': 'LigaSrc Variable',
 
   # UFL
-  'google/ufl/ubuntumono/*.ttf': 'Ubuntu Mono Ligaturized',
+  'fonts/codeface/fonts/ubuntu-mono/*.ttf': 'Ubuntu Mono Ligaturized',
 }
 
 #### Fonts we can't ligaturize. ####
@@ -76,13 +76,12 @@
 
 import sys
 from glob import glob
-from os import path
 from ligaturize import ligaturize_font
 
 for pattern in prefixed_fonts:
-  files = glob(path.join('input-fonts', pattern))
+  files = glob(pattern)
   if not files:
-    print("Error: pattern 'input-fonts/%s' didn't match any files." % pattern)
+    print("Error: pattern '%s' didn't match any files." % pattern)
     sys.exit(1)
   for input_file in files:
     ligaturize_font(
@@ -92,9 +91,9 @@
       scale_character_glyphs_threshold=SCALE_CHARACTER_GLYPHS_THRESHOLD)
 
 for pattern,name in renamed_fonts.iteritems():
-  files = glob(path.join('input-fonts', pattern))
+  files = glob(pattern)
   if not files:
-    print("Error: pattern 'input-fonts/%s' didn't match any files." % pattern)
+    print("Error: pattern '%s' didn't match any files." % pattern)
     sys.exit(1)
   for input_file in files:
     ligaturize_font(

diff --git a/...nsMono-NoLoopK/FantasqueSansMono-Bold.otf → ...nsMono-NoLoopK/FantasqueSansMono-Bold.otf b/...nsMono-NoLoopK/FantasqueSansMono-Bold.otf → ...nsMono-NoLoopK/FantasqueSansMono-Bold.otf
diff --git a/...-NoLoopK/FantasqueSansMono-BoldItalic.otf → ...-NoLoopK/FantasqueSansMono-BoldItalic.otf b/...-NoLoopK/FantasqueSansMono-BoldItalic.otf → ...-NoLoopK/FantasqueSansMono-BoldItalic.otf
diff --git a/...Mono-NoLoopK/FantasqueSansMono-Italic.otf → ...Mono-NoLoopK/FantasqueSansMono-Italic.otf b/...Mono-NoLoopK/FantasqueSansMono-Italic.otf → ...Mono-NoLoopK/FantasqueSansMono-Italic.otf
diff --git a/...ono-NoLoopK/FantasqueSansMono-Regular.otf → ...ono-NoLoopK/FantasqueSansMono-Regular.otf b/...ono-NoLoopK/FantasqueSansMono-Regular.otf → ...ono-NoLoopK/FantasqueSansMono-Regular.otf
diff --git a/input-fonts/SourceCodeVariable-Roman.ttf → fonts/SourceCodeVariable-Roman.ttf b/input-fonts/SourceCodeVariable-Roman.ttf → fonts/SourceCodeVariable-Roman.ttf
diff --git a/fonts/codeface b/fonts/codeface
diff --git a/fira → fonts/fira b/fira → fonts/fira
diff --git a/fonts/plex b/fonts/plex
diff --git a/input-fonts/CamingoCode-Regular.ttf b/input-fonts/CamingoCode-Regular.ttf
diff --git a/input-fonts/DejaVuSansMono.ttf b/input-fonts/DejaVuSansMono.ttf
diff --git a/input-fonts/DroidSansMono.ttf b/input-fonts/DroidSansMono.ttf
diff --git a/input-fonts/Edlo.ttf b/input-fonts/Edlo.ttf
diff --git a/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-Bold.otf b/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-Bold.otf
diff --git a/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-BoldItalic.otf b/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-BoldItalic.otf
diff --git a/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-Italic.otf b/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-Italic.otf
diff --git a/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-Regular.otf b/input-fonts/FantasqueSansMono-Normal/FantasqueSansMono-Regular.otf
diff --git a/input-fonts/Hack-Bold.ttf b/input-fonts/Hack-Bold.ttf
diff --git a/input-fonts/Hack-Regular.ttf b/input-fonts/Hack-Regular.ttf
diff --git a/input-fonts/MesloLGL-Regular.ttf b/input-fonts/MesloLGL-Regular.ttf
diff --git a/input-fonts/MesloLGLDZ-Regular.ttf b/input-fonts/MesloLGLDZ-Regular.ttf
diff --git a/input-fonts/MesloLGM-Regular.ttf b/input-fonts/MesloLGM-Regular.ttf
diff --git a/input-fonts/MesloLGMDZ-Regular.ttf b/input-fonts/MesloLGMDZ-Regular.ttf
diff --git a/input-fonts/MesloLGS-Regular.ttf b/input-fonts/MesloLGS-Regular.ttf
diff --git a/input-fonts/MesloLGSDZ-Regular.ttf b/input-fonts/MesloLGSDZ-Regular.ttf
diff --git a/input-fonts/SFMono-Regular.otf b/input-fonts/SFMono-Regular.otf
diff --git a/input-fonts/SFMono-Semibold.otf b/input-fonts/SFMono-Semibold.otf
diff --git a/input-fonts/google b/input-fonts/google
diff --git a/ligaturize.py b/ligaturize.py
@@ -38,13 +38,13 @@ def get_ligature_source(fontname):
     for weight in ['Bold', 'Retina', 'Medium', 'Regular', 'Light']:
         if fontname.endswith('-' + weight):
             # Exact match for one of the Fira Code weights
-            return 'fira/distr/otf/FiraCode-%s.otf' % weight
+            return 'fonts/fira/distr/otf/FiraCode-%s.otf' % weight
 
     # No exact match. Guess that we want 'Bold' if the font name has 'Bold' in
     # it, and 'Regular' otherwise.
     if 'Bold' in fontname:
-        return 'fira/distr/otf/FiraCode-Bold.otf'
-    return 'fira/distr/otf/FiraCode-Regular.otf'
+        return 'fonts/fira/distr/otf/FiraCode-Bold.otf'
+    return 'fonts/fira/distr/otf/FiraCode-Regular.otf'
 
 class LigatureCreator(object):
 
@@ -241,7 +241,8 @@ def update_font_metadata(font, new_name):
         font.fullname = new_name
         font.fontname = new_name.replace(' ', '')
 
-    print("Ligaturizing font '%s' as '%s'" % (old_name, new_name))
+    print("Ligaturizing font %s (%s) as '%s'" % (
+        path.basename(font.path), old_name, new_name))
 
     font.copyright += COPYRIGHT
     font.sfnt_names = tuple(
@@ -266,7 +267,7 @@ def ligaturize_font(input_font_file, output_dir, ligature_font_file,
 
     update_font_metadata(font, name)
 
-    print('Reading ligatures from %s' % ligature_font_file)
+    print('    ...using ligatures from %s' % ligature_font_file)
     firacode = fontforge.open(ligature_font_file)
 
     creator = LigatureCreator(font, firacode, **kwargs)
@@ -284,7 +285,7 @@ def ligaturize_font(input_font_file, output_dir, ligature_font_file,
 
     # Generate font & move to output directory
     output_font_file = path.join(output_dir, font.fontname + '.ttf')
-    print("Saved ligaturized font '%s' as %s" % (font.fullname, output_font_file))
+    print("    ...saving to '%s' (%s)" % (output_font_file, font.fullname))
     font.generate(output_font_file)
 
 
@@ -300,7 +301,7 @@ def parse_args():
     parser.add_argument("--ligature-font-file",
         type=str, default='', metavar='PATH',
         help="The file to copy ligatures from. If unspecified, ligaturize will"
-             " attempt to pick a suitable one from fira/distr/otf/ based on the input"
+             " attempt to pick a suitable one from fonts/fira/distr/otf/ based on the input"
              " font's weight.")
     parser.add_argument("--copy-character-glyphs",
         default=False, action='store_true',

diff --git a/output-fonts/LigaCousine-Bold.ttf b/output-fonts/LigaCousine-Bold.ttf
diff --git a/output-fonts/LigaCousine-BoldItalic.ttf b/output-fonts/LigaCousine-BoldItalic.ttf
diff --git a/output-fonts/LigaCousine-Italic.ttf b/output-fonts/LigaCousine-Italic.ttf
diff --git a/output-fonts/LigaCousine-Regular.ttf b/output-fonts/LigaCousine-Regular.ttf
diff --git a/output-fonts/LigaCousine.ttf b/output-fonts/LigaCousine.ttf
diff --git a/output-fonts/LigaDejaVuSansMono-Bold.ttf b/output-fonts/LigaDejaVuSansMono-Bold.ttf
diff --git a/output-fonts/LigaDejaVuSansMono-BoldOblique.ttf b/output-fonts/LigaDejaVuSansMono-BoldOblique.ttf
diff --git a/output-fonts/LigaDejaVuSansMono-Oblique.ttf b/output-fonts/LigaDejaVuSansMono-Oblique.ttf
diff --git a/output-fonts/LigaFantasqueSansMono-Bold.ttf b/output-fonts/LigaFantasqueSansMono-Bold.ttf
diff --git a/output-fonts/LigaFantasqueSansMono-BoldItalic.ttf b/output-fonts/LigaFantasqueSansMono-BoldItalic.ttf
diff --git a/output-fonts/LigaFantasqueSansMono-Italic.ttf b/output-fonts/LigaFantasqueSansMono-Italic.ttf
diff --git a/output-fonts/LigaFantasqueSansMono-RegItalic.ttf b/output-fonts/LigaFantasqueSansMono-RegItalic.ttf
diff --git a/output-fonts/LigaFantasqueSansMono-Regular.ttf b/output-fonts/LigaFantasqueSansMono-Regular.ttf
diff --git a/output-fonts/LigaFantasqueSansMonoNoLoopK-Bold.ttf b/output-fonts/LigaFantasqueSansMonoNoLoopK-Bold.ttf
diff --git a/output-fonts/LigaFantasqueSansMonoNoLoopK-BoldItalic.ttf b/output-fonts/LigaFantasqueSansMonoNoLoopK-BoldItalic.ttf
diff --git a/output-fonts/LigaHack-Bold.ttf b/output-fonts/LigaHack-Bold.ttf
diff --git a/output-fonts/LigaHack-BoldItalic.ttf b/output-fonts/LigaHack-BoldItalic.ttf
diff --git a/output-fonts/LigaHack-Italic.ttf b/output-fonts/LigaHack-Italic.ttf
diff --git a/output-fonts/LigaHack-Regular.ttf b/output-fonts/LigaHack-Regular.ttf
diff --git a/output-fonts/LigaInconsolata-Bold.ttf b/output-fonts/LigaInconsolata-Bold.ttf
diff --git a/output-fonts/LigaInconsolata-Regular.ttf b/output-fonts/LigaInconsolata-Regular.ttf
diff --git a/output-fonts/LigaInconsolata-g-g.ttf b/output-fonts/LigaInconsolata-g-g.ttf
diff --git a/output-fonts/LigaInconsolata.ttf b/output-fonts/LigaInconsolata.ttf
diff --git a/output-fonts/LigaMesloLGL-Regular.ttf b/output-fonts/LigaMesloLGL-Regular.ttf
diff --git a/output-fonts/LigaMesloLGLDZ-Regular.ttf b/output-fonts/LigaMesloLGLDZ-Regular.ttf
diff --git a/output-fonts/LigaMesloLGM-Regular.ttf b/output-fonts/LigaMesloLGM-Regular.ttf
diff --git a/output-fonts/LigaMesloLGMDZ-Bold.ttf b/output-fonts/LigaMesloLGMDZ-Bold.ttf
diff --git a/output-fonts/LigaMesloLGMDZ-BoldItalic.ttf b/output-fonts/LigaMesloLGMDZ-BoldItalic.ttf
diff --git a/output-fonts/LigaMesloLGMDZ-Italic.ttf b/output-fonts/LigaMesloLGMDZ-Italic.ttf
diff --git a/output-fonts/LigaMesloLGS-Regular.ttf b/output-fonts/LigaMesloLGS-Regular.ttf
diff --git a/output-fonts/LigaMesloLGSDZ-Regular.ttf b/output-fonts/LigaMesloLGSDZ-Regular.ttf
diff --git a/output-fonts/LigaO2Mono-Regular.ttf b/output-fonts/LigaO2Mono-Regular.ttf
diff --git a/output-fonts/LigaRobotoMono-Bold.ttf b/output-fonts/LigaRobotoMono-Bold.ttf
diff --git a/output-fonts/LigaRobotoMono-BoldItalic.ttf b/output-fonts/LigaRobotoMono-BoldItalic.ttf
diff --git a/output-fonts/LigaRobotoMono-Italic.ttf b/output-fonts/LigaRobotoMono-Italic.ttf
diff --git a/output-fonts/LigaRobotoMono-Regular.ttf b/output-fonts/LigaRobotoMono-Regular.ttf
diff --git a/output-fonts/LigaRobotoMonoLight-Light.ttf b/output-fonts/LigaRobotoMonoLight-Light.ttf
diff --git a/output-fonts/LigaRobotoMonoLight-LightItalic.ttf b/output-fonts/LigaRobotoMonoLight-LightItalic.ttf
diff --git a/output-fonts/LigaRobotoMonoMedium-Medium.ttf b/output-fonts/LigaRobotoMonoMedium-Medium.ttf
diff --git a/output-fonts/LigaRobotoMonoMedium-MediumItalic.ttf b/output-fonts/LigaRobotoMonoMedium-MediumItalic.ttf
diff --git a/output-fonts/LigaRobotoMonoThin-Thin.ttf b/output-fonts/LigaRobotoMonoThin-Thin.ttf
diff --git a/output-fonts/LigaRobotoMonoThin-ThinItalic.ttf b/output-fonts/LigaRobotoMonoThin-ThinItalic.ttf
diff --git a/output-fonts/LigaSrcPro-Black.ttf b/output-fonts/LigaSrcPro-Black.ttf
diff --git a/output-fonts/LigaSrcPro-BlackIt.ttf b/output-fonts/LigaSrcPro-BlackIt.ttf
diff --git a/output-fonts/LigaSrcPro-Bold.ttf b/output-fonts/LigaSrcPro-Bold.ttf
diff --git a/output-fonts/LigaSrcPro-BoldIt.ttf b/output-fonts/LigaSrcPro-BoldIt.ttf
diff --git a/output-fonts/LigaSrcPro-ExtraLight.ttf b/output-fonts/LigaSrcPro-ExtraLight.ttf
diff --git a/output-fonts/LigaSrcPro-ExtraLightIt.ttf b/output-fonts/LigaSrcPro-ExtraLightIt.ttf
diff --git a/output-fonts/LigaSrcPro-It.ttf b/output-fonts/LigaSrcPro-It.ttf
diff --git a/output-fonts/LigaSrcPro-Light.ttf b/output-fonts/LigaSrcPro-Light.ttf
diff --git a/output-fonts/LigaSrcPro-LightIt.ttf b/output-fonts/LigaSrcPro-LightIt.ttf
diff --git a/output-fonts/LigaSrcPro-Medium.ttf b/output-fonts/LigaSrcPro-Medium.ttf
diff --git a/output-fonts/LigaSrcPro-MediumIt.ttf b/output-fonts/LigaSrcPro-MediumIt.ttf
diff --git a/output-fonts/LigaSrcPro-Regular.ttf b/output-fonts/LigaSrcPro-Regular.ttf
diff --git a/output-fonts/LigaSrcPro-SemiBold.ttf b/output-fonts/LigaSrcPro-SemiBold.ttf
diff --git a/output-fonts/LigaSrcPro-Semibold.ttf b/output-fonts/LigaSrcPro-Semibold.ttf
diff --git a/output-fonts/LigaSrcPro-SemiboldIt.ttf b/output-fonts/LigaSrcPro-SemiboldIt.ttf
diff --git a/output-fonts/LigaSrcVariable-Roman.ttf b/output-fonts/LigaSrcVariable-Roman.ttf
diff --git a/output-fonts/LigalexMono-ExtraLight.ttf b/output-fonts/LigalexMono-ExtraLight.ttf
diff --git a/output-fonts/LigalexMono-ExtraLightItalic.ttf b/output-fonts/LigalexMono-ExtraLightItalic.ttf
diff --git a/output-fonts/LigalexMono-Italic.ttf b/output-fonts/LigalexMono-Italic.ttf
diff --git a/output-fonts/LigalexMono-Light.ttf b/output-fonts/LigalexMono-Light.ttf
diff --git a/output-fonts/LigalexMono-LightItalic.ttf b/output-fonts/LigalexMono-LightItalic.ttf
diff --git a/output-fonts/LigalexMono-Medium.ttf b/output-fonts/LigalexMono-Medium.ttf
diff --git a/output-fonts/LigalexMono-MediumItalic.ttf b/output-fonts/LigalexMono-MediumItalic.ttf
diff --git a/output-fonts/LigalexMono-Text.ttf b/output-fonts/LigalexMono-Text.ttf
diff --git a/output-fonts/LigalexMono-TextItalic.ttf b/output-fonts/LigalexMono-TextItalic.ttf
diff --git a/output-fonts/LigalexMono-Thin.ttf b/output-fonts/LigalexMono-Thin.ttf
diff --git a/output-fonts/LigalexMono-ThinItalic.ttf b/output-fonts/LigalexMono-ThinItalic.ttf
diff --git a/output-fonts/LigalexMono.ttf b/output-fonts/LigalexMono.ttf
diff --git a/output-fonts/Liganymous-Bold.ttf b/output-fonts/Liganymous-Bold.ttf
diff --git a/output-fonts/Liganymous-BoldItalic.ttf b/output-fonts/Liganymous-BoldItalic.ttf
diff --git a/output-fonts/Liganymous-Italic.ttf b/output-fonts/Liganymous-Italic.ttf
diff --git a/output-fonts/Liganymous-Regular.ttf b/output-fonts/Liganymous-Regular.ttf
diff --git a/output-fonts/Liganymous.ttf b/output-fonts/Liganymous.ttf
diff --git a/output-fonts/UbuntuMonoLigaturized-Italic.ttf b/output-fonts/UbuntuMonoLigaturized-Italic.ttf
diff --git a/output-fonts/UbuntuMonoLigaturized-Regular.ttf b/output-fonts/UbuntuMonoLigaturized-Regular.ttf