Skip to content

Commit 09c6c89

Browse files
committed
Add Ubuntu Sans
Prevent the "SansMono" becomes "SansM" rule for UbuntuSansMono. Fixes: #1435 Signed-off-by: Fini Jastrow <[email protected]>
1 parent 6f485ab commit 09c6c89

23 files changed

+125
-3
lines changed

bin/scripts/lib/fonts.json

+13
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,19 @@
832832
"repoRelease": true,
833833
"description": "Dotted zeros, used the `n`, `o`, `H` &amp; `O` Latin characters as a base for design"
834834
},
835+
{
836+
"unpatchedName": "Ubuntu Sans",
837+
"RFN": false,
838+
"version": "1.004",
839+
"patchedName": "UbuntuSans",
840+
"folderName": "UbuntuSans",
841+
"imagePreviewFont": "UbuntuSansMono NF",
842+
"imagePreviewFontSource": "UbuntuSans/Mono/UbuntuSansMono-Regular.ttf",
843+
"linkPreviewFont": false,
844+
"caskName": "ubuntu-sans",
845+
"repoRelease": false,
846+
"description": "Refreshed version of Ubuntu and Ubuntu Mono fonts"
847+
},
835848
{
836849
"unpatchedName": "Victor Mono",
837850
"RFN": false,

bin/scripts/name_parser/FontnameTools.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def postscript_char_filter(name):
203203
# Noone cares that font names starting with a digit are forbidden:
204204
( 'IBM 3270', r'3270'), # for historical reasons and 'IBM' is a TM or something
205205
# Some name parts that are too long for us
206-
( '(.*sans ?m)ono', r'\1'), # Various SomenameSansMono fonts
206+
( '^(?!ubuntu)(.*sans ?m)ono', r'\1'), # Various SomenameSansMono fonts
207207
( '(.*code ?lat)in', r'\1'), # for 'M PLUS Code Latin'
208208
( '(b)ig( ?)(b)lue( ?)(t)erminal', r'\1ig\3lue\5erm'), # Shorten BigBlueTerminal
209209
( '(.*)437TT', r'\g<1>437'), # Shorten BigBlueTerminal 437 TT even further

font-patcher

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from __future__ import absolute_import, print_function, unicode_literals
77

88
# Change the script version when you edit this script:
9-
script_version = "4.12.0"
9+
script_version = "4.12.1"
1010

1111
version = "3.1.1"
1212
projectName = "Nerd Fonts"

readme.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ A preview of all fonts can be found [here](https://www.nerdfonts.com/font-downlo
175175
| [Tinos Nerd Font][p-tinos] | [Tinos][f-tinos] | 1.23 | NO |
176176
| [Ubuntu Nerd Font][p-ubuntu] | [Ubuntu Font][f-ubuntu] | 0.83 | NO |
177177
| [UbuntuMono Nerd Font][p-ubuntu-mono] | [Ubuntu Font][f-ubuntu] | 0.80 | NO |
178+
| [UbuntuSans Nerd Font][p-ubuntu-sans] | [Ubuntu Sans][f-ubuntu-sans] | 1.004 | NO |
178179
| [VictorMono Nerd Font][p-victor] | [Victor Mono][f-victor] | 1.5.6 | NO |
179180
| [ZedMono Nerd Font][p-zed-mono] | [Zed Mono][f-zed-mono] | 1.2.0 | NO |
180181

@@ -701,6 +702,7 @@ Font repos
701702
[f-terminus]:http://terminus-font.sourceforge.net
702703
[f-tinos]:https://fonts.google.com/specimen/Tinos
703704
[f-ubuntu]:http://font.ubuntu.com
705+
[f-ubuntu-sans]:https://github.com/canonical/Ubuntu-Sans-Mono-fonts
704706
[f-victor]:https://github.com/rubjo/victor-mono
705707
[f-zed-mono]:https://github.com/zed-industries/zed-fonts
706708

@@ -769,8 +771,9 @@ Patched Font internal links
769771
[p-space-mono]:patched-fonts/SpaceMono
770772
[p-terminus]:patched-fonts/Terminus
771773
[p-tinos]:patched-fonts/Tinos
772-
[p-ubuntu-mono]:patched-fonts/UbuntuMono
773774
[p-ubuntu]:patched-fonts/Ubuntu
775+
[p-ubuntu-mono]:patched-fonts/UbuntuMono
776+
[p-ubuntu-sans]:patched-fonts/UbuntuSans
774777
[p-victor]:patched-fonts/VictorMono
775778
[p-zed-mono]:patched-fonts/ZedMono
776779

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
-------------------------------
2+
UBUNTU FONT LICENCE Version 1.0
3+
-------------------------------
4+
5+
PREAMBLE
6+
This licence allows the licensed fonts to be used, studied, modified and
7+
redistributed freely. The fonts, including any derivative works, can be
8+
bundled, embedded, and redistributed provided the terms of this licence
9+
are met. The fonts and derivatives, however, cannot be released under
10+
any other licence. The requirement for fonts to remain under this
11+
licence does not require any document created using the fonts or their
12+
derivatives to be published under this licence, as long as the primary
13+
purpose of the document is not to be a vehicle for the distribution of
14+
the fonts.
15+
16+
DEFINITIONS
17+
"Font Software" refers to the set of files released by the Copyright
18+
Holder(s) under this licence and clearly marked as such. This may
19+
include source files, build scripts and documentation.
20+
21+
"Original Version" refers to the collection of Font Software components
22+
as received under this licence.
23+
24+
"Modified Version" refers to any derivative made by adding to, deleting,
25+
or substituting -- in part or in whole -- any of the components of the
26+
Original Version, by changing formats or by porting the Font Software to
27+
a new environment.
28+
29+
"Copyright Holder(s)" refers to all individuals and companies who have a
30+
copyright ownership of the Font Software.
31+
32+
"Substantially Changed" refers to Modified Versions which can be easily
33+
identified as dissimilar to the Font Software by users of the Font
34+
Software comparing the Original Version with the Modified Version.
35+
36+
To "Propagate" a work means to do anything with it that, without
37+
permission, would make you directly or secondarily liable for
38+
infringement under applicable copyright law, except executing it on a
39+
computer or modifying a private copy. Propagation includes copying,
40+
distribution (with or without modification and with or without charging
41+
a redistribution fee), making available to the public, and in some
42+
countries other activities as well.
43+
44+
PERMISSION & CONDITIONS
45+
This licence does not grant any rights under trademark law and all such
46+
rights are reserved.
47+
48+
Permission is hereby granted, free of charge, to any person obtaining a
49+
copy of the Font Software, to propagate the Font Software, subject to
50+
the below conditions:
51+
52+
1) Each copy of the Font Software must contain the above copyright
53+
notice and this licence. These can be included either as stand-alone
54+
text files, human-readable headers or in the appropriate machine-
55+
readable metadata fields within text or binary files as long as those
56+
fields can be easily viewed by the user.
57+
58+
2) The font name complies with the following:
59+
(a) The Original Version must retain its name, unmodified.
60+
(b) Modified Versions which are Substantially Changed must be renamed to
61+
avoid use of the name of the Original Version or similar names entirely.
62+
(c) Modified Versions which are not Substantially Changed must be
63+
renamed to both (i) retain the name of the Original Version and (ii) add
64+
additional naming elements to distinguish the Modified Version from the
65+
Original Version. The name of such Modified Versions must be the name of
66+
the Original Version, with "derivative X" where X represents the name of
67+
the new work, appended to that name.
68+
69+
3) The name(s) of the Copyright Holder(s) and any contributor to the
70+
Font Software shall not be used to promote, endorse or advertise any
71+
Modified Version, except (i) as required by this licence, (ii) to
72+
acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
73+
their explicit written permission.
74+
75+
4) The Font Software, modified or unmodified, in part or in whole, must
76+
be distributed entirely under this licence, and must not be distributed
77+
under any other licence. The requirement for fonts to remain under this
78+
licence does not affect any document created using the Font Software,
79+
except any version of the Font Software extracted from a document
80+
created using the Font Software may only be distributed under this
81+
licence.
82+
83+
TERMINATION
84+
This licence becomes null and void if any of the above conditions are
85+
not met.
86+
87+
DISCLAIMER
88+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
89+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
90+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
91+
COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
92+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
93+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
94+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
95+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
96+
DEALINGS IN THE FONT SOFTWARE.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Ubuntu Sans
2+
3+
A refreshed version of the classic Ubuntu font.
4+
5+
For more information have a look at the upstream website:
6+
* https://github.com/canonical/Ubuntu-Sans-fonts
7+
* https://github.com/canonical/Ubuntu-Sans-Mono-fonts
8+
9+
Version: v1.004
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config_patch_flags="--makegroups 4"

0 commit comments

Comments
 (0)