diff --git a/kitty/core_text.m b/kitty/core_text.m index 7ab9e8dee..ed5537483 100644 --- a/kitty/core_text.m +++ b/kitty/core_text.m @@ -69,9 +69,9 @@ font_descriptor_from_python(PyObject *src) { PyObject *t = PyDict_GetItemString(src, "traits"); if (t == NULL) { symbolic_traits = ( - (PyDict_GetItemString(src, "bold") == Py_True) ? kCTFontBoldTrait : 0 | - (PyDict_GetItemString(src, "italic") == Py_True) ? kCTFontItalicTrait : 0 | - (PyDict_GetItemString(src, "monospace") == Py_True) ? kCTFontMonoSpaceTrait : 0); + (PyDict_GetItemString(src, "bold") == Py_True ? kCTFontBoldTrait : 0) | + (PyDict_GetItemString(src, "italic") == Py_True ? kCTFontItalicTrait : 0) | + (PyDict_GetItemString(src, "monospace") == Py_True ? kCTFontMonoSpaceTrait : 0)); } else { symbolic_traits = PyLong_AsUnsignedLong(t); } diff --git a/kitty/freetype.c b/kitty/freetype.c index c5f2f1e4e..38c055ced 100644 --- a/kitty/freetype.c +++ b/kitty/freetype.c @@ -202,7 +202,9 @@ dealloc(Face* self) { static PyObject * repr(Face *self) { return PyUnicode_FromFormat( - "Face(path=%S, index=%d, is_scalable=%S, units_per_EM=%u, ascender=%i, descender=%i, height=%i, max_advance_width=%i max_advance_height=%i, underline_position=%i, underline_thickness=%i)", + "Face(family=%s, style=%s, ps_name=%s, path=%S, index=%d, is_scalable=%S, units_per_EM=%u, ascender=%i, descender=%i, height=%i, underline_position=%i, underline_thickness=%i)", + self->face->family_name ? self->face->family_name : "", self->face->style_name ? self->face->style_name : "", + FT_Get_Postscript_Name(self->face), self->path, self->index, self->is_scalable ? Py_True : Py_False, self->ascender, self->descender, self->height, self->max_advance_width, self->max_advance_height, self->underline_position, self->underline_thickness );