FontAwesome: Update to 6.5.1

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.1"
+script_version = "4.13.0"
 
 version = "3.1.1"
 projectName = "Nerd Fonts"
@@ -1079,7 +1079,7 @@ class font_patcher:
             {'Enabled': self.args.powerlineextra,       'Name': "Powerline Extra Symbols", 'Filename': "powerline-extra/PowerlineExtraSymbols.otf",      'Exact': True,  'SymStart': 0xE0CC, 'SymEnd': 0xE0D7, 'SrcStart': None,   'ScaleRules': None,             'Attributes': SYM_ATTR_POWERLINE},
             {'Enabled': self.args.powerlineextra,       'Name': "Powerline Extra Symbols", 'Filename': "powerline-extra/PowerlineExtraSymbols.otf",      'Exact': True,  'SymStart': 0x2630, 'SymEnd': 0x2630, 'SrcStart': None,   'ScaleRules': None,             'Attributes': SYM_ATTR_TRIGRAPH},
             {'Enabled': self.args.pomicons,             'Name': "Pomicons",                'Filename': "Pomicons.otf",                                   'Exact': True,  'SymStart': 0xE000, 'SymEnd': 0xE00A, 'SrcStart': None,   'ScaleRules': None,             'Attributes': SYM_ATTR_DEFAULT},
-            {'Enabled': self.args.fontawesome,          'Name': "Font Awesome",            'Filename': "font-awesome/FontAwesome.otf",                   'Exact': True,  'SymStart': 0xF000, 'SymEnd': 0xF2E0, 'SrcStart': None,   'ScaleRules': FONTA_SCALE_LIST, 'Attributes': SYM_ATTR_FONTA},
+            {'Enabled': self.args.fontawesome,          'Name': "Font Awesome",            'Filename': "font-awesome/FontAwesome.otf",                   'Exact': True,  'SymStart': 0xED00, 'SymEnd': 0xF2FF, 'SrcStart': None,   'ScaleRules': FONTA_SCALE_LIST, 'Attributes': SYM_ATTR_FONTA},
             {'Enabled': self.args.fontawesomeextension, 'Name': "Font Awesome Extension",  'Filename': "font-awesome-extension.ttf",                     'Exact': False, 'SymStart': 0xE000, 'SymEnd': 0xE0A9, 'SrcStart': 0xE200, 'ScaleRules': None,             'Attributes': SYM_ATTR_DEFAULT},  # Maximize
             {'Enabled': self.args.powersymbols,         'Name': "Power Symbols",           'Filename': "Unicode_IEC_symbol_font.otf",                    'Exact': True,  'SymStart': 0x23FB, 'SymEnd': 0x23FE, 'SrcStart': None,   'ScaleRules': None,             'Attributes': SYM_ATTR_DEFAULT},  # Power, Power On/Off, Power On, Sleep
             {'Enabled': self.args.powersymbols,         'Name': "Power Symbols",           'Filename': "Unicode_IEC_symbol_font.otf",                    'Exact': True,  'SymStart': 0x2B58, 'SymEnd': 0x2B58, 'SrcStart': None,   'ScaleRules': None,             'Attributes': SYM_ATTR_DEFAULT},  # Heavy Circle (aka Power Off)

license-audit.md

@@ -31,7 +31,7 @@ All files created such as `font-patcher` and any `ph` or `sh` script/source file
 | ------------------------------------------------ | ----------------|
 | Codicons                                         | CC BY 4.0       |
 | Devicons                                         | MIT             |
-| Font Awesome                                     | SIL OFL 1.1     |
+| Font Awesome                                     | CC BY 4.0       |
 | Font Awesome Extension                           | MIT             |
 | Font Logos                                       | Unlicensed      |
 | IEC Power Symbols                                | MIT             |

src/glyphs/font-awesome/LICENSE.txt

@@ -1,23 +1,151 @@
+Fonticons, Inc. (https://fontawesome.com)
+
+--------------------------------------------------------------------------------
+
 Font Awesome Free License
--------------------------
 
 Font Awesome Free is free, open source, and GPL friendly. You can use it for
 commercial projects, open source projects, or really almost whatever you want.
 Full Font Awesome Free license: https://fontawesome.com/license/free.
 
+--------------------------------------------------------------------------------
+
 # Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
-In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
-packaged as SVG and JS file types.
 
-# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+The Font Awesome Free download is licensed under a Creative Commons
+Attribution 4.0 International License and applies to all icons packaged
+as SVG and JS file types.
+
+--------------------------------------------------------------------------------
+
+# Fonts: SIL OFL 1.1 License
+
 In the Font Awesome Free download, the SIL OFL license applies to all icons
 packaged as web and desktop font files.
 
+Copyright (c) 2022 Fonticons, Inc. (https://fontawesome.com)
+with Reserved Font Name: "Font Awesome".
+
+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:
+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.
+
+--------------------------------------------------------------------------------
+
 # Code: MIT License (https://opensource.org/licenses/MIT)
+
 In the Font Awesome Free download, the MIT license applies to all non-font and
 non-icon files.
 
+Copyright 2022 Fonticons, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in the
+Software without restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
 # Attribution
+
 Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
 Awesome Free files already contain embedded comments with sufficient
 attribution, so you shouldn't need to do anything additional when using these
@@ -27,7 +155,10 @@ We've kept attribution comments terse, so we ask that you do not actively work
 to remove them from files, especially code. They're a great way for folks to
 learn about Font Awesome.
 
+--------------------------------------------------------------------------------
+
 # Brand Icons
+
 All brand icons are trademarks of their respective owners. The use of these
 trademarks does not indicate endorsement of the trademark holder by Font
 Awesome, nor vice versa. **Please do not use brand logos for any purpose except

src/glyphs/font-awesome/README.md

@@ -0,0 +1,16 @@
+# Font Awesome
+
+For more information have a look at the upstream website: https://github.com/FortAwesome/Font-Awesome
+
+## Custom created font file
+
+The `FontAwesome.otf` here is custom created from the Font Awesome release svgs.
+
+It does NOT contain all icons from 6.5.1!
+
+The helper scripts need to be called in this order (note the individual prerequisites):
+* `remix`
+* `analyze`
+* `generate`
+
+Version: 6.5.1.custom

src/glyphs/font-awesome/analyze

@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+# coding=utf8
+
+# Create the final mapping file by combining the information from
+# the remix_mapping (which holds already the codepoints and file names
+# and that relation will not be changed) and the names of the
+# current (previous) Font Awesome Nerd Font mapping (from the
+# glyphnames.json file).
+# In pinciple this script just adds more names to the remix_mapping.
+
+# PREREQUISITES: Have remix_mapping file (generated with script remix)
+# $ ./analyze > mapping
+
+import re, sys
+from subprocess import run
+
+def collect_jq_names_for_one_codepoint(point, exclude, excludes):
+    global jq_names
+    ret = []
+    for n in jq_names:
+        if int(point, 16) in jq_names[n]:
+            ret.append(n)
+    if exclude in ret:
+        ret.remove(exclude)
+    for x in excludes:
+        if x in ret:
+            ret.remove(x)
+    return ret
+
+# print('Reading previous name-to-codepoint table (slow slow)')
+jq_names = {}
+for point in range(0xF000, 0xF300):
+    result = run([ 'jq', '-r',
+                'to_entries[] | select(.value.code == "{:04x}") | .key'.format(point),
+                '../../../glyphnames.json' ],
+            capture_output=True)
+    if result.returncode != 0:
+        sys.exit('Error fetching old names')
+    lines = result.stdout.decode("utf-8").split()
+    for n in lines:
+        if not n.startswith('fa-'):
+            print('WRONG START:', n)
+            sys.exit(1)
+        n = n[3:]
+        if n not in jq_names:
+            jq_names[n] = set([point])
+        else:
+            jq_names[n].add(point)
+            print('DOUBLE ENTRY:', n)
+            sys.exit(1)
+
+# print('Reading remix_mapping file')
+remix_mapping = []
+with open('remix_mapping', 'r') as f:
+    for line in f.readlines():
+        if line.startswith('#'):
+            continue
+        remix_mapping.append(tuple(re.split(' +', line.strip())))
+
+notes = ''
+unique_names = set()
+clashed_names = set()
+for orig_point, dest_point, filename, name in remix_mapping:
+    if name in jq_names:
+        codepointstring = '{:04X}'.format(list(jq_names[name])[0])
+        if codepointstring != dest_point:
+            for _, p, fn, nn in remix_mapping:
+                if codepointstring == p:
+                    notes += '# Name clash: name: {}, old: {}, new: {} ({}), name at old pos: {}\n'.format(
+                        name, codepointstring, dest_point, orig_point, nn)
+                    clashed_names.add(name)
+                    break
+
+print('# Font Awesome mapping file')
+print('#')
+print('# FA-code NF-code filename name...')
+print('#')
+
+
+remix_mapping.sort(key=(lambda x: x[1]))
+for orig_point, dest_point, filename, name in remix_mapping:
+    all_names = [ name ] + list(set(collect_jq_names_for_one_codepoint(dest_point, name, clashed_names)))
+    for n in all_names:
+        if n not in unique_names:
+            unique_names.add(n)
+            continue
+        print("ERROR name duplicate found: ", n)
+        sys.exit(1)
+
+    print("{} {} {} {}".format(orig_point, dest_point, filename, ' '.join(all_names)))
+
+print(notes)