Add Google Fonts submodule for those fonts present in it

The following fonts are now loaded from the submodule rather than checked in: - Cousine - Roboto Mono - Inconsolata - Anonymous Pro - IBM Plex Mono - Oxygen Mono - Source Code Pro - Ubuntu Mono This also means a bunch of new output fonts have been added for variants not present in the original input-fonts.
ToxicFrog · Aug 31, 2018 · d5db9c0 · d5db9c0
1 parent 01b7c2b
commit d5db9c0
Show file tree

Hide file tree

Showing 80 changed files with 25 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "fira"]
 	path = fira
 	url = https://github.com/tonsky/FiraCode
+[submodule "google-fonts"]
+	path = input-fonts/google
+	url = https://github.com/google/fonts.git
+	shallow = true
diff --git a/build.py b/build.py
@@ -25,10 +25,10 @@
 
 prefixed_fonts = [
   # Apache 2.0 license
-  'Cousine*',
+  'google/apache/cousine/*.ttf',
   'Droid*',
   'Meslo*',
-  'Roboto*',
+  'google/apache/robotomono/*.ttf',
 
   # MIT license
   'DejaVu*',
@@ -37,7 +37,7 @@
   # SIL OFL with no Reserved Font Name
   'Edlo*',
   'FantasqueSansMono-Normal/*',
-  'Inconsolata*',
+  'google/ofl/inconsolata/*.ttf',
 ]
 
 #### Fonts that need to be renamed. ####
@@ -51,14 +51,14 @@
   'FantasqueSansMono-NoLoopK/*': 'Liga Fantasque Sans Mono NoLoopK',
 
   # SIL OFL with reserved name
-  'Anonymous*': 'Liganymous',
-  'IBMPlexMono*': 'Ligalex Mono',
-  'OxygenMono*': 'Liga O2 Mono',
-  'SourceCodePro*': 'LigaSrc Pro',
+  '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',
 
   # UFL
-  'UbuntuMono*': 'Ubuntu Mono Ligaturized',
+  'google/ufl/ubuntumono/*.ttf': 'Ubuntu Mono Ligaturized',
 }
 
 #### Fonts we can't ligaturize. ####
@@ -74,20 +74,29 @@
 
 #### No user serviceable parts below this line. ####
 
+import sys
 from glob import glob
 from os import path
 from ligaturize import ligaturize_font
 
 for pattern in prefixed_fonts:
-  for input_file in glob(path.join('input-fonts', pattern)):
+  files = glob(path.join('input-fonts', pattern))
+  if not files:
+    print("Error: pattern 'input-fonts/%s' didn't match any files." % pattern)
+    sys.exit(1)
+  for input_file in files:
     ligaturize_font(
       input_file, ligature_font_file=None, output_dir='output-fonts/',
       prefix=LIGATURIZED_FONT_NAME_PREFIX, output_name=None,
       copy_character_glyphs=COPY_CHARACTER_GLYPHS,
       scale_character_glyphs_threshold=SCALE_CHARACTER_GLYPHS_THRESHOLD)
 
 for pattern,name in renamed_fonts.iteritems():
-  for input_file in glob(path.join('input-fonts', pattern)):
+  files = glob(path.join('input-fonts', pattern))
+  if not files:
+    print("Error: pattern 'input-fonts/%s' didn't match any files." % pattern)
+    sys.exit(1)
+  for input_file in files:
     ligaturize_font(
       input_file, ligature_font_file=None, output_dir='output-fonts/',
       prefix=None, output_name=name,

diff --git a/fira b/fira
diff --git a/input-fonts/Anonymous_Pro.ttf b/input-fonts/Anonymous_Pro.ttf
diff --git a/input-fonts/Cousine-Bold.ttf b/input-fonts/Cousine-Bold.ttf
diff --git a/input-fonts/Cousine-Regular.ttf b/input-fonts/Cousine-Regular.ttf
diff --git a/input-fonts/IBMPlexMono-Bold.otf b/input-fonts/IBMPlexMono-Bold.otf
diff --git a/input-fonts/IBMPlexMono-BoldItalic.otf b/input-fonts/IBMPlexMono-BoldItalic.otf
diff --git a/input-fonts/IBMPlexMono-ExtraLight.otf b/input-fonts/IBMPlexMono-ExtraLight.otf
diff --git a/input-fonts/IBMPlexMono-ExtraLightItalic.otf b/input-fonts/IBMPlexMono-ExtraLightItalic.otf
diff --git a/input-fonts/IBMPlexMono-Italic.otf b/input-fonts/IBMPlexMono-Italic.otf
diff --git a/input-fonts/IBMPlexMono-Light.otf b/input-fonts/IBMPlexMono-Light.otf
diff --git a/input-fonts/IBMPlexMono-LightItalic.otf b/input-fonts/IBMPlexMono-LightItalic.otf
diff --git a/input-fonts/IBMPlexMono-Medium.otf b/input-fonts/IBMPlexMono-Medium.otf
diff --git a/input-fonts/IBMPlexMono-MediumItalic.otf b/input-fonts/IBMPlexMono-MediumItalic.otf
diff --git a/input-fonts/IBMPlexMono-Regular.otf b/input-fonts/IBMPlexMono-Regular.otf
diff --git a/input-fonts/IBMPlexMono-SemiBold.otf b/input-fonts/IBMPlexMono-SemiBold.otf
diff --git a/input-fonts/IBMPlexMono-SemiBoldItalic.otf b/input-fonts/IBMPlexMono-SemiBoldItalic.otf
diff --git a/input-fonts/IBMPlexMono-Text.otf b/input-fonts/IBMPlexMono-Text.otf
diff --git a/input-fonts/IBMPlexMono-TextItalic.otf b/input-fonts/IBMPlexMono-TextItalic.otf
diff --git a/input-fonts/IBMPlexMono-Thin.otf b/input-fonts/IBMPlexMono-Thin.otf
diff --git a/input-fonts/IBMPlexMono-ThinItalic.otf b/input-fonts/IBMPlexMono-ThinItalic.otf
diff --git a/input-fonts/Inconsolata-Regular.ttf b/input-fonts/Inconsolata-Regular.ttf
diff --git a/input-fonts/Inconsolata-g.otf b/input-fonts/Inconsolata-g.otf
diff --git a/input-fonts/Inconsolata.otf b/input-fonts/Inconsolata.otf
diff --git a/input-fonts/OxygenMono-Regular.ttf b/input-fonts/OxygenMono-Regular.ttf
diff --git a/input-fonts/RobotoMono-Regular.ttf b/input-fonts/RobotoMono-Regular.ttf
diff --git a/input-fonts/SourceCodePro-Bold.ttf b/input-fonts/SourceCodePro-Bold.ttf
diff --git a/input-fonts/SourceCodePro-Regular.ttf b/input-fonts/SourceCodePro-Regular.ttf
diff --git a/input-fonts/UbuntuMono-Regular.ttf b/input-fonts/UbuntuMono-Regular.ttf
diff --git a/input-fonts/google b/input-fonts/google
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/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/LigaFantasqueSansMonoNoLoopK-Italic.ttf b/output-fonts/LigaFantasqueSansMonoNoLoopK-Italic.ttf
diff --git a/output-fonts/LigaFantasqueSansMonoNoLoopK-Regular.ttf b/output-fonts/LigaFantasqueSansMonoNoLoopK-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/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-Bold.ttf b/output-fonts/LigaSrcPro-Bold.ttf
diff --git a/output-fonts/LigaSrcPro-ExtraLight.ttf b/output-fonts/LigaSrcPro-ExtraLight.ttf
diff --git a/output-fonts/LigaSrcPro-Light.ttf b/output-fonts/LigaSrcPro-Light.ttf
diff --git a/output-fonts/LigaSrcPro-Medium.ttf b/output-fonts/LigaSrcPro-Medium.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/LigalexMono-Bold.ttf b/output-fonts/LigalexMono-Bold.ttf
diff --git a/output-fonts/LigalexMono-BoldItalic.ttf b/output-fonts/LigalexMono-BoldItalic.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-SemiBold.ttf b/output-fonts/LigalexMono-SemiBold.ttf
diff --git a/output-fonts/LigalexMono-SemiBoldItalic.ttf b/output-fonts/LigalexMono-SemiBoldItalic.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/UbuntuMonoLigaturized-Bold.ttf b/output-fonts/UbuntuMonoLigaturized-Bold.ttf
diff --git a/output-fonts/UbuntuMonoLigaturized-BoldItalic.ttf b/output-fonts/UbuntuMonoLigaturized-BoldItalic.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