Merge pull request #47 from aaronbell/master

Updating the repository to UFR
cyrealtype · Sep 23, 2021 · d855b7a · d855b7a
2 parents aa7bfd1 + ae37348
commit d855b7a
Show file tree

Hide file tree

Showing 4,045 changed files with 1,753 additions and 2,203 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 +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
@@ -35,8 +35,24 @@ Expansion to GF Cyrillic Plus, Pro, and locl has been completed by original auth
 
 Vietnamese glyphs were added by Nhung Nguyen @crystaltype
 
-### 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.
diff --git a/fonts/otf/Lora-Bold.otf b/fonts/otf/Lora-Bold.otf
diff --git a/fonts/otf/Lora-BoldItalic.otf b/fonts/otf/Lora-BoldItalic.otf
diff --git a/fonts/otf/Lora-Italic.otf b/fonts/otf/Lora-Italic.otf
diff --git a/fonts/otf/Lora-Medium.otf b/fonts/otf/Lora-Medium.otf
diff --git a/fonts/otf/Lora-MediumItalic.otf b/fonts/otf/Lora-MediumItalic.otf
diff --git a/fonts/otf/Lora-Regular.otf b/fonts/otf/Lora-Regular.otf
diff --git a/fonts/otf/Lora-SemiBold.otf b/fonts/otf/Lora-SemiBold.otf
diff --git a/fonts/otf/Lora-SemiBoldItalic.otf b/fonts/otf/Lora-SemiBoldItalic.otf
diff --git a/fonts/ttf/Lora-Bold.ttf b/fonts/ttf/Lora-Bold.ttf
diff --git a/fonts/ttf/Lora-BoldItalic.ttf b/fonts/ttf/Lora-BoldItalic.ttf
diff --git a/fonts/ttf/Lora-Italic.ttf b/fonts/ttf/Lora-Italic.ttf
diff --git a/fonts/ttf/Lora-Medium.ttf b/fonts/ttf/Lora-Medium.ttf
diff --git a/fonts/ttf/Lora-MediumItalic.ttf b/fonts/ttf/Lora-MediumItalic.ttf
diff --git a/fonts/ttf/Lora-Regular.ttf b/fonts/ttf/Lora-Regular.ttf
diff --git a/fonts/ttf/Lora-SemiBold.ttf b/fonts/ttf/Lora-SemiBold.ttf
diff --git a/fonts/ttf/Lora-SemiBoldItalic.ttf b/fonts/ttf/Lora-SemiBoldItalic.ttf
diff --git a/fonts/variable/Lora-Italic[wght].ttf b/fonts/variable/Lora-Italic[wght].ttf
diff --git a/fonts/variable/Lora[wght].ttf b/fonts/variable/Lora[wght].ttf
diff --git a/fonts/vf/Lora-Italic[wght].ttf b/fonts/vf/Lora-Italic[wght].ttf
diff --git a/fonts/vf/Lora[wght].ttf b/fonts/vf/Lora[wght].ttf
diff --git a/fonts/webfonts/Lora-Bold.woff2 b/fonts/webfonts/Lora-Bold.woff2
diff --git a/fonts/webfonts/Lora-BoldItalic.woff2 b/fonts/webfonts/Lora-BoldItalic.woff2
diff --git a/fonts/webfonts/Lora-Italic.woff2 b/fonts/webfonts/Lora-Italic.woff2
diff --git a/fonts/webfonts/Lora-Medium.woff2 b/fonts/webfonts/Lora-Medium.woff2
diff --git a/fonts/webfonts/Lora-MediumItalic.woff2 b/fonts/webfonts/Lora-MediumItalic.woff2
diff --git a/fonts/webfonts/Lora-Regular.woff2 b/fonts/webfonts/Lora-Regular.woff2
diff --git a/fonts/webfonts/Lora-SemiBold.woff2 b/fonts/webfonts/Lora-SemiBold.woff2
diff --git a/fonts/webfonts/Lora-SemiBoldItalic.woff2 b/fonts/webfonts/Lora-SemiBoldItalic.woff2
diff --git a/requirements.txt b/requirements.txt
@@ -1,57 +1,3 @@
-absl-py==0.9.0
-appdirs==1.4.3
-attrs==19.3.0
-beautifulsoup4==4.8.2
-booleanOperations==0.9.0
-certifi==2019.11.28
-chardet==3.0.4
-Click==7.0
-commandlines==0.4.1
-compreffor==0.5.0
-cu2qu==1.6.6
-defcon==0.6.0
-Deprecated==1.2.7
-Flask==1.1.1
-font-v==0.7.1
-fontbakery==0.7.17
-fontdiffenator==0.9.1
-fontmake==2.0.9
-fontMath==0.5.2
-fonttools==4.3.0
-freetype-py==2.1.0.post1
-fs==2.4.11
-gfdiffbrowsers==0.1.6
-gftools==0.3.1
-gitdb2==2.0.6
-GitPython==3.0.5
-glyphsLib==5.1.4
-idna==2.8
-itsdangerous==1.1.0
-Jinja2==2.11.1
-lxml==4.5.0
-MarkupSafe==1.1.1
-opentype-sanitizer==8.0.0.post2
-Pillow==7.0.0
-protobuf==3.11.3
-pybrowserstack-screenshots==0.1
-pycairo==1.19.0
-pyclipper==1.1.0.post3
-PyGithub==1.45
-PyJWT==1.7.1
-pytz==2019.3
-requests==2.22.0
-simplejson==3.17.0
-six==1.14.0
-smmap2==2.0.5
-soupsieve==1.9.5
-tabulate==0.8.6
-ttfautohint-py==0.4.3
-ufo2ft==2.11.1
-ufoLib2==0.5.1
-ufolint==0.4.1
-uharfbuzz==0.5.1.post2
-unicodedata2==12.1.0
-Unidecode==1.1.1
-urllib3==1.25.8
-Werkzeug==0.16.1
-wrapt==1.11.2
+fontmake>=2.4
+fontbakery>=0.7
+gftools>=0.7