Update Font Logos to 1.0.0

[why]
Before Font Logos 1.0.0 there was no stable-codepoint guarantee, and the
later revisions (0.18) reassigned the codepoints. That makes updating
for us very hard, because we would have to resort the icons or follow
the codepoint changes.

With 1.0.0 this changed. That new major release introduced not only a
codepoint guarantee, but it also shifted the codepoints from the F100
region to the F300 region, where we put them anyhow (in most cases).
That is one subset less with 'dynamic base codepoint'.

The reassignment of codepoints in Font Logos kept the codepoints stable
for the icons we already have in release 2.1.0. But at the moment the
2.2.0 Release Candidate (which updated Font Logos with commit 557b8da)
have added glyphs, which are on different points as compared with the
Font Logos 1.0.0 release.

What I want to say, we need to get this straight, before our 2.2.0 RC
turns into a Release 2.2.0.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
This commit is contained in:
Fini Jastrow 2022-07-07 08:03:45 +02:00 committed by Fini
parent 6e37782fcf
commit f9f3612e80
3 changed files with 22 additions and 21 deletions

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Font Logos (Font Linux) (44 icons)
# Codepoints: Nerd Fonts moved F100-F12D with holes → F300-F32D
# Font Logos (Font Linux) (48 icons)
# Codepoints: F300-F32F
# Nerd Fonts Version: 2.1.0
# Script Version: 1.1.0
test -n "$__i_linux_loaded" && return || __i_linux_loaded=1
@ -33,19 +33,23 @@ i='' i_linux_slackware_inverse=$i
i='' i_linux_tux=$i
i='' i_linux_ubuntu=$i
i='' i_linux_ubuntu_inverse=$i
i='' i_linux_flathub=$i
i='' i_linux_gnu_guix=$i
i='' i_linux_snappy=$i
i='' i_linux_void=$i
i='' i_linux_zorin=$i
i='' i_linux_budgie=$i
i='' i_linux_deepin=$i
i='' i_linux_illumos=$i
i='' i_linux_openbsd=$i
i='' i_linux_solus=$i
i='' i_linux_archlabs=$i
i='' i_linux_ferris=$i
i='' i_linux_pop_os=$i
i='' i_linux_artix=$i
i='' i_linux_kali_linux=$i
i='' i_linux_almalinux=$i
i='' i_linux_archlabs=$i
i='' i_linux_artix=$i
i='' i_linux_budgie=$i
i='' i_linux_deepin=$i
i='' i_linux_endeavour=$i
i='' i_linux_ferris=$i
i='' i_linux_flathub=$i
i='' i_linux_gnu_guix=$i
i='' i_linux_illumos=$i
i='' i_linux_kali_linux=$i
i='' i_linux_openbsd=$i
i='' i_linux_parrot=$i
i='' i_linux_pop_os=$i
i='' i_linux_rocky_linux=$i
i='' i_linux_snappy=$i
i='' i_linux_solus=$i
i='' i_linux_void=$i
i='' i_linux_zorin=$i
unset i

View file

@ -44,7 +44,6 @@ class font_patcher:
self.config = None # class 'configparser.ConfigParser'
self.sourceFont = None # class 'fontforge.font'
self.octiconsExactEncodingPosition = True
self.fontlinuxExactEncodingPosition = True
self.patch_set = None # class 'list'
self.font_dim = None # class 'dict'
self.onlybitmaps = 0
@ -471,8 +470,6 @@ class font_patcher:
# Prevent glyph encoding position conflicts between glyph sets
if self.args.fontawesome and self.args.octicons:
self.octiconsExactEncodingPosition = False
if self.args.fontawesome or self.args.octicons:
self.fontlinuxExactEncodingPosition = False
def setup_patch_set(self):
@ -611,7 +608,7 @@ class font_patcher:
{'Enabled': self.args.powersymbols, 'Name': "Power Symbols", 'Filename': "Unicode_IEC_symbol_font.otf", 'Exact': True, 'SymStart': 0x2B58, 'SymEnd': 0x2B58, 'SrcStart': None, 'SrcEnd': None, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT}, # Heavy Circle (aka Power Off)
{'Enabled': self.args.material, 'Name': "Material", 'Filename': "materialdesignicons-webfont.ttf", 'Exact': False, 'SymStart': 0xF001, 'SymEnd': 0xF847, 'SrcStart': 0xF500, 'SrcEnd': 0xFD46, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT},
{'Enabled': self.args.weather, 'Name': "Weather Icons", 'Filename': "weather-icons/weathericons-regular-webfont.ttf", 'Exact': False, 'SymStart': 0xF000, 'SymEnd': 0xF0EB, 'SrcStart': 0xE300, 'SrcEnd': 0xE3EB, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT},
{'Enabled': self.args.fontlinux, 'Name': "Font Logos (Font Linux)", 'Filename': "font-logos.ttf", 'Exact': self.fontlinuxExactEncodingPosition, 'SymStart': 0xF100, 'SymEnd': 0xF12D, 'SrcStart': 0xF300, 'SrcEnd': 0xF32D, 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT},
{'Enabled': self.args.fontlinux, 'Name': "Font Logos (Font Linux)", 'Filename': "font-logos.ttf", 'Exact': True, 'SymStart': 0xF300, 'SymEnd': 0xF32F, 'SrcStart': None, 'SrcEnd': None , 'ScaleGlyph': None, 'Attributes': SYM_ATTR_DEFAULT},
{'Enabled': self.args.octicons, 'Name': "Octicons", 'Filename': "octicons.ttf", 'Exact': self.octiconsExactEncodingPosition, 'SymStart': 0xF000, 'SymEnd': 0xF105, 'SrcStart': 0xF400, 'SrcEnd': 0xF505, 'ScaleGlyph': OCTI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, # Magnifying glass
{'Enabled': self.args.octicons, 'Name': "Octicons", 'Filename': "octicons.ttf", 'Exact': self.octiconsExactEncodingPosition, 'SymStart': 0x2665, 'SymEnd': 0x2665, 'SrcStart': None, 'SrcEnd': None, 'ScaleGlyph': OCTI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, # Heart
{'Enabled': self.args.octicons, 'Name': "Octicons", 'Filename': "octicons.ttf", 'Exact': self.octiconsExactEncodingPosition, 'SymStart': 0X26A1, 'SymEnd': 0X26A1, 'SrcStart': None, 'SrcEnd': None, 'ScaleGlyph': OCTI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, # Zap

Binary file not shown.