diff --git a/bin/scripts/name_parser/FontnameTools.py b/bin/scripts/name_parser/FontnameTools.py index 1d4efbe1d7..799cdc6e9a 100644 --- a/bin/scripts/name_parser/FontnameTools.py +++ b/bin/scripts/name_parser/FontnameTools.py @@ -162,6 +162,7 @@ def postscript_char_filter(name): return out SIL_TABLE = [ + ( '(a)nonymous', r'\1nonymice' ), ( '(s)ource', r'\1auce' ), ( '(h)ermit', r'\1urmit' ), ( '(h)asklig', r'\1asklug' ), @@ -264,7 +265,8 @@ def parse_font_name(name): ( style, weight_token ) = FontnameTools.get_name_token(style, weights) ( style, style_token ) = FontnameTools.get_name_token(style, styles) ( style, other_token ) = FontnameTools.get_name_token(style, other, True) - if len(style) < 4: + if (len(style) < 4 + and style.lower() != 'pro'): # Prevent 'r' of Pro to be detected as style_abbrev ( style, weight_token_abbrevs ) = FontnameTools.get_name_token(style, weight_abbrevs) ( style, style_token_abbrevs ) = FontnameTools.get_name_token(style, style_abbrevs) weight_token += weight_token_abbrevs diff --git a/src/unpatched-fonts/AnonymousPro/Anonymice Powerline.ttf b/src/unpatched-fonts/AnonymousPro/Anonymice Powerline.ttf deleted file mode 100644 index 5edacecfa9..0000000000 Binary files a/src/unpatched-fonts/AnonymousPro/Anonymice Powerline.ttf and /dev/null differ diff --git a/src/unpatched-fonts/AnonymousPro/Bold-Italic/Anonymous Pro BI.ttf b/src/unpatched-fonts/AnonymousPro/Bold-Italic/Anonymous Pro BI.ttf new file mode 100644 index 0000000000..838f2d1252 Binary files /dev/null and b/src/unpatched-fonts/AnonymousPro/Bold-Italic/Anonymous Pro BI.ttf differ diff --git a/src/unpatched-fonts/AnonymousPro/Bold/Anonymous Pro B.ttf b/src/unpatched-fonts/AnonymousPro/Bold/Anonymous Pro B.ttf new file mode 100644 index 0000000000..985bd4002d Binary files /dev/null and b/src/unpatched-fonts/AnonymousPro/Bold/Anonymous Pro B.ttf differ diff --git a/src/unpatched-fonts/AnonymousPro/Italic/Anonymous Pro I.ttf b/src/unpatched-fonts/AnonymousPro/Italic/Anonymous Pro I.ttf new file mode 100644 index 0000000000..43505c164f Binary files /dev/null and b/src/unpatched-fonts/AnonymousPro/Italic/Anonymous Pro I.ttf differ diff --git a/src/unpatched-fonts/AnonymousPro/LICENSE.txt b/src/unpatched-fonts/AnonymousPro/OFL.txt similarity index 93% rename from src/unpatched-fonts/AnonymousPro/LICENSE.txt rename to src/unpatched-fonts/AnonymousPro/OFL.txt index fbeb3a26a8..68d1d00550 100644 --- a/src/unpatched-fonts/AnonymousPro/LICENSE.txt +++ b/src/unpatched-fonts/AnonymousPro/OFL.txt @@ -1,7 +1,5 @@ -Copyright (c) 2009, Mark Simonson - (http://www.ms-studio.com, mark@marksimonson.com), - with Reserved Font Name Anonymous Pro. -Copyright (c) 2013, Kim Silkebækken and Carl X. Su. +Copyright (c) 2009, Mark Simonson (http://www.ms-studio.com, mark@marksimonson.com), +with Reserved Font Name Anonymous Pro. 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: @@ -21,7 +19,7 @@ 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, +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 @@ -93,4 +91,4 @@ 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. \ No newline at end of file +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/unpatched-fonts/AnonymousPro/README.md b/src/unpatched-fonts/AnonymousPro/README.md new file mode 100644 index 0000000000..db469a794b --- /dev/null +++ b/src/unpatched-fonts/AnonymousPro/README.md @@ -0,0 +1,4 @@ +# Anonymous Pro 1.002 +Anonymous Pro (2009) is a family of four fixed-width fonts designed with coding in mind. + +For more information have a look at the upstream website: https://www.marksimonson.com/fonts/view/anonymous-pro diff --git a/src/unpatched-fonts/AnonymousPro/README.rst b/src/unpatched-fonts/AnonymousPro/README.rst deleted file mode 100644 index 16adfbe43a..0000000000 --- a/src/unpatched-fonts/AnonymousPro/README.rst +++ /dev/null @@ -1,21 +0,0 @@ -Anonymice Powerline -=================== - -:Font creator: Mark Simonson -:Version: 1.002 -:Source: http://www.marksimonson.com/fonts/view/anonymous-pro -:License: SIL OPEN FONT LICENSE Version 1.1 -:Patched by: `Carl X. Su `_ - -Anonymous Pro (2009) is a family of four fixed-width fonts designed -especially with coding in mind. Characters that could be mistaken for -one another (O, 0, I, l, 1, etc.) have distinct shapes to make them -easier to tell apart in the context of source code. - -Anonymice Powerline is derived from Anonymous Pro for Powerline users. -The Powerline symbols is being made by Kim Silkebækken. The patch work -is being undertaken by Carl X. Su. - -Both the final font Truetype/OpenType files and the design files used -to produce the font family are distributed under an open licence and -you are expressly encouraged to experiment, modify, share and improve. \ No newline at end of file diff --git a/src/unpatched-fonts/AnonymousPro/Regular/Anonymous Pro.ttf b/src/unpatched-fonts/AnonymousPro/Regular/Anonymous Pro.ttf new file mode 100644 index 0000000000..06aafc0673 Binary files /dev/null and b/src/unpatched-fonts/AnonymousPro/Regular/Anonymous Pro.ttf differ diff --git a/src/unpatched-fonts/AnonymousPro/config.cfg b/src/unpatched-fonts/AnonymousPro/config.cfg index 53c38882b7..f5991fb372 100644 --- a/src/unpatched-fonts/AnonymousPro/config.cfg +++ b/src/unpatched-fonts/AnonymousPro/config.cfg @@ -1 +1,2 @@ -config_has_powerline=1 +config_rfn="Anonymous Pro" +config_rfn_substitue="Anonymice Pro"