Merge pull request #7 from aaronbell/main

Converted to UFR
googlefonts · Aug 26, 2021 · 56f275e · 56f275e
2 parents 13826fc + b196d7b
commit 56f275e
Show file tree

Hide file tree

Showing 68 changed files with 231,064 additions and 212,390 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,37 @@
+name: Build font and specimen
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install Linux dependencies
+      run: |
+        sudo snap install yq
+    - name: Build font
+      run: make build
+    - name: Check with fontbakery
+      run: make test
+      continue-on-error: true
+    - name: Generate proofs
+      run: make proof
+    - name: Gather
+      run: |
+          mkdir for-gh-pages
+          mv fontbakery-report.html for-gh-pages
+          mv proof/* for-gh-pages
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: Artifacts
+        path: |
+          for-gh-pages
+    - name: Remove temp folder
+      run: |
+          rm -rf for-gh-pages
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,14 @@
+*~
+venv
+build.stamp
+proof
+
+# OS generated files #
+######################
 .DS_Store
-*(Autosaved)*
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/Makefile b/Makefile
@@ -0,0 +1,34 @@
+SOURCES=$(shell yq e '.sources.[] | sub("^","sources/")' sources/config.yaml )
+FAMILY=$(shell yq e '.familyName' sources/config.yaml )
+
+help:
+	@echo "###"
+	@echo "# Build targets for $(FAMILY)"
+	@echo "###"
+	@echo
+	@echo "  make build: Builds the fonts and places them in the fonts/ directory"
+	@echo "  make test:  Tests the fonts with fontbakery"
+	@echo "  make proof: Creates HTML proof documents in the proof/ directory"
+	@echo
+
+build: build.stamp sources/config.yaml $(SOURCES)
+
+venv: venv/touchfile
+
+build.stamp: venv
+	. venv/bin/activate; gftools builder sources/config.yaml && touch build.stamp
+
+venv/touchfile: requirements.txt
+	test -d venv || python3 -m venv venv
+	. venv/bin/activate; pip install -Ur requirements.txt
+	touch venv/touchfile
+
+test: venv build.stamp
+	. venv/bin/activate; fontbakery check-googlefonts --html fontbakery-report.html --ghmarkdown fontbakery-report.md $(shell find fonts -type f)
+
+proof: venv build.stamp
+	. venv/bin/activate; gftools gen-html proof $(shell find fonts/ttf -type f) -o proof
+
+clean:
+	rm -rf venv
+	find -iname "*.pyc" -delete
diff --git a/README.md b/README.md
@@ -13,4 +13,27 @@ by Vernon Adams
 - Fix glyphs, anchors and components
 - Fix MM compatibility. Roman is worse than Italics
 - Run fonts through Font bakery and Ship fonts
-- Add TRADEMARKS.md
+- Add TRADEMARKS.md
+
+
+## Building
+
+Fonts are built automatically by GitHub Actions - take a look in the "Actions" tab for the latest build.
+
+If you particularly want to build fonts manually on your own computer, you will need to install the [`yq` utility](https://github.com/mikefarah/yq). On OS X with Homebrew, type `brew install yq`; on Linux, try `snap install yq`; if all else fails, try the instructions on the linked page.
+
+Then:
+
+* `make build` will produce font files.
+* `make test` will run [FontBakery](https://github.com/googlefonts/fontbakery)'s quality assurance tests.
+* `make proof` will generate HTML proof files.
+
+## License
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at
+http://scripts.sil.org/OFL
+
+## Repository Layout
+
+This font repository structure is inspired by [Unified Font Repository v0.3](https://github.com/unified-font-repository/Unified-Font-Repository), modified for the Google Fonts workflow.
diff --git a/fonts/otf/Mulish-Black.otf b/fonts/otf/Mulish-Black.otf
diff --git a/fonts/otf/Mulish-BlackItalic.otf b/fonts/otf/Mulish-BlackItalic.otf
diff --git a/fonts/otf/Mulish-Bold.otf b/fonts/otf/Mulish-Bold.otf
diff --git a/fonts/otf/Mulish-BoldItalic.otf b/fonts/otf/Mulish-BoldItalic.otf
diff --git a/fonts/otf/Mulish-ExtraBlack.otf b/fonts/otf/Mulish-ExtraBlack.otf
diff --git a/fonts/otf/Mulish-ExtraBlackItalic.otf b/fonts/otf/Mulish-ExtraBlackItalic.otf
diff --git a/fonts/otf/Mulish-ExtraBold.otf b/fonts/otf/Mulish-ExtraBold.otf
diff --git a/fonts/otf/Mulish-ExtraBoldItalic.otf b/fonts/otf/Mulish-ExtraBoldItalic.otf
diff --git a/fonts/otf/Mulish-ExtraLight.otf b/fonts/otf/Mulish-ExtraLight.otf
diff --git a/fonts/otf/Mulish-ExtraLightItalic.otf b/fonts/otf/Mulish-ExtraLightItalic.otf
diff --git a/fonts/otf/Mulish-Italic.otf b/fonts/otf/Mulish-Italic.otf
diff --git a/fonts/otf/Mulish-Light.otf b/fonts/otf/Mulish-Light.otf
diff --git a/fonts/otf/Mulish-LightItalic.otf b/fonts/otf/Mulish-LightItalic.otf
diff --git a/fonts/otf/Mulish-Medium.otf b/fonts/otf/Mulish-Medium.otf
diff --git a/fonts/otf/Mulish-MediumItalic.otf b/fonts/otf/Mulish-MediumItalic.otf
diff --git a/fonts/otf/Mulish-Regular.otf b/fonts/otf/Mulish-Regular.otf
diff --git a/fonts/otf/Mulish-SemiBold.otf b/fonts/otf/Mulish-SemiBold.otf
diff --git a/fonts/otf/Mulish-SemiBoldItalic.otf b/fonts/otf/Mulish-SemiBoldItalic.otf
diff --git a/fonts/ttf/Mulish-Black.ttf b/fonts/ttf/Mulish-Black.ttf
diff --git a/fonts/ttf/Mulish-BlackItalic.ttf b/fonts/ttf/Mulish-BlackItalic.ttf
diff --git a/fonts/ttf/Mulish-Bold.ttf b/fonts/ttf/Mulish-Bold.ttf
diff --git a/fonts/ttf/Mulish-BoldItalic.ttf b/fonts/ttf/Mulish-BoldItalic.ttf
diff --git a/fonts/ttf/Mulish-ExtraBlack.ttf b/fonts/ttf/Mulish-ExtraBlack.ttf
diff --git a/fonts/ttf/Mulish-ExtraBlackItalic.ttf b/fonts/ttf/Mulish-ExtraBlackItalic.ttf
diff --git a/fonts/ttf/Mulish-ExtraBold.ttf b/fonts/ttf/Mulish-ExtraBold.ttf
diff --git a/fonts/ttf/Mulish-ExtraBoldItalic.ttf b/fonts/ttf/Mulish-ExtraBoldItalic.ttf
diff --git a/fonts/ttf/Mulish-ExtraLight.ttf b/fonts/ttf/Mulish-ExtraLight.ttf
diff --git a/fonts/ttf/Mulish-ExtraLightItalic.ttf b/fonts/ttf/Mulish-ExtraLightItalic.ttf
diff --git a/fonts/ttf/Mulish-Italic.ttf b/fonts/ttf/Mulish-Italic.ttf
diff --git a/fonts/ttf/Mulish-Light.ttf b/fonts/ttf/Mulish-Light.ttf
diff --git a/fonts/ttf/Mulish-LightItalic.ttf b/fonts/ttf/Mulish-LightItalic.ttf
diff --git a/fonts/ttf/Mulish-Medium.ttf b/fonts/ttf/Mulish-Medium.ttf
diff --git a/fonts/ttf/Mulish-MediumItalic.ttf b/fonts/ttf/Mulish-MediumItalic.ttf
diff --git a/fonts/ttf/Mulish-Regular.ttf b/fonts/ttf/Mulish-Regular.ttf
diff --git a/fonts/ttf/Mulish-SemiBold.ttf b/fonts/ttf/Mulish-SemiBold.ttf
diff --git a/fonts/ttf/Mulish-SemiBoldItalic.ttf b/fonts/ttf/Mulish-SemiBoldItalic.ttf
diff --git a/fonts/vf/Mulish-Italic[wght].ttf → fonts/variable/Mulish-Italic[wght].ttf b/fonts/vf/Mulish-Italic[wght].ttf → fonts/variable/Mulish-Italic[wght].ttf
diff --git a/fonts/variable/Mulish[wght].ttf b/fonts/variable/Mulish[wght].ttf
diff --git a/fonts/vf/Mulish[wght].ttf b/fonts/vf/Mulish[wght].ttf
diff --git a/fonts/webfonts/Mulish-Black.woff2 b/fonts/webfonts/Mulish-Black.woff2
diff --git a/fonts/webfonts/Mulish-BlackItalic.woff2 b/fonts/webfonts/Mulish-BlackItalic.woff2
diff --git a/fonts/webfonts/Mulish-Bold.woff2 b/fonts/webfonts/Mulish-Bold.woff2
diff --git a/fonts/webfonts/Mulish-BoldItalic.woff2 b/fonts/webfonts/Mulish-BoldItalic.woff2
diff --git a/fonts/webfonts/Mulish-ExtraBlack.woff2 b/fonts/webfonts/Mulish-ExtraBlack.woff2
diff --git a/fonts/webfonts/Mulish-ExtraBlackItalic.woff2 b/fonts/webfonts/Mulish-ExtraBlackItalic.woff2
diff --git a/fonts/webfonts/Mulish-ExtraBold.woff2 b/fonts/webfonts/Mulish-ExtraBold.woff2
diff --git a/fonts/webfonts/Mulish-ExtraBoldItalic.woff2 b/fonts/webfonts/Mulish-ExtraBoldItalic.woff2
diff --git a/fonts/webfonts/Mulish-ExtraLight.woff2 b/fonts/webfonts/Mulish-ExtraLight.woff2
diff --git a/fonts/webfonts/Mulish-ExtraLightItalic.woff2 b/fonts/webfonts/Mulish-ExtraLightItalic.woff2
diff --git a/fonts/webfonts/Mulish-Italic.woff2 b/fonts/webfonts/Mulish-Italic.woff2
diff --git a/fonts/webfonts/Mulish-Light.woff2 b/fonts/webfonts/Mulish-Light.woff2
diff --git a/fonts/webfonts/Mulish-LightItalic.woff2 b/fonts/webfonts/Mulish-LightItalic.woff2
diff --git a/fonts/webfonts/Mulish-Medium.woff2 b/fonts/webfonts/Mulish-Medium.woff2
diff --git a/fonts/webfonts/Mulish-MediumItalic.woff2 b/fonts/webfonts/Mulish-MediumItalic.woff2
diff --git a/fonts/webfonts/Mulish-Regular.woff2 b/fonts/webfonts/Mulish-Regular.woff2
diff --git a/fonts/webfonts/Mulish-SemiBold.woff2 b/fonts/webfonts/Mulish-SemiBold.woff2
diff --git a/fonts/webfonts/Mulish-SemiBoldItalic.woff2 b/fonts/webfonts/Mulish-SemiBoldItalic.woff2
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
-fontmake
-git+https://github.com/googlefonts/gftools
+fontmake>=2.4
+fontbakery>=0.7
+gftools>=0.7