Merge 93b4321 into 5477941

python-pillow · May 20, 2016 · 5af8573 · 5af8573
2 parents 5477941 + 93b4321
commit 5af8573
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 2 deletions.
diff --git a/PIL/ImageFont.py b/PIL/ImageFont.py
@@ -168,6 +168,20 @@ def font_variant(self, font=None, size=None, index=None, encoding=None):
                             index=self.index if index is None else index,
                             encoding=self.encoding if encoding is None else
                             encoding)
+    def hasglyphs(self, text):
+        """
+        Returns true if all the characters in the string exist in the font,
+        false otherwise.
+        """
+        return self.font.hasglyphs(text)
+
+    def getglyphs(self):
+        """
+        Return a string containing all the characters with matching glyphs in
+        the font
+        """
+        codes = self.font.getglyphs()
+        return ''.join(unichr(code) for code in codes)
 
 ##
 # Wrapper that creates a transposed font from any existing font

diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
@@ -52,6 +52,10 @@ def test_font_properties(self):
             ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
             self.assertEqual(ttf.path, FONT_PATH)
             self.assertEqual(ttf.size, FONT_SIZE)
+            self.assertTrue(ttf.hasglyphs('a'))
+            self.assertFalse(ttf.hasglyphs(u'a\ueeee'))
+            self.assertEqual(len(ttf.getglyphs()), 4160)
+            self.assertIn('a', ttf.getglyphs())
 
             ttf_copy = ttf.font_variant()
             self.assertEqual(ttf_copy.path, FONT_PATH)
@@ -63,6 +67,10 @@ def test_font_properties(self):
             second_font_path = "Tests/fonts/DejaVuSans.ttf"
             ttf_copy = ttf.font_variant(font=second_font_path)
             self.assertEqual(ttf_copy.path, second_font_path)
+            self.assertTrue(ttf_copy.hasglyphs('ae'))
+            self.assertFalse(ttf_copy.hasglyphs(u'a\ueeee'))
+            self.assertEqual(len(ttf.getglyphs()), 4160)
+            self.assertIn('a', ttf.getglyphs())
 
         def test_font_with_name(self):
             ImageFont.truetype(FONT_PATH, FONT_SIZE)

diff --git a/_imagingft.c b/_imagingft.c
@@ -244,11 +244,11 @@ font_getsize(FontObject* self, PyObject* args)
             y_max = bbox.yMax;
         if (bbox.yMin < y_min)
             y_min = bbox.yMin;
-            
+
         /* find max distance of baseline from top */
         if (face->glyph->metrics.horiBearingY > yoffset)
             yoffset = face->glyph->metrics.horiBearingY;
-            
+
         last_index = index;
         FT_Done_Glyph(glyph);
     }
@@ -319,6 +319,54 @@ font_getabc(FontObject* self, PyObject* args)
     return Py_BuildValue("ddd", a, b, c);
 }
 
+static PyObject*
+font_hasglyphs(FontObject* self, PyObject* args)
+{
+    int i;
+    FT_ULong ch;
+
+    /* calculate ABC values for a given string */
+
+    PyObject* string;
+    if (!PyArg_ParseTuple(args, "O:hasglyphs", &string))
+        return NULL;
+
+#if PY_VERSION_HEX >= 0x03000000
+    if (!PyUnicode_Check(string)) {
+#else
+    if (!PyUnicode_Check(string) && !PyString_Check(string)) {
+#endif
+        PyErr_SetString(PyExc_TypeError, "expected string");
+        return NULL;
+    }
+
+    for (i = 0; font_getchar(string, i, &ch); i++) {
+        int index;
+        index = FT_Get_Char_Index(self->face, ch);
+        if(!index)
+            return Py_False;
+    }
+    return Py_True;
+}
+
+static PyObject*
+font_getglyphs(FontObject* self)
+{
+    FT_UInt gindex = 0;
+    PyObject* characters = PyList_New(0);
+    if(!characters)
+        return PyErr_NoMemory();
+    FT_ULong charcode = 0;
+
+    charcode = FT_Get_First_Char(self->face, &gindex);
+    while( gindex != 0 ) {
+        PyList_Append(characters, PyLong_FromUnsignedLong(charcode));
+        charcode = FT_Get_Next_Char(self->face, charcode, &gindex);
+    }
+
+    return characters;
+}
+
 static PyObject*
 font_render(FontObject* self, PyObject* args)
 {
@@ -448,6 +496,8 @@ font_dealloc(FontObject* self)
 }
 
 static PyMethodDef font_methods[] = {
+    {"getglyphs", (PyCFunction) font_getglyphs, METH_VARARGS},
+    {"hasglyphs", (PyCFunction) font_hasglyphs, METH_VARARGS},
     {"render", (PyCFunction) font_render, METH_VARARGS},
     {"getsize", (PyCFunction) font_getsize, METH_VARARGS},
     {"getabc", (PyCFunction) font_getabc, METH_VARARGS},