fonts/ryanoasis.nerd-fonts
1
0
Fork 0
mirror of https://github.com/ryanoasis/nerd-fonts.git synced 2026-09-10 07:36:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2024 from ryanoasis/bugfix/complex_symbol_fonts
Some checks failed
Docker release / Publish image (push) Has been cancelled
Details
Create FontPatcher.zip / build (push) Has been cancelled
Details

Browse source 
Fix symbolfont handling if glyphs have multiple codepoints
This commit is contained in:
Fini 2026-07-09 10:58:25 +02:00 committed by GitHub
parent 5bd4bbb8c3 191111446e
commit 4f133076f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
font-patcher
View file

@ -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.22.3"
script_version = "4.22.4"
version = "3.4.0"
projectName = "Nerd Fonts"
@ -1518,7 +1518,8 @@ class font_patcher:
sys.stdout.write("{} {} Glyphs from {} Set\n".format(
"Adding" if not modify else "Rescaling", glyphSetLength, setName))
currentSourceFontGlyph = -1 # initialize for the exactEncoding case
currentSymbolFontGlyph = -1 # Unicode of the copy source
currentSourceFontGlyph = -1 # Unicode of the copy target
width_warning = False
progressHeader = '{:21}'.format(setName)
@ -1531,7 +1532,33 @@ class font_patcher:
for index, sym_glyph in enumerate(symbolFontSelection):
sym_attr = attributes.get(sym_glyph.unicode)
# Find the codepoint of the current symbol glyph sym_glyph.
# Problem is we do not know the intended codepoint of the glyph
# because it came from a selection.byGlyphs: The glyph can have
# multiple codepoints or there might be skipped over glyphs.
# The iteration loop is still in the order of the selection by codepoint,
# i.e. we iterate with target codepoint regardless of reported glyph's codepoint.
# So we take the next allowed codepoint of the current glyph.
possible_codes = [ ]
if sym_glyph.unicode > currentSymbolFontGlyph:
possible_codes += [ sym_glyph.unicode ]
if sym_glyph.altuni:
possible_codes += [ v for v, s, r in sym_glyph.altuni if v > currentSymbolFontGlyph ]
if len(possible_codes) == 0:
logger.warning("Can not determine codepoint of %X. Skipping...", sym_glyph.unicode)
continue
currentSymbolFontGlyph = min(possible_codes)
if exactEncoding:
# Use the exact same hex values for the source font as for the symbol font.
currentSourceFontGlyph = currentSymbolFontGlyph
else:
# use source font defined hex values based on passed in start (fills gaps; symbols are packed)
currentSourceFontGlyph = sourceFontStart + sourceFontCounter
sourceFontCounter += 1
sym_attr = attributes.get(currentSymbolFontGlyph)
if sym_attr is None:
sym_attr = attributes['default']
@ -1539,26 +1566,6 @@ class font_patcher:
# Do not allow 'xy2' scaling
sym_attr['stretch'] = sym_attr['stretch'].replace('2', '')
if exactEncoding:
# Use the exact same hex values for the source font as for the symbol font.
# Problem is we do not know the codepoint of the sym_glyph and because it
# came from a selection.byGlyphs there might be skipped over glyphs.
# The iteration is still in the order of the selection by codepoint,
# so we take the next allowed codepoint of the current glyph
possible_codes = [ ]
if sym_glyph.unicode > currentSourceFontGlyph:
possible_codes += [ sym_glyph.unicode ]
if sym_glyph.altuni:
possible_codes += [ v for v, s, r in sym_glyph.altuni if v > currentSourceFontGlyph ]
if len(possible_codes) == 0:
logger.warning("Can not determine codepoint of %X. Skipping...", sym_glyph.unicode)
continue
currentSourceFontGlyph = min(possible_codes)
else:
# use source font defined hex values based on passed in start (fills gaps; symbols are packed)
currentSourceFontGlyph = sourceFontStart + sourceFontCounter
sourceFontCounter += 1
# For debugging process only limited glyphs
# if currentSourceFontGlyph != 0xe7bd:
# continue
@ -1592,7 +1599,7 @@ class font_patcher:
if dont_copy:
# Just prepare scaling of existing glyphs
glyph_scale_data = self.get_glyph_scale(sym_glyph.encoding, scaleRules, stretch, self.sourceFont, currentSourceFontGlyph) if scaleRules is not None else None
glyph_scale_data = self.get_glyph_scale(currentSymbolFontGlyph, scaleRules, stretch, self.sourceFont, currentSourceFontGlyph) if scaleRules is not None else None
else:
# Break apart multiple unicodes linking to one glyph
if currentSourceFontGlyph in self.sourceFont:
@ -1607,12 +1614,12 @@ class font_patcher:
self.sourceFont.encoding = 'UnicodeFull' # Rebuild encoding table (needed after altuni changes)
# This will destroy any content currently in currentSourceFontGlyph, so do it first
glyph_scale_data = self.get_glyph_scale(sym_glyph.encoding, scaleRules, stretch, symbolFont, currentSourceFontGlyph) if scaleRules is not None else None
glyph_scale_data = self.get_glyph_scale(currentSymbolFontGlyph, scaleRules, stretch, symbolFont, currentSourceFontGlyph) if scaleRules is not None else None
# Select and copy symbol from its encoding point
# We need to do this select after the careful check, this way we don't
# reset our selection before starting the next loop
symbolFont.selection.select(sym_glyph.encoding)
symbolFont.selection.select(currentSymbolFontGlyph)
symbolFont.copy()
# Paste it