Merge pull request #218 from uswds/dw-stage-2.000

Public Sans v2.000

.gitignore

@@ -13,13 +13,15 @@ Temporary Items
 .Spotlight-V100
 /source/other/type-tester/Document fonts/
 *.idlk
-Public-Sans (Autosaved).glyphs
-Public-Sans-italics (Autosaved).glyphs
+*(Autosaved)*
 node_modules
 _site
 site/assets/uswds
 site/assets/fonts
 site/assets/css
-env
 report.json
-.jekyll-cache
+.jekyll-cache
+.venv
+instance_ufo
+master_ufo
+false/_logs

.nvmrc

@@ -1 +1 @@
-14.15.1
+14

.python-version

@@ -0,0 +1 @@
+3.8.11

AUTHORS.txt

@@ -0,0 +1,10 @@
+# This is the official list of project authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS.txt file.
+# See the latter for an explanation.
+#
+# Names should be added to this file as:
+# Name or Organization <email address>
+
+Pablo Impallari <[email protected]>
+Rodrigo Fuenzalida <[email protected]>
+Google LLC

CONTRIBUTING.md

@@ -1,16 +1,56 @@
-## Welcome to Public Sans!
+# Contributing to Public Sans
 
-We're so glad you're thinking about contributing! If you're unsure or afraid of anything, just ask or submit the issue or pull request anyways. The worst that can happen is that you'll be politely asked to change something. We appreciate any sort of contribution, and don't want a wall of rules to get in the way of that.
+We're so glad you're thinking about contributing! If you're unsure or afraid of anything, just ask or submit the issue or pull request. The worst that can happen is that you'll be politely asked to change something. We appreciate any sort of contribution, and don't want a wall of rules to get in the way of that.
 
 Before contributing, we encourage you to read our CONTRIBUTING policy (you are here), our [LICENSE](https://github.com/uswds/public-sans/blob/master/LICENSE.md), and our [README](https://github.com/uswds/public-sans/blob/master/README.md).
 
+## Contribution guidelines
+
+Public Sans is a principles-driven open source typeface, maintained by the General Services Administration (GSA). We encourage contributions consistent with the project's design principles:
+
+-   Be available as a free, open source webfont on any platform.
+-   Use metrics similar to common system fonts for smoother progressive enhancement.
+-   Have a broad range of weights and a good italic.
+-   Perform well in headlines, text, and UI.
+-   Be straightforward: have as few quirks as possible.
+-   Have good multilingual support.
+-   Allow for good data design with tabular figures.
+-   Be strong and neutral.
+-   Encourage continuous improvement — strive to be better, not necessarily perfect.
+
+We accept pull requests that improve Public Sans and are in the service of these design principles. We review all contributions for code quality and consistency and we may reject contributions that do not meet our standards for code quality or conform to our design principles. In addition a stylistic evaluation for consistency with these design principles, we will also evaluate all contributions for the following aspects of code quality:
+
+-   Compiles without errors
+-   Passes code scanning and continuous integration tests
+-   Is legible and understandable
+-   Is consistent with the existing codebase
+
+Any contributors will be responsible for updating `AUTHORS.txt` and `CONTRIBUTORS.txt` as necessary. We'll review these files as part of the code review process.
+
+[`AUTHORS.txt`](https://github.com/uswds/public-sans/blob/master/AUTHORS.txt) is the official list of project authors for copyright purposes.
+
+[`CONTRIBUTORS.txt`](https://github.com/uswds/public-sans/blob/master/CONTRIBUTORS.txt) is the list of people who have contributed to this project, and includes those not listed in `AUTHORS.txt` because they are not copyright authors. For example, company employees may be listed here because their company holds the copyright and is listed in `AUTHORS.txt`.
+
+We may request changes from the author for any contributions that do not pass this evaluation. Contributions that do not pass this evaluation may be rejected. If you're unsure about anything, just ask.
+
 ## SIL Open Font License, Version 1.1
 
 Public Sans is licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web)
 
-License of USWDS’s Modified Version is based on the [Libre Franklin SIL Open Font License, Version 1.1](https://github.com/uswds/public-sans/blob/master/LICENSE.md#libre-franklin-sil-open-font-license-11) section of [LICENSE.md](https://github.com/uswds/public-sans/blob/master/LICENSE.md). The terms and conditions for modifications made to the original font by USWDS in the USWDS Modified Version can be found at https://github.com/uswds/public-sans/blob/master/LICENSE.md.
+License of USWDS’s Modified Version is based on the [SIL Open Font License, Version 1.1](https://github.com/uswds/public-sans/blob/master/LICENSE.md#sil-open-font-license-version-11) section of [LICENSE.md](https://github.com/uswds/public-sans/blob/master/LICENSE.md). The terms and conditions for modifications made to the original font by USWDS in the USWDS Modified Version can be found at https://github.com/uswds/public-sans/blob/master/LICENSE.md.
+
+By submitting a pull request, you agree to comply with the terms and conditions of the SIL Open Font License, Version 1.1. 
+
+Public Sans is a GSA project. While GSA's contributions are not subject to copyright in the United States, contributors must license new contributions and derivative works under the SIL Open Font License, Version 1.1, as required under Section 5 of the SIL Open Font License, Version 1.1.
+
+## Building the Font
 
-By submitting a pull request, you agree to comply with the terms and conditions of the SIL Open Font License, Version 1.1.
+This package has been updated to use [Python 3](https://www.python.org/downloads/) and [Docker](https://www.docker.com/get-started). You'll need to install Docker to run the build script and build the font. Docker will take care of all the Python dependencies.
+
+### Run build
+```sh
+npm run build
+```
 
 ## Running the specimen site locally
 
@@ -24,7 +64,6 @@ public-sans/
 ├── _sass/
 ├── pages/
 └── assets/
-
 ```
 
 ## Running code locally

CONTRIBUTORS.txt

@@ -0,0 +1,14 @@
+# This is the list of people who have contributed to this project,
+# and includes those not listed in AUTHORS.txt because they are not
+# copyright authors. For example, company employees may be listed
+# here because their company holds the copyright and is listed there.
+#
+# When adding J Random Contributor's name to this file, either J's
+# name or J's organization's name should be added to AUTHORS.txt
+#
+# Names should be added to this file as:
+# Name <email address>
+
+Rosalie Wagner <[email protected]>
+Dan O. Williams <[email protected]>
+United States Web Design System

DESCRIPTION.en_us.html

@@ -0,0 +1,3 @@
+<p>A strong, neutral typeface for interfaces, text, and headings.</p>
+
+<p>Developed by the <a href="https://designsystem.digital.gov/">United States Web Design System</a> and based on Libre Franklin. Contribute to the development of Public Sans on <a href="https://github.com/uswds/public-sans">GitHub</a>.</p>

Dockerfile

@@ -0,0 +1,22 @@
+# pull official base image
+FROM python:3.8.11-slim
+
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+
+RUN apt-get update && apt-get install git rsync make g++ ttfautohint libz-dev -y
+
+RUN git clone --recursive https://github.com/google/woff2.git woff2 \
+    && cd woff2 \
+    && make
+
+RUN git clone --recursive https://github.com/bramstein/sfnt2woff-zopfli.git \
+    && cd sfnt2woff-zopfli \
+    && make
+
+ENV PATH "${PATH}:/sfnt2woff-zopfli:/woff2"
+
+WORKDIR /public_sans
+
+# run
+CMD [ "./sources/build-font.sh" ]

FONTLOG.txt

@@ -14,6 +14,59 @@ To contribute to Public Sans please read [CONTRIBUTING.md](https://github.com/us
 
 See [the Public Sans releases page](https://github.com/uswds/public-sans/releases) for more details about changes to the typeface.
 
+November 1 2021 Public Sans v2.000
+- https://github.com/uswds/public-sans/releases/tag/v2.000
+
+General
+- Rename `PublicSans-italics` → `PublicSans-Italic`
+- Fixed language feature encoding
+- Update to 2.000
+
+Glyphs
+- Modified `eth` contours
+- Adjusted curves of `S` and `Thorn`
+- Corrected 
+  - `Eng`, `eng`
+  - `Ldot`, '`ldot`
+  - `Tbar`, `tbar`
+  - `gcommaaccent`
+- Removed unnecessary anchors
+- Decomposed and transformed components
+- Corrected dot accent position in thin masters
+- Slightly shifted position of `acute` and `grave`
+- Adjusted percent and perthousand
+- Corrected positon of `caron.alt`
+- Added caret anchors
+- Corrected Naira currency
+- Decomposed nested components
+- Corrected kerning group inconsistencies in caps and lowercases
+- Corrected position of `breve_hookabove`
+- Adjusted alignment zones
+- Renamed narrow acutecomb variants `acutecomb.001` → `acutecomb.narrow`
+- Added `gravecomb.narrow`
+- Fixed contour directons
+- Added `_ringacute` in `aringacute` italic, decomposed and merged `_ringacute`
+- Decomposed overlapping components
+
+Structure
+- Renames `/src` directory to `/sources`, which includes the build script and the Glyphs sources
+- Renames `/binaries` directory to `/fonts` adding TTF fonts as a `/fonts/ttf` directory separate from webfonts
+- Adds `AUTHORS.txt` for copyright-holding authors
+- Adds `CONTRIBUTORS.txt` for contributors who are not copyright authors
+- Adds explicit description file
+- Adds `requirements.txt` for python 3.x `pip3 install -r requirements.txt`
+- Moves old version binaries to an `/old` directory
+- Removes dash from `Public-Sans` in source files → `PublicSans`
+
+Build
+- Add weight class fix in build script
+- Added new fontbakery tools to `requirements.txt` and build script
+- Uses new locations
+- Removes autohinting
+- Updates build process to build with Docker
+- Adds gftools gen-stat to the build process, as well as a stat.yaml file
+
+
 January 8 2020 (USWDS) Public Sans v1.008
 - https://github.com/uswds/public-sans/releases/tag/v1.008
 

Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem "jekyll", ">= 3.8.5"
+gem "jekyll", ">= 4.1.1"
 gem "thin"

Gemfile.lock

@@ -1,70 +1,74 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     daemons (1.3.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.10.0)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (4.1.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+      terminal-table (~> 1.8)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rack (2.0.8)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.3.0)
-    ruby_dep (1.5.0)
+    rexml (3.2.5)
+    rouge (3.22.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (>= 3.8.5)
+  jekyll (>= 4.1.1)
   thin
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

LICENSE.md

@@ -8,18 +8,18 @@ As a work of the United States Government, the font software modifications made
 
 The Original Version (as defined in the SIL Open Font License, Version 1.1) remains subject to copyright under the SIL Open Font License, Version 1.1.
 
-This Modified Version (Public Sans) contains both software under the SIL Open Font License, Version 1.1 and software modifications by GSA released as CC0. It is a “joint work” made of the original software and modifications combined into a single work.
+This Modified Version (Public Sans) contains both software under the SIL Open Font License, Version 1.1 and software modifications by GSA released as CC0. As a work of the United States Government, the software modifications made by GSA are not subject to copyright within the United States. Additionally, GSA waives copyright and related rights in its software modifications worldwide through the [CC0 1.0 Universal Public Domain Dedication](https://creativecommons.org/publicdomain/zero/1.0/). It is a “joint work” made of the original software and modifications combined into a single work.
 
-**In practice, users of this Modified Version (Public Sans) should use Public Sans according to the terms of the SIL Open Font License, Version 1.1.** This is because this font is a combination of work subject to copyright and work not subject to copyright, so the more restrictive requirements apply to using the combined work.
+**In practice, users of this Modified Version (Public Sans) should use Public Sans according to the terms of the SIL Open Font License, Version 1.1, below.** This is because this font is a combination of work subject to copyright and work not subject to copyright, so the more restrictive requirements apply to using the combined work.
 
 ## License of project USWDS’s Modified Version is based on
 
 - Libre Franklin is licensed under the SIL Open Font License, Version 1.1 (<http://scripts.sil.org/OFL>)
-- To view the copyright and specific terms and conditions please refer to [OFL.txt](https://github.com/impallari/Libre-Franklin/blob/master/OFL.txt)
+- To view the copyright and specific terms and conditions of Libre Franklin, please refer to [OFL.txt](https://github.com/impallari/Libre-Franklin/blob/master/OFL.txt)
 
-## Libre Franklin SIL Open Font License, Version 1.1
+## SIL Open Font License, Version 1.1
 
-Copyright (c) 2015, Impallari Type (www.impallari.com)
+Copyright 2015 The Public Sans Project Authors (https://github.com/uswds/public-sans)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.