Merge pull request #22 from aaronbell/main

Correcting STAT table and other updates
googlefonts · Jul 20, 2021 · fcca100 · fcca100
2 parents 1ea6db2 + 3cd7056
commit fcca100
Show file tree

Hide file tree

Showing 26 changed files with 2,111 additions and 1,898 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
@@ -1,6 +1,5 @@
 # Comfortaa
 
-
 Comfortaa is a rounded geometric sans-serif type design intended for large sizes. It is absolutely free, both for personal and commercial use.
 
 If you like it please visit my DeviantArt page and fav it (but obviously only if you like it.) You are also more than welcome to comment about anything you want (I'm open to critique). I obviously would love to see how my font is being used, so feel free to comment with a link to your work, or send me a message.
@@ -18,12 +17,29 @@ I hope you will enjoy using my font!
 * Overall design and spacing improvements
 * Expansion to GF Latin Plus, GF Cyrillic Plus
 
-### License
+## 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:
+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.
+
+
 ### Copyright
 
 Copyright (c) 2010, Johan Aakerlund ([email protected]),

diff --git a/fonts/OTF/Comfortaa-Bold.otf b/fonts/OTF/Comfortaa-Bold.otf
diff --git a/fonts/OTF/Comfortaa-Light.otf b/fonts/OTF/Comfortaa-Light.otf
diff --git a/fonts/OTF/Comfortaa-Regular.otf b/fonts/OTF/Comfortaa-Regular.otf
diff --git a/fonts/TTF/Comfortaa-Bold.ttf b/fonts/TTF/Comfortaa-Bold.ttf
diff --git a/fonts/TTF/Comfortaa-Light.ttf b/fonts/TTF/Comfortaa-Light.ttf
diff --git a/fonts/TTF/Comfortaa-Medium.ttf b/fonts/TTF/Comfortaa-Medium.ttf
diff --git a/fonts/TTF/Comfortaa-Regular.ttf b/fonts/TTF/Comfortaa-Regular.ttf
diff --git a/fonts/TTF/Comfortaa-SemiBold.ttf b/fonts/TTF/Comfortaa-SemiBold.ttf
diff --git a/fonts/TTF/Comfortaa-VF.ttf b/fonts/TTF/Comfortaa-VF.ttf
diff --git a/fonts/otf/Comfortaa-Medium.otf b/fonts/otf/Comfortaa-Medium.otf
diff --git a/fonts/otf/Comfortaa-SemiBold.otf b/fonts/otf/Comfortaa-SemiBold.otf
diff --git a/fonts/variable/Comfortaa[wght].ttf b/fonts/variable/Comfortaa[wght].ttf
diff --git a/fonts/webfonts/Comfortaa-Bold.woff2 b/fonts/webfonts/Comfortaa-Bold.woff2
diff --git a/fonts/webfonts/Comfortaa-Light.woff2 b/fonts/webfonts/Comfortaa-Light.woff2
diff --git a/fonts/webfonts/Comfortaa-Medium.woff2 b/fonts/webfonts/Comfortaa-Medium.woff2
diff --git a/fonts/webfonts/Comfortaa-Regular.woff2 b/fonts/webfonts/Comfortaa-Regular.woff2
diff --git a/fonts/webfonts/Comfortaa-SemiBold.woff2 b/fonts/webfonts/Comfortaa-SemiBold.woff2
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,3 @@
+fontmake>=2.4
+fontbakery>=0.7
+gftools>=0.7