mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2024-05-14 22:42:33 +05:30
parent 5d3ea374d4
commit 9cdc1674cf
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kitty/fonts/core_text.py
View File

@@ -3,13 +3,12 @@
import itertools
import operator
import re
from collections import defaultdict
from functools import lru_cache
from typing import Dict, Generator, Iterable, List, Optional, Tuple
from kitty.fast_data_types import coretext_all_fonts
from kitty.fonts import FontSpec
from kitty.fonts import FontSpec, family_name_to_key
from kitty.options.types import Options
from kitty.typing import CoreTextFont
from kitty.utils import log_error
@@ -29,9 +28,9 @@ def create_font_map(all_fonts: Iterable[CoreTextFont]) -> FontMap:
ans: FontMap = {'family_map': {}, 'ps_map': {}, 'full_map': {}, 'variable_map': {}}
vmap: Dict[str, List[CoreTextFont]] = defaultdict(list)
for x in all_fonts:
f = (x['family'] or '').lower()
s = (x['style'] or '').lower()
ps = (x['postscript_name'] or '').lower()
f = family_name_to_key(x['family'])
s = family_name_to_key(x['style'])
ps = family_name_to_key(x['postscript_name'])
ans['family_map'].setdefault(f, []).append(x)
ans['ps_map'].setdefault(ps, []).append(x)
ans['full_map'].setdefault(f'{f} {s}', []).append(x)
@@ -104,7 +103,7 @@ def find_best_match(
family: str, bold: bool = False, italic: bool = False, monospaced: bool = True, ignore_face: Optional[CoreTextFont] = None,
prefer_variable: bool = False
) -> CoreTextFont:
q = re.sub(r'\s+', ' ', family.lower())
q = family_name_to_key(family)
font_map = all_fonts_map(monospaced)
scorer = create_scorer(bold, italic, monospaced, prefer_variable=prefer_variable)

6
kitty/fonts/fontconfig.py
View File

@@ -28,9 +28,9 @@ def create_font_map(all_fonts: Tuple[FontConfigPattern, ...]) -> FontMap:
for x in all_fonts:
if not x.get('path'):
continue
f = (x.get('family') or '').lower()
full = (x.get('full_name') or '').lower()
ps = (x.get('postscript_name') or '').lower()
f = family_name_to_key(x['family'])
full = family_name_to_key(x['full_name'])
ps = family_name_to_key(x['postscript_name'])
ans['family_map'].setdefault(f, []).append(x)
ans['ps_map'].setdefault(ps, []).append(x)
ans['full_map'].setdefault(full, []).append(x)