KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect handling of auto for bold and italic fonts on macOS

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-09 19:27:20 +05:30
parent a261e1f57d
commit 56e55ddbc3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/fonts/core_text.py
View File

@ -45,7 +45,7 @@ def find_best_match(font_map, family, bold, italic):
# Let CoreText choose the font if the family exists, otherwise # Let CoreText choose the font if the family exists, otherwise
# fallback to Menlo # fallback to Menlo
if q not in font_map['family_map']: if q not in font_map['family_map']:
safe_print('The font {} was not found, falling back to Menlo', file=sys.stderr) safe_print('The font {} was not found, falling back to Menlo'.format(family), file=sys.stderr)
family = 'Menlo' family = 'Menlo'
return { return {
'monospace': True, 'monospace': True,
@ -57,13 +57,12 @@ def find_best_match(font_map, family, bold, italic):
def get_face(font_map, family, main_family, font_size, dpi, bold=False, italic=False): def get_face(font_map, family, main_family, font_size, dpi, bold=False, italic=False):
def resolve_family(f): def resolve_family(f):
if f.lower() == 'monospace':
f = 'Menlo'
if (bold or italic) and f == 'auto': if (bold or italic) and f == 'auto':
f = main_family f = main_family
if f.lower() == 'monospace':
f = 'Menlo'
return f return f
family = resolve_family(family) descriptor = find_best_match(font_map, resolve_family(family), bold, italic)
descriptor = find_best_match(font_map, family, bold, italic)
return Face(descriptor, font_size, dpi) return Face(descriptor, font_size, dpi)