diff --git a/bin/scripts/lib/fonts.json b/bin/scripts/lib/fonts.json index 6b313abe7..dbb977d5b 100644 --- a/bin/scripts/lib/fonts.json +++ b/bin/scripts/lib/fonts.json @@ -832,6 +832,19 @@ "repoRelease": true, "description": "Dotted zeros, used the `n`, `o`, `H` & `O` Latin characters as a base for design" }, + { + "unpatchedName": "Ubuntu Sans", + "RFN": false, + "version": "1.004", + "patchedName": "UbuntuSans", + "folderName": "UbuntuSans", + "imagePreviewFont": "UbuntuSansMono NF", + "imagePreviewFontSource": "UbuntuSans/Mono/UbuntuSansMono-Regular.ttf", + "linkPreviewFont": false, + "caskName": "ubuntu-sans", + "repoRelease": false, + "description": "Refreshed version of Ubuntu and Ubuntu Mono fonts" + }, { "unpatchedName": "Victor Mono", "RFN": false, diff --git a/bin/scripts/name_parser/FontnameTools.py b/bin/scripts/name_parser/FontnameTools.py index 0f5e12e4b..0986314c9 100644 --- a/bin/scripts/name_parser/FontnameTools.py +++ b/bin/scripts/name_parser/FontnameTools.py @@ -203,7 +203,7 @@ class FontnameTools: # Noone cares that font names starting with a digit are forbidden: ( 'IBM 3270', r'3270'), # for historical reasons and 'IBM' is a TM or something # Some name parts that are too long for us - ( '(.*sans ?m)ono', r'\1'), # Various SomenameSansMono fonts + ( '^(?!ubuntu)(.*sans ?m)ono', r'\1'), # Various SomenameSansMono fonts ( '(.*code ?lat)in', r'\1'), # for 'M PLUS Code Latin' ( '(b)ig( ?)(b)lue( ?)(t)erminal', r'\1ig\3lue\5erm'), # Shorten BigBlueTerminal ( '(.*)437TT', r'\g<1>437'), # Shorten BigBlueTerminal 437 TT even further diff --git a/font-patcher b/font-patcher index 28b82cc89..559814e57 100755 --- a/font-patcher +++ b/font-patcher @@ -6,7 +6,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Change the script version when you edit this script: -script_version = "4.12.0" +script_version = "4.12.1" version = "3.1.1" projectName = "Nerd Fonts" diff --git a/readme.md b/readme.md index 65ec583fd..686b17421 100644 --- a/readme.md +++ b/readme.md @@ -175,6 +175,7 @@ A preview of all fonts can be found [here](https://www.nerdfonts.com/font-downlo | [Tinos Nerd Font][p-tinos] | [Tinos][f-tinos] | 1.23 | NO | | [Ubuntu Nerd Font][p-ubuntu] | [Ubuntu Font][f-ubuntu] | 0.83 | NO | | [UbuntuMono Nerd Font][p-ubuntu-mono] | [Ubuntu Font][f-ubuntu] | 0.80 | NO | +| [UbuntuSans Nerd Font][p-ubuntu-sans] | [Ubuntu Sans][f-ubuntu-sans] | 1.004 | NO | | [VictorMono Nerd Font][p-victor] | [Victor Mono][f-victor] | 1.5.6 | NO | | [ZedMono Nerd Font][p-zed-mono] | [Zed Mono][f-zed-mono] | 1.2.0 | NO | @@ -701,6 +702,7 @@ Font repos [f-terminus]:http://terminus-font.sourceforge.net [f-tinos]:https://fonts.google.com/specimen/Tinos [f-ubuntu]:http://font.ubuntu.com +[f-ubuntu-sans]:https://github.com/canonical/Ubuntu-Sans-Mono-fonts [f-victor]:https://github.com/rubjo/victor-mono [f-zed-mono]:https://github.com/zed-industries/zed-fonts @@ -769,8 +771,9 @@ Patched Font internal links [p-space-mono]:patched-fonts/SpaceMono [p-terminus]:patched-fonts/Terminus [p-tinos]:patched-fonts/Tinos -[p-ubuntu-mono]:patched-fonts/UbuntuMono [p-ubuntu]:patched-fonts/Ubuntu +[p-ubuntu-mono]:patched-fonts/UbuntuMono +[p-ubuntu-sans]:patched-fonts/UbuntuSans [p-victor]:patched-fonts/VictorMono [p-zed-mono]:patched-fonts/ZedMono diff --git a/src/unpatched-fonts/UbuntuSans/LICENCE.txt b/src/unpatched-fonts/UbuntuSans/LICENCE.txt new file mode 100644 index 000000000..ae78a8f94 --- /dev/null +++ b/src/unpatched-fonts/UbuntuSans/LICENCE.txt @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"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. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. 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. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence 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/UbuntuSans/Mono/UbuntuSansMono-Bold.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Bold.ttf new file mode 100644 index 000000000..725bf1b73 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Bold.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-BoldItalic.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-BoldItalic.ttf new file mode 100644 index 000000000..1c8f83437 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-BoldItalic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Italic.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Italic.ttf new file mode 100644 index 000000000..b2c50e960 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Italic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Medium.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Medium.ttf new file mode 100644 index 000000000..27b656cbf Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Medium.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-MediumItalic.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-MediumItalic.ttf new file mode 100644 index 000000000..ee89ef5e3 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-MediumItalic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Regular.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Regular.ttf new file mode 100644 index 000000000..78e8f633d Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-Regular.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-SemiBold.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-SemiBold.ttf new file mode 100644 index 000000000..70418f807 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-SemiBold.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-SemiBoldItalic.ttf b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-SemiBoldItalic.ttf new file mode 100644 index 000000000..d2804f500 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Mono/UbuntuSansMono-SemiBoldItalic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/README.md b/src/unpatched-fonts/UbuntuSans/README.md new file mode 100644 index 000000000..d85b689ff --- /dev/null +++ b/src/unpatched-fonts/UbuntuSans/README.md @@ -0,0 +1,9 @@ +# Ubuntu Sans + +A refreshed version of the classic Ubuntu font. + +For more information have a look at the upstream website: +* https://github.com/canonical/Ubuntu-Sans-fonts +* https://github.com/canonical/Ubuntu-Sans-Mono-fonts + +Version: v1.004 diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Bold.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Bold.ttf new file mode 100644 index 000000000..8ffa41848 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Bold.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-BoldItalic.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-BoldItalic.ttf new file mode 100644 index 000000000..b013b0ba5 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-BoldItalic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Italic.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Italic.ttf new file mode 100644 index 000000000..ee690a530 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Italic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Medium.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Medium.ttf new file mode 100644 index 000000000..cf118b286 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Medium.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-MediumItalic.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-MediumItalic.ttf new file mode 100644 index 000000000..19cfd7acf Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-MediumItalic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Regular.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Regular.ttf new file mode 100644 index 000000000..ca72289b8 Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-Regular.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-SemiBold.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-SemiBold.ttf new file mode 100644 index 000000000..3a7143f3f Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-SemiBold.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-SemiBoldItalic.ttf b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-SemiBoldItalic.ttf new file mode 100644 index 000000000..3cc45082d Binary files /dev/null and b/src/unpatched-fonts/UbuntuSans/Sans/UbuntuSans-SemiBoldItalic.ttf differ diff --git a/src/unpatched-fonts/UbuntuSans/config.cfg b/src/unpatched-fonts/UbuntuSans/config.cfg new file mode 100644 index 000000000..bf003486c --- /dev/null +++ b/src/unpatched-fonts/UbuntuSans/config.cfg @@ -0,0 +1 @@ +config_patch_flags="--makegroups 4"