mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 02:31:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Centralize FontSpec related code

Browse Source
This commit is contained in:
Kovid Goyal
2024-05-19 11:47:22 +05:30
parent c5fd544d25
commit 58c94105a3
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kitty/fonts/__init__.py
View File

@@ -3,6 +3,7 @@ from typing import TYPE_CHECKING, Dict, List, Literal, NamedTuple, Optional, Seq
from kitty.types import run_once
from kitty.typing import CoreTextFont, FontConfigPattern
from kitty.utils import shlex_split
if TYPE_CHECKING:
import re
@@ -145,6 +146,29 @@ class FontSpec(NamedTuple):
variable_name: Optional[str] = None
created_from_string: str = ''
@classmethod
def from_setting(cls, spec: str) -> 'FontSpec':
if spec == 'auto':
return FontSpec(system='auto', created_from_string=spec)
items = tuple(shlex_split(spec))
if '=' not in items[0]:
return FontSpec(system=spec, created_from_string=spec)
axes = {}
defined = {}
for item in items:
k, sep, v = item.partition('=')
if sep != '=':
raise ValueError(f'The font specification: {spec} is not valid as {item} does not contain an =')
if k in ('family', 'style', 'full_name', 'postscript_name', 'variable_name'):
defined[k] = v
else:
try:
axes[k] = float(v)
except Exception:
raise ValueError(f'The font specification: {spec} is not valid as {v} is not a number')
return FontSpec(axes=tuple(axes.items()), created_from_string=spec, **defined)
@property
def is_system(self) -> bool:
return bool(self.system)

20
kitty/options/utils.py
View File

@@ -1391,25 +1391,7 @@ def parse_mouse_map(val: str) -> Iterable[MouseMapping]:
def parse_font_spec(spec: str) -> FontSpec:
if spec == 'auto':
return FontSpec(system='auto', created_from_string=spec)
items = tuple(shlex_split(spec))
if '=' not in items[0]:
return FontSpec(system=spec, created_from_string=spec)
axes = {}
defined = {}
for item in items:
k, sep, v = item.partition('=')
if sep != '=':
raise ValueError(f'The font specification: {spec} is not valid as {item} does not contain an =')
if k in ('family', 'style', 'full_name', 'postscript_name', 'variable_name'):
defined[k] = v
else:
try:
axes[k] = float(v)
except Exception:
raise ValueError(f'The font specification: {spec} is not valid as {v} is not a number')
return FontSpec(axes=tuple(axes.items()), created_from_string=spec, **defined)
return FontSpec.from_setting(spec)
def deprecated_hide_window_decorations_aliases(key: str, val: str, ans: Dict[str, Any]) -> None: