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

Cleanup repr for fontconfig faces

Browse Source
This commit is contained in:
Kovid Goyal
2024-05-10 11:03:14 +05:30
parent c1828fa2a4
commit 3e8ca9fa73
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/fonts/common.py
View File

@@ -252,8 +252,11 @@ def develop(family: str = '') -> None:
return str(face_from_descriptor(d)) return str(face_from_descriptor(d))
print('Medium :', s(ff['medium'])) print('Medium :', s(ff['medium']))
print()
print('Bold :', s(ff['bold'])) print('Bold :', s(ff['bold']))
print()
print('Italic :', s(ff['italic'])) print('Italic :', s(ff['italic']))
print()
print('Bold-Italic:', s(ff['bi'])) print('Bold-Italic:', s(ff['bi']))

21
kitty/freetype.c
View File

@@ -37,7 +37,6 @@ typedef struct {
unsigned int units_per_EM; unsigned int units_per_EM;
int ascender, descender, height, max_advance_width, max_advance_height, underline_position, underline_thickness, strikethrough_position, strikethrough_thickness; int ascender, descender, height, max_advance_width, max_advance_height, underline_position, underline_thickness, strikethrough_position, strikethrough_thickness;
int hinting, hintstyle; int hinting, hintstyle;
FaceIndex instance;
bool is_scalable, has_color, is_variable, has_svg; bool is_scalable, has_color, is_variable, has_svg;
float size_in_pts; float size_in_pts;
FT_F26Dot6 char_width, char_height; FT_F26Dot6 char_width, char_height;
@@ -236,7 +235,6 @@ init_ft_face(Face *self, PyObject *path, int hinting, int hintstyle, FONTS_DATA_
self->path = path; self->path = path;
Py_INCREF(self->path); Py_INCREF(self->path);
self->instance.val = self->face->face_index;
self->space_glyph_id = glyph_id_for_codepoint((PyObject*)self, ' '); self->space_glyph_id = glyph_id_for_codepoint((PyObject*)self, ' ');
return true; return true;
} }
@@ -256,7 +254,7 @@ face_equals_descriptor(PyObject *face_, PyObject *descriptor) {
if (!t) return false; if (!t) return false;
if (PyObject_RichCompareBool(face->path, t, Py_EQ) != 1) return false; if (PyObject_RichCompareBool(face->path, t, Py_EQ) != 1) return false;
t = PyDict_GetItemString(descriptor, "index"); t = PyDict_GetItemString(descriptor, "index");
if (t && PyLong_AsLong(t) != face->instance.val) return false; if (t && PyLong_AsLong(t) != face->face->face_index) return false;
return true; return true;
} }
@@ -290,7 +288,7 @@ face_from_descriptor(PyObject *descriptor, FONTS_DATA_HANDLE fg) {
if ((error = FT_Set_Named_Instance(self->face, index + 1))) return set_load_error(path, error); if ((error = FT_Set_Named_Instance(self->face, index + 1))) return set_load_error(path, error);
} }
PyObject *axes = PyDict_GetItemString(descriptor, "axes"); PyObject *axes = PyDict_GetItemString(descriptor, "axes");
if (axes) { if (axes && PyList_GET_SIZE(axes)) {
RAII_ALLOC(FT_Fixed, coords, malloc(sizeof(FT_Fixed) * PyList_GET_SIZE(axes))); RAII_ALLOC(FT_Fixed, coords, malloc(sizeof(FT_Fixed) * PyList_GET_SIZE(axes)));
for (Py_ssize_t i = 0; i < PyList_GET_SIZE(axes); i++) { for (Py_ssize_t i = 0; i < PyList_GET_SIZE(axes); i++) {
PyObject *t = PyList_GET_ITEM(axes, i); PyObject *t = PyList_GET_ITEM(axes, i);
@@ -352,13 +350,16 @@ dealloc(Face* self) {
static PyObject * static PyObject *
repr(Face *self) { repr(Face *self) {
const char *ps_name = FT_Get_Postscript_Name(self->face); const char *ps_name = FT_Get_Postscript_Name(self->face);
#define B(x) ((x) ? Py_True : Py_False)
FaceIndex instance;
instance.val = self->face->face_index;
return PyUnicode_FromFormat( return PyUnicode_FromFormat(
"Face(family=%s, style=%s, ps_name=%s, path=%S, ttc_index=%d, variation_index=0x%x is_scalable=%S, has_color=%S, ascender=%i, descender=%i, height=%i, underline_position=%i, underline_thickness=%i, strikethrough_position=%i, strikethrough_thickness=%i)", "Face(family=%s style=%s ps_name=%s path=%S ttc_index=%d variant=%S named_instance=%S scalable=%S color=%S)",
self->face->family_name ? self->face->family_name : "", self->face->style_name ? self->face->style_name : "", self->face->family_name ? self->face->family_name : "", self->face->style_name ? self->face->style_name : "",
ps_name ? ps_name: "", ps_name ? ps_name: "", self->path, instance.ttc_index,
self->path, self->instance.ttc_index, self->instance.variation_index, self->is_scalable ? Py_True : Py_False, self->has_color ? Py_True : Py_False, B(FT_IS_VARIATION(self->face)), B(FT_IS_NAMED_INSTANCE(self->face)), B(self->is_scalable), B(self->has_color)
self->ascender, self->descender, self->height, self->underline_position, self->underline_thickness, self->strikethrough_position, self->strikethrough_thickness
); );
#undef B
} }
const char* const char*
@@ -735,7 +736,9 @@ postscript_name(PyObject *s, PyObject *a UNUSED) {
static PyObject* static PyObject*
identify_for_debug(PyObject *s, PyObject *a UNUSED) { identify_for_debug(PyObject *s, PyObject *a UNUSED) {
Face *self = (Face*)s; Face *self = (Face*)s;
return PyUnicode_FromFormat("%s: %V:%d", FT_Get_Postscript_Name(self->face), self->path, "[path]", self->instance.val); FaceIndex instance;
instance.val = self->face->face_index;
return PyUnicode_FromFormat("%s: %V:%d", FT_Get_Postscript_Name(self->face), self->path, "[path]", instance.val);
} }
static PyObject* static PyObject*