Merge pull request #123 from uswds/develop

Release 1.007

CONTRIBUTING.md

@@ -1,18 +1,19 @@
 ## Welcome to Public Sans!
 
-We're so glad you're thinking about contributing to an 18F open source project! 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 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.
 
-Before contributing, we encourage you to read our CONTRIBUTING policy (you are here), our LICENSE, and our README, all of which should be in this repository. If you have any questions, or want to read more about our underlying policies, you can consult the 18F Open Source Policy GitHub repository at https://github.com/18f/open-source-policy, or just shoot us an email/official government letterhead note to [[email protected]](mailto:[email protected]).
+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).
 
-## SIL Open Font License v1.1
+## SIL Open Font License, Version 1.1
 
-Public Sans is licensed under the [SIL Open Font License v1.1](http://scripts.sil.org/OFL)
-To view the copyright and specific terms and conditions please refer to ofl.txt
+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)
 
-By submitting a pull request, you are agreeing to comply
-with this license.
+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.
+
+By submitting a pull request, you agree to comply with the terms and conditions of the SIL Open Font License, Version 1.1.
 
 ## Running the specimen site locally
+
 The specimen site runs on Jekyll and Node, powered by USWDS. The site-related files are distinct from the Public Sans source files and are kept in the following locations:
 
 ```
@@ -27,19 +28,25 @@ public-sans/
 ```
 
 ## Running code locally
+
 After cloning the repo, navigate to the correct folder and install USWDS, Jekyll, and any necessary dependencies using:
+
 ```
 npm start
 ```
+
 Then, to run the site locally:
+
 ```
 npm run serve
 ```
+
 If all goes well, visit the site at http://localhost:4000.
 
 USWDS assets are in `assets/uswds/fonts` and `assets/uswds/img`.
 
 SASS files are kept in the `/_sass` directory. To watch for changes and recompile the styles, run:
+
 ```
 npm run watch
 ```

FONTLOG.txt

@@ -10,7 +10,114 @@ Basic Font Information
 Public Sans is based off of Libre Franklin
 Libre Franklin is an interpretation and expancion based on the 1912 Morris Fuller Benton’s classic.
 
-To contribute to the Libre Franklin project contact Pablo Impallari at https://github.com/impallari/Libre-Franklin/
+To contribute to Public Sans please read [CONTRIBUTING.md](https://github.com/uswds/public-sans/blob/master/CONTRIBUTING.md).
+
+See [the Public Sans releases page](https://github.com/uswds/public-sans/releases) for more details about changes to the typeface.
+
+November 13 2019 (USWDS) Public Sans v1.007
+- https://github.com/uswds/public-sans/releases/tag/v1.007
+
+General
+- Rewrite type test to better test unusual combinations
+- Remove AFM files for simplicity
+- Rename `fonts` to `binaries`
+- Keep UFOs and designspace files in `src`
+- Move Glyphs files to `src/glyphs`
+- Update test strings
+- Add Google Analytics code to site
+- Update dependencies
+- Remediate package vulnerabilities in `gulp-notify`
+- Normalized sidebearings to multiples of 5
+- Used sidebearing groups more consistently
+- Update and clarify Public Sans license
+
+Metadata
+- Update description
+- Remove trademark metadata
+- Update copyright and designer information
+
+Metrics changes
+- Changed ascender height to 1900
+
+| Parameter | v1.006 | v1.007
+| --- | --- | ---
+| Ascender | 2000 | 1900
+| typoAscender | 2000 | 1900
+| hheaAscender | 2000 | 1900
+
+Kerning and spacing
+- Improve `Æ` spacing
+- Improve kerning of the following: `s`|`s`, `t`|`t`, `g`|`g`, `r`|`g`, `E`|`t`, `V`|[`a`,`e`], `R`|`e`, 'P'|'e'
+- Fix spacing around U
+- Set width of the colonsign.tf to 1400
+- Use 600 width for tf punctuation
+- Rebalance roman tabular figures
+- Use components for .tf numbers and rebalance
+
+Glyphs
+- Widen `H`
+- Redraw `Þ`
+- Add and synchronize italic tabular figs
+- Add currency to tabular figures
+- Align diacritics
+- Fix faulty dot accents
+- Fix italic `i`
+- Square terminals and regularize shapes in `s`,`e`,`c`
+- Update italic `æ` and `Æ`
+- Update italic `œ` and `Œ`
+
+July 17 2019 (USWDS) Public Sans v1.006
+- https://github.com/uswds/public-sans/releases/tag/v1.006
+- Adds a new python-based build script for generating webfonts and variable fonts. Use /.build.sh from the project directory. Based on https://github.com/thundernixon/googlefonts-qa-template/blob/master/sources/build.sh
+- Moves to 2000 UPM
+- Adjusts kerning overall
+- Improves vertical metrics
+- Rounds counters in b, d, p, and q glyphs
+- Widens o and e glyphs
+- Narrows s glyph
+- Slightly squares curves in rounded lowercase thin glyphs
+- Squares counters on S and C glyphs
+- Aligns C and G glyph upper terminals
+- Improves output of variable fonts
+- Outputs better binaries for Font Bakery (https://github.com/googlefonts/fontbakery)
+
+June 6 2019 (USWDS) Public Sans v1.005
+- https://github.com/uswds/public-sans/releases/tag/v1.005
+- Redraws eth character
+- Improves Vietnamese diacritics with better positioning and shape
+- Fixes bad masters that resulted in faulty interpolation in fractions and some math characters
+- Improves spacing of caron.alt–related glyphs
+
+June 3 2019 (USWDS) Public Sans v1.004
+- https://github.com/uswds/public-sans/releases/tag/v1.004
+- Improved kerning
+- Improved hinting and rendering on Windows
+- Improved fractions and subscript/superscript numerals
+- Improved spacing for hyphens and em/en dashes
+- Fixes the colón character
+
+May 7 2019 (USWDS) Public Sans v1.003
+- https://github.com/uswds/public-sans/releases/tag/v1.003
+- Address some spacing regressions in v1.002
+- Thicken regular weight to 365 from 350
+- Adds explicit underline metadata to address a rendering quirk in Firefox
+
+May 6 2019 (USWDS) Public Sans v1.002
+- https://github.com/uswds/public-sans/releases/tag/v1.002
+- This release tries to simplify the kerning and spacing and make both easier to maintain. There may be some small spacing regressions as we evaluate this version in production and continue to update.
+- Added 'okina character
+- Improved appearance and spacing of diacritic glyphs — especially Czech, Slovak, and Vietnamese
+- Improved consistency between roman and italic
+- Upscaled to 2000 UPM
+- Use 100-900 as range for variable font output
+- Rebalanced numbers
+- Improved kerning in fractions
+- Corrected some spacing issues in tabular figures, especially in italic tabular figures
+- Adjusted position of hcircumflex
+- Removed spur from eszett
+- Simplified spacing and kerning
+- Updated and made better use of sidebearing groups
+- Updated and made better use of kerning groups
 
 October 5 2018 (Dan O. Williams) Public Sans v1.000
 - Release Public Sans as part of USWDS 2.0.0 Beta

LICENSE.md

@@ -0,0 +1,115 @@
+This repository is a fork of Libre Franklin: https://github.com/impallari/Libre-Franklin
+
+## License for USWDS’s Modified Version
+
+This repository contains both the original font software for Libre Franklin (the “Original Version”) and font software modifications made by the General Services Administration (GSA). This repository combines the Original Version and these GSA modifications into a piece of font software called Public Sans, which is a “Modified Version” of Libre Franklin.
+
+As a work of the United States Government, the font software modifications made by GSA are not subject to copyright within the United States. Additionally, GSA waives copyright and related rights in its font software modifications worldwide through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
+
+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.
+
+**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.
+
+## 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)
+
+## Libre Franklin SIL Open Font License, Version 1.1
+
+Copyright (c) 2015, Impallari Type (www.impallari.com)
+
+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
+
+```
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+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,
+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
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+```

README.md

@@ -1,14 +1,17 @@
 # Public Sans
+
 Current font files for the Public Sans typeface.
 This typeface is based off of https://github.com/impallari/Libre-Franklin
 
 ## Usage
-- **Webfonts** are available in `fonts/webfonts`
-- **Opentype** fonts for installing locally and for print applications are available in `fonts/otf`
-- **Variable fonts** should be considered experimental, but can be found in  `fonts/variable`
-- **Source files** are available in `source` as [Glyphs](https://glyphsapp.com/) files.
+
+- **Webfonts** are available in `binaries/webfonts`
+- **Opentype** fonts for installing locally and for print applications are available in `binaries/otf`
+- **Variable fonts** should be considered experimental, but can be found in `binaries/variable`
+- **Source files** are available in `src` as both [Glyphs](https://glyphsapp.com/) files and as UFO + Designspace.
 
 ## 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.
@@ -20,6 +23,7 @@ This typeface is based off of https://github.com/impallari/Libre-Franklin
 - Encourage continuous improvement — strive to be better, not necessarily perfect.
 
 ## How Public Sans differs from Libre Franklin
+
 Public Sans is a fork of the SIL Open Licensed face Libre Franklin. Public Sans has many similarities with its parent, but differs enough in its particulars that its effect is distinct.
 
 ![sample text](https://raw.githubusercontent.com/uswds/public-sans/master/site/examples/public-sans-featured-images/public-overlay-libre-franklin.png)
@@ -55,6 +59,7 @@ Public Sans is a fork of the SIL Open Licensed face Libre Franklin. Public Sans
 Overall, Public Sans differs from Libre Franklin in its focus on longform reading and neutral UI applicability. It takes inspiration from geometric sans faces of the 20th century, as well as the original Franklins of the 19th, resulting in something of a mongrel face that retains its American origin.
 
 ## Public Sans and comparable sans-serif faces
+
 Public Sans is designed to be a progressive enhancement webfont, and to work well with Apple and Google system fonts as the base in its font stack. It's designed to have metrics most similar to SF Pro Text (the Apple system font) and to fall somewhere between SF Pro Text and Roboto (the Google system font) in its overall size and appearance. If a user's machine does not display webfonts, sites designed with Public Sans should appear close to the designer's intention.
 
 Public Sans is a good option for sites that currently use Open Sans, Tahoma, Libre Franklin, Arial, or Helvetica.
@@ -72,8 +77,11 @@ Public Sans is a good option for sites that currently use Open Sans, Tahoma, Lib
 ## Additional features
 
 ##### Tabular figures (monospaced numerals)
+
 ![squared](https://raw.githubusercontent.com/uswds/public-sans/master/site/examples/public-sans-featured-images/public-numerals.png)
 
 ## License
-- Public Sans is licensed under the SIL Open Font License v1.1 (https://opensource.org/licenses/OFL-1.1)
-- To view the copyright and specific terms and conditions please refer to ofl.txt
+
+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.