diff --git a/bin/scripts/generate-font-image-previews.sh b/bin/scripts/generate-font-image-previews.sh index 4dced3bcc1..9c61ee8c70 100755 --- a/bin/scripts/generate-font-image-previews.sh +++ b/bin/scripts/generate-font-image-previews.sh @@ -119,6 +119,7 @@ image_font_files=( \ 'SpaceMono/Regular/SpaceMonoNerdFont-Regular.ttf' \ 'Terminus/Regular/TerminessNerdFont-Regular.ttf' \ 'Tinos/Regular/TinosNerdFont-Regular.ttf' \ + 'TwilioSansMono/TwilioSansMNerdFont-Regular.ttf' \ 'Ubuntu/Regular/UbuntuNerdFont-Regular.ttf' \ 'UbuntuMono/Regular/UbuntuMonoNerdFont-Regular.ttf' \ 'VictorMono/Regular/VictorMonoNerdFont-Regular.ttf' \ diff --git a/bin/scripts/lib/fonts.json b/bin/scripts/lib/fonts.json index b6f7335d8e..36066715c6 100644 --- a/bin/scripts/lib/fonts.json +++ b/bin/scripts/lib/fonts.json @@ -671,6 +671,17 @@ "repoRelease": true, "description": "Some similarities to Times New Roman, designed by Steve Matteson, includes pan-European WGL character set" }, + { + "unpatchedName": "Twilio Sans Mono", + "RNF": true, + "patchedName": "TwilioSansM", + "folderName": "TwilioSansMono", + "imagePreviewFont": "TwilioSansM Nerd Font", + "linkPreviewFont": "twilio-sans-mono", + "caskName": "twilio-sans-mono", + "repoRelease": false, + "description": "A beautiful and extensive open source programming font" + }, { "unpatchedName": "Ubuntu", "RFN": false, diff --git a/bin/scripts/name_parser/FontnameTools.py b/bin/scripts/name_parser/FontnameTools.py index 180685617f..cf484a752d 100644 --- a/bin/scripts/name_parser/FontnameTools.py +++ b/bin/scripts/name_parser/FontnameTools.py @@ -334,18 +334,18 @@ def is_keep_regular(basename): 'Cousine', 'Fantasque', 'Fira', - - 'Overpass', - 'Lilex', - 'Inconsolata$', # not InconsolataGo + 'Hack', 'IAWriter', + 'Inconsolata$', # not InconsolataGo + 'JetBrains Mono', + 'Lilex', 'Meslo', 'Monoid', 'Mononoki', - 'Hack', - 'JetBrains Mono', 'Noto Sans', 'Noto Serif', + 'Overpass', + 'Twilio', 'Victor', ] for kr in KEEP_REGULAR: @@ -374,10 +374,11 @@ def parse_font_name(name): """Expects a fontname following the 'FontFamilyName-FontStyle' pattern and returns ... parts""" # This could parse filenames in the beginning but that was never used in production; code removed with this commit for special in [ + ('ExBld', 'ExtraBold'), # Twilio ('ExtLt', 'ExtraLight'), # IBM-Plex ('Medm', 'Medium'), # IBM-Plex ('Semi-Condensed', 'SemiCondensed'), # 3270 - ('SmBld', 'SemiBold'), # IBM-Plex + ('SmBld', 'SemiBold'), # IBM-Plex, Twilio ]: name = re.sub(r'\b' + special[0] + r'\b', special[1], name, 1, re.IGNORECASE) name = re.sub('[_\s]+', ' ', name) diff --git a/readme.md b/readme.md index 37813282a6..67dd5ba3d1 100644 --- a/readme.md +++ b/readme.md @@ -171,6 +171,7 @@ See [Wiki: Icon names in shell][wiki-icon-names-in-shell] | [Space Mono Nerd Font][p-space-mono] | [Space Mono][f-space] | 1.001 | NO | ![w] ![m2] ![l] | | [Terminess Nerd Font][p-terminus] | [Terminus TTF][f-terminus] |4.49.2 | YES | ![w] ![m2] ![l] | | [Tinos][p-tinos] | [Tinos][f-tinos] | 1.23 | NO | ![w] ![m2] ![l] | +| [Twilio SansM Nerd Font][p-twilio] | [Twilio Sans Mono][f-twilio] | 2.100 | YES | ![w] ![m2] ![l] | | [Ubuntu Nerd Font][p-ubuntu] | [Ubuntu Font][f-ubuntu] | 0.83 | NO | ![w] ![m2] ![l] | | [Ubuntu Mono Nerd Font][p-ubuntu-mono] | [Ubuntu Font][f-ubuntu] | 0.80 | NO | ![w] ![m2] ![l] | | [Victor Mono][p-victor] | [Victor Mono][f-victor] | 1.5.4 | NO | ![w] ![m2] ![l] | @@ -676,6 +677,7 @@ Font repos [f-space]:https://fonts.google.com/specimen/Space+Mono [f-terminus]:http://terminus-font.sourceforge.net [f-tinos]:https://fonts.google.com/specimen/Tinos +[f-twilio]:https://github.com/twilio/twilio-sans-mono [f-ubuntu]:http://font.ubuntu.com [f-victor]:https://github.com/rubjo/victor-mono @@ -741,6 +743,7 @@ Patched Font internal links [p-space-mono]:patched-fonts/SpaceMono [p-terminus]:patched-fonts/Terminus [p-tinos]:patched-fonts/Tinos +[p-twilio]:patched-fonts/TwilioSansMono [p-ubuntu-mono]:patched-fonts/UbuntuMono [p-ubuntu]:patched-fonts/Ubuntu [p-victor]:patched-fonts/VictorMono diff --git a/src/unpatched-fonts/TwilioSansMono/LICENSE.txt b/src/unpatched-fonts/TwilioSansMono/LICENSE.txt new file mode 100644 index 0000000000..2e9872a342 --- /dev/null +++ b/src/unpatched-fonts/TwilioSansMono/LICENSE.txt @@ -0,0 +1,112 @@ +Copyright (c) <2020>, (), +with Reserved Font Names set forth below     +■ Twilio Sans Mono Retina +■ Twilio Sans Mono Retina Italic +■ Twilio Sans Mono Regular +■ Twilio Sans Mono Regular Italic +■ Twilio Sans Mono Bold +■ Twilio Sans Mono Bold Italic +■ Twilio Sans Mono Light +■ Twilio Sans Mono Light Italic +■ Twilio Sans Mono Medium +■ Twilio Sans Mono Medium Italic +■ Twilio Sans Mono Semi-bold +■ Twilio Sans Mono Semi-bold Italic +■ Twilio Sans Mono Extrabold +■ Twilio Sans Mono Extrabold Italic +■ Twilio Sans Mono Heavy +■ Twilio Sans Mono Heavy Italic +  +  +This Font Software is licensed by Twilio Inc. with permission of the Copyright Holder 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. diff --git a/src/unpatched-fonts/TwilioSansMono/README.md b/src/unpatched-fonts/TwilioSansMono/README.md new file mode 100644 index 0000000000..4cdbe46be9 --- /dev/null +++ b/src/unpatched-fonts/TwilioSansMono/README.md @@ -0,0 +1,11 @@ +# Twilio Sans Mono + +**Twilio Sans Mono** is a distinct programming font designed to fit the needs of every developer — no matter +their code editor, no matter their preferred programming language, and no matter their project. You can +download Twilio Sans Mono for free today and use it in your favorite code editor. + +For more information have a look at the upstream website: https://github.com/twilio/twilio-sans-mono + +The `ldot` ligatures are removed because they map to only one advance width. + +Version: 2.100 diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Bold.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Bold.ttf new file mode 100644 index 0000000000..54c4be015a Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Bold.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-BoldItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-BoldItl.ttf new file mode 100644 index 0000000000..cadb1ad109 Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-BoldItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Extrabold.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Extrabold.ttf new file mode 100644 index 0000000000..f93a29951e Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Extrabold.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-ExtraboldItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-ExtraboldItl.ttf new file mode 100644 index 0000000000..74d550f9d0 Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-ExtraboldItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Heavy.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Heavy.ttf new file mode 100644 index 0000000000..7f0cb9d293 Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Heavy.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-HeavyItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-HeavyItl.ttf new file mode 100644 index 0000000000..0c112bc47c Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-HeavyItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Light.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Light.ttf new file mode 100644 index 0000000000..7862eefbb3 Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Light.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-LightItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-LightItl.ttf new file mode 100644 index 0000000000..c22422c78f Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-LightItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Medium.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Medium.ttf new file mode 100644 index 0000000000..10f94d955d Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Medium.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-MediumItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-MediumItl.ttf new file mode 100644 index 0000000000..ea42990a96 Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-MediumItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Regular.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Regular.ttf new file mode 100644 index 0000000000..73dcadbc5e Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Regular.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-RegularItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-RegularItl.ttf new file mode 100644 index 0000000000..eebb3460fc Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-RegularItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Retina.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Retina.ttf new file mode 100644 index 0000000000..6405f9ef0b Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Retina.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-RetinaItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-RetinaItl.ttf new file mode 100644 index 0000000000..05c06ae5af Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-RetinaItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Semibold.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Semibold.ttf new file mode 100644 index 0000000000..c661c41403 Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-Semibold.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-SemiboldItl.ttf b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-SemiboldItl.ttf new file mode 100644 index 0000000000..bbf1c44c83 Binary files /dev/null and b/src/unpatched-fonts/TwilioSansMono/TwilioSansMono-SemiboldItl.ttf differ diff --git a/src/unpatched-fonts/TwilioSansMono/config.cfg b/src/unpatched-fonts/TwilioSansMono/config.cfg new file mode 100644 index 0000000000..bf003486cd --- /dev/null +++ b/src/unpatched-fonts/TwilioSansMono/config.cfg @@ -0,0 +1 @@ +config_patch_flags="--makegroups 4" diff --git a/src/unpatched-fonts/TwilioSansMono/config.json b/src/unpatched-fonts/TwilioSansMono/config.json new file mode 100644 index 0000000000..3adaf7e9ab --- /dev/null +++ b/src/unpatched-fonts/TwilioSansMono/config.json @@ -0,0 +1,3 @@ +[Subtables] + ligatures: [ + "Ligature Substitution lookup 121 subtable" ]