Merge pull request #22 from aaronbell/main

Updating to UFR format, and fixing STAT tables
googlefonts · Jul 29, 2021 · bf6907e · bf6907e
2 parents 132fdfd + 0155741
commit bf6907e
Show file tree

Hide file tree

Showing 56 changed files with 221 additions and 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,7 +1,14 @@
-# file manager empty files
+*~
+venv
+build.stamp
+proof
+
+# OS generated files #
+######################
 .DS_Store
-.empty
-.sparkleshare
-# font editor temporary files
-*(Autosaved).glyphs
-*.vfbak
+.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/OFL.txt b/OFL.txt
@@ -1,4 +1,4 @@
-Copyright 2010 The Josefin Sans Project Authors (hi@typemade.mx), with Reserved Font Name "Josefin Sans".
+Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name "Josefin Sans".
 
 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:
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
+fonts, including any derivative works, can be bundled, embedded, 
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The

diff --git a/README.md b/README.md
@@ -21,6 +21,24 @@ by Santiago Orozco
 
 This project is a fork from the old Google font repository.
 
+## 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
+
 # Completed tasks:
 
 * Create Repository.

diff --git a/TRADEMARKS.md b/TRADEMARKS.md
@@ -1 +1,2 @@
 Josefin Sans is a trademark of Typemade.
+Demo is a trademark of FontStudio, Inc.
diff --git a/fonts/otf/JosefinSans-Bold.otf b/fonts/otf/JosefinSans-Bold.otf
diff --git a/fonts/otf/JosefinSans-BoldItalic.otf b/fonts/otf/JosefinSans-BoldItalic.otf
diff --git a/fonts/otf/JosefinSans-ExtraLight.otf b/fonts/otf/JosefinSans-ExtraLight.otf
diff --git a/fonts/otf/JosefinSans-ExtraLightItalic.otf b/fonts/otf/JosefinSans-ExtraLightItalic.otf
diff --git a/fonts/otf/JosefinSans-Italic.otf b/fonts/otf/JosefinSans-Italic.otf
diff --git a/fonts/otf/JosefinSans-Light.otf b/fonts/otf/JosefinSans-Light.otf
diff --git a/fonts/otf/JosefinSans-LightItalic.otf b/fonts/otf/JosefinSans-LightItalic.otf
diff --git a/fonts/otf/JosefinSans-Medium.otf b/fonts/otf/JosefinSans-Medium.otf
diff --git a/fonts/otf/JosefinSans-MediumItalic.otf b/fonts/otf/JosefinSans-MediumItalic.otf
diff --git a/fonts/otf/JosefinSans-Regular.otf b/fonts/otf/JosefinSans-Regular.otf
diff --git a/fonts/otf/JosefinSans-SemiBold.otf b/fonts/otf/JosefinSans-SemiBold.otf
diff --git a/fonts/otf/JosefinSans-SemiBoldItalic.otf b/fonts/otf/JosefinSans-SemiBoldItalic.otf
diff --git a/fonts/otf/JosefinSans-Thin.otf b/fonts/otf/JosefinSans-Thin.otf
diff --git a/fonts/otf/JosefinSans-ThinItalic.otf b/fonts/otf/JosefinSans-ThinItalic.otf
diff --git a/fonts/ttf/JosefinSans-Bold.ttf b/fonts/ttf/JosefinSans-Bold.ttf
diff --git a/fonts/ttf/JosefinSans-BoldItalic.ttf b/fonts/ttf/JosefinSans-BoldItalic.ttf
diff --git a/fonts/ttf/JosefinSans-ExtraLight.ttf b/fonts/ttf/JosefinSans-ExtraLight.ttf
diff --git a/fonts/ttf/JosefinSans-ExtraLightItalic.ttf b/fonts/ttf/JosefinSans-ExtraLightItalic.ttf
diff --git a/fonts/ttf/JosefinSans-Italic.ttf b/fonts/ttf/JosefinSans-Italic.ttf
diff --git a/fonts/ttf/JosefinSans-Light.ttf b/fonts/ttf/JosefinSans-Light.ttf
diff --git a/fonts/ttf/JosefinSans-LightItalic.ttf b/fonts/ttf/JosefinSans-LightItalic.ttf
diff --git a/fonts/ttf/JosefinSans-Medium.ttf b/fonts/ttf/JosefinSans-Medium.ttf
diff --git a/fonts/ttf/JosefinSans-MediumItalic.ttf b/fonts/ttf/JosefinSans-MediumItalic.ttf
diff --git a/fonts/ttf/JosefinSans-Regular.ttf b/fonts/ttf/JosefinSans-Regular.ttf
diff --git a/fonts/ttf/JosefinSans-SemiBold.ttf b/fonts/ttf/JosefinSans-SemiBold.ttf
diff --git a/fonts/ttf/JosefinSans-SemiBoldItalic.ttf b/fonts/ttf/JosefinSans-SemiBoldItalic.ttf
diff --git a/fonts/ttf/JosefinSans-Thin.ttf b/fonts/ttf/JosefinSans-Thin.ttf
diff --git a/fonts/ttf/JosefinSans-ThinItalic.ttf b/fonts/ttf/JosefinSans-ThinItalic.ttf
diff --git a/fonts/vf/JosefinSans-Italic[wght].ttf → fonts/variable/JosefinSans-Italic[wght].ttf b/fonts/vf/JosefinSans-Italic[wght].ttf → fonts/variable/JosefinSans-Italic[wght].ttf
diff --git a/fonts/vf/JosefinSans[wght].ttf → fonts/variable/JosefinSans[wght].ttf b/fonts/vf/JosefinSans[wght].ttf → fonts/variable/JosefinSans[wght].ttf
diff --git a/fonts/webfonts/JosefinSans-Bold.woff2 b/fonts/webfonts/JosefinSans-Bold.woff2
diff --git a/fonts/webfonts/JosefinSans-BoldItalic.woff2 b/fonts/webfonts/JosefinSans-BoldItalic.woff2
diff --git a/fonts/webfonts/JosefinSans-ExtraLight.woff2 b/fonts/webfonts/JosefinSans-ExtraLight.woff2
diff --git a/fonts/webfonts/JosefinSans-ExtraLightItalic.woff2 b/fonts/webfonts/JosefinSans-ExtraLightItalic.woff2
diff --git a/fonts/webfonts/JosefinSans-Italic.woff2 b/fonts/webfonts/JosefinSans-Italic.woff2
diff --git a/fonts/webfonts/JosefinSans-Light.woff2 b/fonts/webfonts/JosefinSans-Light.woff2
diff --git a/fonts/webfonts/JosefinSans-LightItalic.woff2 b/fonts/webfonts/JosefinSans-LightItalic.woff2
diff --git a/fonts/webfonts/JosefinSans-Medium.woff2 b/fonts/webfonts/JosefinSans-Medium.woff2
diff --git a/fonts/webfonts/JosefinSans-MediumItalic.woff2 b/fonts/webfonts/JosefinSans-MediumItalic.woff2
diff --git a/fonts/webfonts/JosefinSans-Regular.woff2 b/fonts/webfonts/JosefinSans-Regular.woff2
diff --git a/fonts/webfonts/JosefinSans-SemiBold.woff2 b/fonts/webfonts/JosefinSans-SemiBold.woff2
diff --git a/fonts/webfonts/JosefinSans-SemiBoldItalic.woff2 b/fonts/webfonts/JosefinSans-SemiBoldItalic.woff2
diff --git a/fonts/webfonts/JosefinSans-Thin.woff2 b/fonts/webfonts/JosefinSans-Thin.woff2
diff --git a/fonts/webfonts/JosefinSans-ThinItalic.woff2 b/fonts/webfonts/JosefinSans-ThinItalic.woff2
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,3 @@
+fontmake>=2.4
+fontbakery>=0.7
+gftools>=0.7
diff --git a/sources/JosefinSans-BoldItalic.ufo/fontinfo.plist b/sources/JosefinSans-BoldItalic.ufo/fontinfo.plist
@@ -91,7 +91,7 @@
     <key>postscriptUnderlineThickness</key>
     <integer>50</integer>
     <key>styleMapFamilyName</key>
-    <string>Josefin Sans Bold</string>
+    <string>Josefin Sans</string>
     <key>styleMapStyleName</key>
     <string>bold italic</string>
     <key>styleName</key>