Merge pull request #49 from RedHatOfficial/update-1.023

Update 1.023

AUTHORS.txt

@@ -0,0 +1,9 @@
+# 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> 
+
+MCKL
+Jeremy Mickel <[email protected]>

OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2021 The Red Hat Project Authors (https://github.com/RedHatOfficial/RedHatFont)
+
+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:
+https://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

@@ -20,9 +20,11 @@ As part of Red Hat’s commitment to open source software, the fonts are made av
 
 ## Variable Fonts
 
+ A demo for variable fonts is available at [https://redhatofficial.github.io/RedHatFont/](https://redhatofficial.github.io/RedHatFont/).
+
 Variable fonts are available for each of the Red Hat Typeface families. The fonts include the `wght` axis, which allows for interpolation between light and black weights.
 
-A demo for variable fonts is available at [https://redhatofficial.github.io/RedHatFont/](https://redhatofficial.github.io/RedHatFont/).
+There are two versions of the variable fonts: with and without VF in the name. It is Red Hat's preference to name these differently than the OTF / TTF fonts, but Google requires the names to be the same. We recommend using ***either*** the VF or standard named variable fonts, but not both.
 
 ## Building the Fonts
 
@@ -80,6 +82,7 @@ Give the build scripts permission to run/execute (you can copy & paste, then run
 
 ```bash
 chmod +x build-scripts/*.sh
+chmod +x mastering/make-github-release/**/*.sh
 ```
 
 **Making woff2 files**
@@ -112,19 +115,19 @@ Once you have set up the environment (see above), you can build fonts & prep rel
 To build variable and static fonts, plus make woff2s, use `build-all.sh`. This takes awhile (most of the time is taken up by building TTF & OTF static fonts).
 
 ```bash
-./build-all.sh
+build-scripts/build-all.sh
 ```
 
 If you just want to build variable fonts, use `build.sh`:
 
 ```bash
-./build-scripts/build-vf.sh
+build-scripts/build-vf.sh
 ```
 
 To build only the static fonts (these are secondary to the variable fonts, so you can’t set the version numbers in this script), use `build-statics.sh`:
 
 ```bash
-./build-scripts/build-statics.sh
+build-scripts/build-statics.sh
 ```
 
 ## Installation

build-all.sh

@@ -17,3 +17,15 @@ build-scripts/build-vf.sh $version
 build-scripts/build-statics.sh 
 
 build-scripts/make-woff2s.sh
+
+echo "bump up version"
+gftools update-version ./fonts/proportional/RedHatDisplay-Italic\[wght\].ttf ./fonts/proportional/RedHatDisplay\[wght\].ttf ./fonts/proportional/RedHatText-Italic\[wght\].ttf ./fonts/proportional/RedHatText\[wght\].ttf ./fonts/mono/RedHatMono-Italic\[wght\].ttf ./fonts/mono/RedHatMono\[wght\].ttf 1.010 1.021
+
+mv -f ./fonts/proportional/RedHatDisplay-Italic\[wght\].ttf.fix ./fonts/proportional/RedHatDisplay-Italic\[wght\].ttf
+mv -f ./fonts/proportional/RedHatDisplay\[wght\].ttf.fix ./fonts/proportional/RedHatDisplay\[wght\].ttf
+mv -f ./fonts/proportional/RedHatText-Italic\[wght\].ttf.fix ./fonts/proportional/RedHatText-Italic\[wght\].ttf
+mv -f ./fonts/proportional/RedHatText\[wght\].ttf.fix ./fonts/proportional/RedHatText\[wght\].ttf
+mv -f ./fonts/mono/RedHatMono-Italic\[wght\].ttf.fix ./fonts/mono/RedHatMono-Italic\[wght\].ttf
+mv -f ./fonts/mono/RedHatMono\[wght\].ttf.fix ./fonts/mono/RedHatMono\[wght\].ttf
+
+echo "Complete"

build-scripts/build-modified-vf.sh

@@ -13,20 +13,27 @@ set -e
 ## ------------------------------------------------------------------
 ## Variable Fonts Build - Static build is at sources/build-statics.sh
 
-echo "Generating VFs modified for RedHat.com"
+echo "Generating modified VFs"
 mkdir -p fonts/mono/
 mkdir -p fonts/proportional/
 
 # Mono fonts are _not_ modified for RedHat.com.
 fontmake -m source/Mono/VF/RedHatMonoVF.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMonoVF.ttf
 fontmake -m source/Mono/VF/RedHatMonoVFItalic.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMonoVF-Italic.ttf
+fontmake -m source/Mono/RedHatMonoVF.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMono.ttf
+fontmake -m source/Mono/RedHatMonoVFItalic.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMono-Italic.ttf
 #split the mono out and put it in fonts/mono/
 
 #split the proportional out and put them in fonts/proportional
-fontmake -m source/Proportional/VF/Modified-RedHatTextVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVFModified.ttf
-fontmake -m source/Proportional/VF/Modified-RedHatTextItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVF-ItalicModified.ttf
-fontmake -m source/Proportional/VF/Modified-RedHatDisplayVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVFModified.ttf
-fontmake -m source/Proportional/VF/Modified-RedHatDisplayItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVF-ItalicModified.ttf
+fontmake -m source/Proportional/VF/RedHatTextVF-modified.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVFModified.ttf
+fontmake -m source/Proportional/VF/RedHatTextItalicVF-modified.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVF-ItalicModified.ttf
+fontmake -m source/Proportional/VF/RedHatDisplayVF-modified.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVFModified.ttf
+fontmake -m source/Proportional/VF/RedHatDisplayItalicVF-modified.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVF-ItalicModified.ttf
+
+fontmake -m source/Proportional/RedHatTextVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatText[wght].ttf
+fontmake -m source/Proportional/RedHatTextItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatText-Italic[wght].ttf
+fontmake -m source/Proportional/RedHatDisplayVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplay[wght].ttf
+fontmake -m source/Proportional/RedHatDisplayItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplay-Italic[wght].ttf
 
 
 
@@ -68,6 +75,9 @@ echo "Add STAT table"
 python mastering/gen_stat_mono.py
 python mastering/gen_stat_text.py
 python mastering/gen_stat_disp.py
+python mastering/gen_stat_monoVF.py
+python mastering/gen_stat_textVF.py
+python mastering/gen_stat_dispVF.py
 
 echo "stat add complete"
 
@@ -143,6 +153,6 @@ rm -f fonts/static/ttf/*gasp.ttf
 # font-v write --sha1 "fonts/RedHatMono[wght].ttf"
 # font-v write --sha1 "fonts/RedHatMono-Italic[wght].ttf"
 
-echo "Done Generating Modified Variable Fonts"
+echo "Done Generating"
 
 # # # You should check the fonts now with fontbakery, and generate a markdown file.

build-scripts/build-vf.sh

@@ -19,13 +19,20 @@ mkdir -p fonts/proportional/
 
 fontmake -m source/Mono/VF/RedHatMonoVF.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMonoVF[wght].ttf
 fontmake -m source/Mono/VF/RedHatMonoVFItalic.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMonoVF-Italic[wght].ttf
+fontmake -m source/Mono/RedHatMonoVF.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMono[wght].ttf
+fontmake -m source/Mono/RedHatMonoVFItalic.designspace -o variable --no-production-names --output-path fonts/mono/RedHatMono-Italic[wght].ttf
 #split the mono out and put it in fonts/mono/
 
 #split the proportional out and put them in fonts/proportional
-fontmake -m source/Proportional/VF/RedHatTextVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVF[wght].ttf
-fontmake -m source/Proportional/VF/RedHatTextItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVF-Italic[wght].ttf
-fontmake -m source/Proportional/VF/RedHatDisplayVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVF[wght].ttf
-fontmake -m source/Proportional/VF/RedHatDisplayItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVF-Italic[wght].ttf
+fontmake -m source/Proportional/VF/RedHatTextVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVF.ttf
+fontmake -m source/Proportional/VF/RedHatTextItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatTextVF-Italic.ttf
+fontmake -m source/Proportional/VF/RedHatDisplayVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVF.ttf
+fontmake -m source/Proportional/VF/RedHatDisplayItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplayVF-Italic.ttf
+
+fontmake -m source/Proportional/RedHatTextVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatText[wght].ttf
+fontmake -m source/Proportional/RedHatTextItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatText-Italic[wght].ttf
+fontmake -m source/Proportional/RedHatDisplayVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplay[wght].ttf
+fontmake -m source/Proportional/RedHatDisplayItalicVF.designspace -o variable --no-production-names --output-path fonts/proportional/RedHatDisplay-Italic[wght].ttf
 
 
 
@@ -67,6 +74,9 @@ echo "Add STAT table"
 python mastering/gen_stat_mono.py
 python mastering/gen_stat_text.py
 python mastering/gen_stat_disp.py
+python mastering/gen_stat_monoVF.py
+python mastering/gen_stat_textVF.py
+python mastering/gen_stat_dispVF.py
 
 echo "stat add complete"
 
@@ -144,4 +154,4 @@ rm -f fonts/static/ttf/*gasp.ttf
 
 echo "Done Generating"
 
-# # # You should check the fonts now with fontbakery, and generate a markdown file. 
+# # # You should check the fonts now with fontbakery, and generate a markdown file.

mastering/gen_stat_disp.py

@@ -9,12 +9,13 @@
         name="Weight",
         ordering=0,
         values=[
-            dict(nominalValue=300, rangeMinValue=200, rangeMaxValue=350, name="Light"),
-            dict(nominalValue=400, rangeMinValue=350, rangeMaxValue=400, name="Regular", flags=0x2, linkedValue=700),
-            dict(nominalValue=500, rangeMinValue=450, rangeMaxValue=650, name="Medium"),
-            dict(nominalValue=700, rangeMinValue=650, rangeMaxValue=850, name="Bold"),
-            dict(nominalValue=900, rangeMinValue=850, rangeMaxValue=950, name="Black"),
-            # dict(value=400, name="Regular", flags=0x2, linkedValue=700),  # Regular
+            dict(value=300, name="Light"),
+            dict(value=400, name="Regular", flags=0x2, linkedValue=700,),
+            dict(value=500, name="Medium"),
+            dict(value=600, name="SemiBold"),
+            dict(value=700, name="Bold"),
+            dict(value=800, name="ExtraBold"),
+            dict(value=900, name="Black"),
         ],
     ),
     dict(
@@ -33,12 +34,13 @@
         name="Weight",
         ordering=0,
         values=[
-            dict(nominalValue=300, rangeMinValue=200, rangeMaxValue=350, name="Light"),
-            dict(nominalValue=400, rangeMinValue=350, rangeMaxValue=400, name="Regular", flags=0x2, linkedValue=700),
-            dict(nominalValue=500, rangeMinValue=450, rangeMaxValue=650, name="Medium"),
-            dict(nominalValue=700, rangeMinValue=650, rangeMaxValue=850, name="Bold"),
-            dict(nominalValue=900, rangeMinValue=850, rangeMaxValue=950, name="Black"),
-            # dict(value=400, name="Regular", flags=0x2, linkedValue=700),  # Regular
+            dict(value=300, name="Light"),
+            dict(value=400, name="Regular", flags=0x2, linkedValue=700,),
+            dict(value=500, name="Medium"),
+            dict(value=600, name="SemiBold"),
+            dict(value=700, name="Bold"),
+            dict(value=800, name="ExtraBold"),
+            dict(value=900, name="Black"),
         ],
     ),
     dict(
@@ -51,8 +53,8 @@
     ),
 ]
 
-UPRIGHT_SRC = f"./fonts/proportional/RedHatDisplayVF[wght].ttf"
-ITALIC_SRC = f"./fonts/proportional/RedHatDisplayVF-Italic[wght].ttf"
+UPRIGHT_SRC = f"./fonts/proportional/RedHatDisplay[wght].ttf"
+ITALIC_SRC = f"./fonts/proportional/RedHatDisplay-Italic[wght].ttf"
 
 def update_fvar(ttfont):
     fvar = ttfont['fvar']