Merge pull request #8 from aaronbell/master

Updating to UFR
Omnibus-Type · Aug 17, 2021 · d19a08b · d19a08b
2 parents 7b7863f + 7ca3821
commit d19a08b
Show file tree

Hide file tree

Showing 10,414 changed files with 46,045 additions and 339,251 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
@@ -0,0 +1,14 @@
+*~
+venv
+build.stamp
+proof
+
+# OS generated files #
+######################
+.DS_Store
+.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
@@ -22,11 +22,29 @@ To contribute to the project contact [Omnibus Type](http://omnibus-type.com/).
 
 * Héctor Gatti
 
-### 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
 
 Copyright (c) 2019, Omnibus-Type (www.omnibus-type.com | [email protected])
 
-Licensed under the [*SIL Open Font License, 1.1*](http://scripts.sil.org/OFL); you may not use this file except in compliance with the 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.
 
 ======
 ## FONTLOG for the Rosario fonts
@@ -41,19 +59,6 @@ Héctor Gatti. This is a new typeface of classic proportions,
 subtle contrast and soft endings. Carefully produced, 
 elegant, ideal for magazines and academic journals.
 
-### Building the fonts
-
-Fonts are built using [fontmake](https://github.com/googlei18n/fontmake) and [gftools](https://github.com/googlefonts/gftools). Execute the following commands in a CLI on Mac or Unix.
-
-```
-python3 -m venv venv
-source venv/bin/activate
-pip install -r requirements.txt
-cd sources
-sh build.sh
-
-```
-
 ### Rosario is a typeface family that supports Unicode language range: 
 
 * Basic Latin 			U+0020-U+007E

diff --git a/fonts/otf/Rosario-Bold.otf b/fonts/otf/Rosario-Bold.otf
diff --git a/fonts/otf/Rosario-BoldItalic.otf b/fonts/otf/Rosario-BoldItalic.otf
diff --git a/fonts/otf/Rosario-Italic.otf b/fonts/otf/Rosario-Italic.otf
diff --git a/fonts/otf/Rosario-Light.otf b/fonts/otf/Rosario-Light.otf
diff --git a/fonts/otf/Rosario-LightItalic.otf b/fonts/otf/Rosario-LightItalic.otf
diff --git a/fonts/otf/Rosario-Medium.otf b/fonts/otf/Rosario-Medium.otf
diff --git a/fonts/otf/Rosario-MediumItalic.otf b/fonts/otf/Rosario-MediumItalic.otf
diff --git a/fonts/otf/Rosario-Regular.otf b/fonts/otf/Rosario-Regular.otf
diff --git a/fonts/otf/Rosario-SemiBold.otf b/fonts/otf/Rosario-SemiBold.otf
diff --git a/fonts/otf/Rosario-SemiBoldItalic.otf b/fonts/otf/Rosario-SemiBoldItalic.otf
diff --git a/fonts/ttf/Rosario-Bold.ttf b/fonts/ttf/Rosario-Bold.ttf
diff --git a/fonts/ttf/Rosario-BoldItalic.ttf b/fonts/ttf/Rosario-BoldItalic.ttf
diff --git a/fonts/ttf/Rosario-Italic.ttf b/fonts/ttf/Rosario-Italic.ttf
diff --git a/fonts/ttf/Rosario-Light.ttf b/fonts/ttf/Rosario-Light.ttf
diff --git a/fonts/ttf/Rosario-LightItalic.ttf b/fonts/ttf/Rosario-LightItalic.ttf
diff --git a/fonts/ttf/Rosario-Medium.ttf b/fonts/ttf/Rosario-Medium.ttf
diff --git a/fonts/ttf/Rosario-MediumItalic.ttf b/fonts/ttf/Rosario-MediumItalic.ttf
diff --git a/fonts/ttf/Rosario-Regular.ttf b/fonts/ttf/Rosario-Regular.ttf
diff --git a/fonts/ttf/Rosario-SemiBold.ttf b/fonts/ttf/Rosario-SemiBold.ttf
diff --git a/fonts/ttf/Rosario-SemiBoldItalic.ttf b/fonts/ttf/Rosario-SemiBoldItalic.ttf
diff --git a/fonts/variable/Rosario-Italic[wght].ttf b/fonts/variable/Rosario-Italic[wght].ttf
diff --git a/fonts/variable/Rosario[wght].ttf b/fonts/variable/Rosario[wght].ttf
diff --git a/fonts/webfonts/Rosario-Bold.woff2 b/fonts/webfonts/Rosario-Bold.woff2
diff --git a/fonts/webfonts/Rosario-BoldItalic.woff2 b/fonts/webfonts/Rosario-BoldItalic.woff2
diff --git a/fonts/webfonts/Rosario-Italic.woff2 b/fonts/webfonts/Rosario-Italic.woff2
diff --git a/fonts/webfonts/Rosario-Light.woff2 b/fonts/webfonts/Rosario-Light.woff2
diff --git a/fonts/webfonts/Rosario-LightItalic.woff2 b/fonts/webfonts/Rosario-LightItalic.woff2
diff --git a/fonts/webfonts/Rosario-Medium.woff2 b/fonts/webfonts/Rosario-Medium.woff2
diff --git a/fonts/webfonts/Rosario-MediumItalic.woff2 b/fonts/webfonts/Rosario-MediumItalic.woff2
diff --git a/fonts/webfonts/Rosario-Regular.woff2 b/fonts/webfonts/Rosario-Regular.woff2
diff --git a/fonts/webfonts/Rosario-SemiBold.woff2 b/fonts/webfonts/Rosario-SemiBold.woff2
diff --git a/fonts/webfonts/Rosario-SemiBoldItalic.woff2 b/fonts/webfonts/Rosario-SemiBoldItalic.woff2
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,3 @@
-gftools
+fontmake>=2.4
+fontbakery>=0.7
+gftools>=0.7