Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Tests/test_imagefont.py
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,15 @@ def test_anchor_invalid(font: ImageFont.FreeTypeFont) -> None:
d.multiline_textbbox((0, 0), "foo\nbar", anchor=anchor)


def test_has_characters(font: ImageFont.FreeTypeFont) -> None:
assert font.has_characters("")

assert font.has_characters("Test text")
assert font.has_characters(b"Test text")

assert not font.has_characters("Test \u0001")


@pytest.mark.parametrize("bpp", (1, 2, 4, 8))
def test_bitmap_font(layout_engine: ImageFont.Layout, bpp: int) -> None:
text = "Bitmap Font"
Expand Down
64 changes: 64 additions & 0 deletions docs/releasenotes/12.2.0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
12.2.0
------

Security
========

TODO
^^^^

TODO

:cve:`YYYY-XXXXX`: TODO
^^^^^^^^^^^^^^^^^^^^^^^

TODO

Backwards incompatible changes
==============================

TODO
^^^^

TODO

Deprecations
============

TODO
^^^^

TODO

API changes
===========

TODO
^^^^

TODO

API additions
=============

FreeTypeFont.has_characters
^^^^^^^^^^^^^^^^^^^^^^^^^^^

``ImageFont.FreeTypeFont`` has a new method for checking whether characters are present
in the font or not. :py:meth:`.ImageFont.FreeTypeFont.has_characters` will return
``True`` if all of the characters in the given string are available::

from PIL import ImageFont
font = ImageFont.truetype("Tests/fonts/FreeMono.ttf")
font.has_characters("Test") # True
font.has_characters(b"Test") # True
font.has_characters("\u2022") # True
font.has_characters("\u0000") # False

Other changes
=============

TODO
^^^^

TODO
1 change: 1 addition & 0 deletions docs/releasenotes/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ expected to be backported to earlier versions.
:maxdepth: 2

versioning
12.2.0
12.1.0
12.0.0
11.3.0
Expand Down
10 changes: 10 additions & 0 deletions src/PIL/ImageFont.py
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,16 @@ def fill(width: int, height: int) -> Image.core.ImagingCore:
start,
)

def has_characters(self, text: str | bytes) -> bool:
"""
Check if the font has all of the characters in the text.

:param text: Text to render.

:return: Boolean.
"""
return self.font.hascharacters(text)

def font_variant(
self,
font: StrOrBytesPath | BinaryIO | None = None,
Expand Down
1 change: 1 addition & 0 deletions src/PIL/_imagingft.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class Font:
lang: str | None,
/,
) -> float: ...
def hascharacters(self, string: str | bytes) -> bool: ...
def getvarnames(self) -> list[bytes]: ...
def getvaraxes(self) -> list[ImageFont.Axis]: ...
def setvarname(self, instance_index: int, /) -> None: ...
Expand Down
39 changes: 39 additions & 0 deletions src/_imagingft.c
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,44 @@ text_layout(
return count;
}

static PyObject *
font_hascharacters(FontObject *self, PyObject *args) {
int i;
char *buffer = NULL;
FT_ULong ch;
Py_ssize_t count;
FT_GlyphSlot glyph;
PyObject *string;

if (!PyArg_ParseTuple(args, "O", &string)) {
return NULL;
}

if (PyUnicode_Check(string)) {
count = PyUnicode_GET_LENGTH(string);
} else if (PyBytes_Check(string)) {
PyBytes_AsStringAndSize(string, &buffer, &count);
} else {
PyErr_SetString(PyExc_TypeError, "expected string or bytes");
return 0;
}
if (count == 0) {
return Py_True;
}

for (i = 0; i < count; i++) {
if (buffer) {
ch = buffer[i];
} else {
ch = PyUnicode_READ_CHAR(string, i);
}
if (FT_Get_Char_Index(self->face, ch) == 0) {
return Py_False;
}
}
return Py_True;
}

static PyObject *
font_getlength(FontObject *self, PyObject *args) {
int length; /* length along primary axis, in 26.6 precision */
Expand Down Expand Up @@ -1457,6 +1495,7 @@ static PyMethodDef font_methods[] = {
{"render", (PyCFunction)font_render, METH_VARARGS},
{"getsize", (PyCFunction)font_getsize, METH_VARARGS},
{"getlength", (PyCFunction)font_getlength, METH_VARARGS},
{"hascharacters", (PyCFunction)font_hascharacters, METH_VARARGS},
{"getvarnames", (PyCFunction)font_getvarnames, METH_NOARGS},
{"getvaraxes", (PyCFunction)font_getvaraxes, METH_NOARGS},
{"setvarname", (PyCFunction)font_setvarname, METH_VARARGS},
Expand Down
Loading