freetype -> FreeType

Author: mdboom

doc/source/api.rst

@@ -3,7 +3,7 @@ Freetypy API documentation
 
 .. currentmodule:: freetypy
 
-The API closely follows the `freetype API
+The API closely follows the `FreeType API
 <http://freetype.org/freetype2/docs/reference/ft2-toc.html>`_.  It is
 not 100% complete, but it does contain the functionality that most
 would need.
@@ -12,7 +12,7 @@ Names have been modified to follow Python's `PEP8 style guidelines
 <http://www.python.org/dev/peps/pep-0008/>`_.
 
 Where appropriate, extra API functions have been added to make working
-with freetype more Pythonic.  These methods are marked with the
+with FreeType more Pythonic.  These methods are marked with the
 |freetypy| in the documentation.
 
 Face

doc/source/conf.py

@@ -240,7 +240,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'freetypy', u'freetypy Documentation',
-   u'Michael Droettboom', 'freetypy', 'Python wrappers for freetype',
+   u'Michael Droettboom', 'freetypy', 'Python wrappers for FreeType',
    'Fonts'),
 ]
 

doc/source/index.rst

@@ -6,7 +6,7 @@
 freetypy documentation
 ======================
 
-`freetypy` is a general-purpose Python wrapper to `freetype
+`freetypy` is a general-purpose Python wrapper to `FreeType
 <http://www.freetype.org>`_ with a goal to be fast and flexible as
 possible.
 

doc/source/intro.rst

@@ -1,7 +1,7 @@
 Introduction to freetypy
 ========================
 
-Since freetypy closely follows freetype's native C API, the `freetype
+Since freetypy closely follows FreeType's native C API, the `FreeType
 documentation <http://freetype.org/freetype2/docs/documentation.html>`_
 serves as a good introduction to freetypy as well.
 
@@ -22,7 +22,7 @@ Then the size (in points) must be selected::
     >>> face.set_char_size(48)
 
 Once that setup is performed, a glyph may be loaded.  We pass
-``load_flags=ft.LOAD.RENDER`` to tell freetype to load the glyph
+``load_flags=ft.LOAD.RENDER`` to tell FreeType to load the glyph
 outline and then subsequently render it to a bitmap::
 
     >>> glyph = face.load_char_unicode(u"S", load_flags=ft.LOAD.RENDER)

docstrings/bitmap.py

@@ -135,14 +135,14 @@
 - `LCD`: An 8-bit bitmap, representing RGB or BGR decimated glyph
   images used for display on LCD displays; the bitmap is three times
   wider than the original glyph image. See also `RENDER_MODE.LCD`.  On
-  many freetype builds, this functionality will be disabled due to
+  many FreeType builds, this functionality will be disabled due to
   patent restrictions, in which case the resulting bitmap will be
   grayscale.
 
 - `LCD_V`: An 8-bit bitmap, representing RGB or BGR decimated glyph
   images used for display on rotated LCD displays; the bitmap is three
   times taller than the original glyph image. See also
-  `RENDER_MODE.LCD_V`. On many freetype builds, this functionality
+  `RENDER_MODE.LCD_V`. On many FreeType builds, this functionality
   will be disabled due to patent restrictions, in which case the
   resulting bitmap will be grayscale.
 """

docstrings/face.py

@@ -346,22 +346,37 @@
 
 Face_tt_horiheader = """
 The TrueType horizontal header (`TT_HoriHeader`).
+
+Isn't present in all font files.  If missing, `AttributeError` is
+raised.
 """
 
 Face_tt_os2 = """
 The OS/2 TrueType header (`TT_OS2`).
+
+Isn't present in all font files.  If missing, `AttributeError` is
+raised.
 """
 
 Face_tt_pclt = """
 The PCLT header (`TT_Pclt`).
+
+Isn't present in all font files.  If missing, `AttributeError` is
+raised.
 """
 
 Face_tt_postscript = """
 The Postscript header (`TT_Postscript`).
+
+Isn't present in all font files.  If missing, `AttributeError` is
+raised.
 """
 
 Face_tt_vertheader = """
 The TrueType vertical header (`TT_VertHeader`).
+
+Isn't present in all font files.  If missing, `AttributeError` is
+raised.
 """
 
 Face_glyph = """
@@ -921,7 +936,7 @@
   rendered in non-monochrome modes.
 
 - `TARGET_LCD`: A variant of `LOAD.TARGET_NORMAL` optimized for
-  horizontally decimated LCD displays.  On many freetype builds, this
+  horizontally decimated LCD displays.  On many FreeType builds, this
   functionality will be disabled due to patent restrictions, in which
   case the resulting bitmap will be grayscale.
 

docstrings/subglyph.py

@@ -76,7 +76,7 @@
 
 - `TWOXTWO`: If set, there is a 2-by-2 transformation that will be
   used to scale the component. (|freetypy| This is named `2X2` in the
-  underlying freetype library, but was renamed here so it doesn't
+  underlying FreeType library, but was renamed here so it doesn't
   begin with a digit.)
 
 - `USE_MY_METRICS`: Use metrics from this component for the compound

src/freetypy.c

@@ -127,7 +127,7 @@ PyObject *freetypy_module;
 #else
     freetypy_module = Py_InitModule3(
         "_freetypy", module_methods,
-        "Freetype bindings");
+        "FreeType bindings");
 #endif
 
     if (freetypy_module == NULL) {

src/freetypy_error.c

@@ -49,10 +49,10 @@ int ftpy_exc(FT_Error error)
         entry = &errors[error];
         if (entry->code == 0) {
             PyErr_Format(
-                PyExc_RuntimeError, "unknown freetype exception %x", error);
+                PyExc_RuntimeError, "Unknown FreeType exception %x", error);
             return 1;
         } else {
-            PyErr_Format(entry->cls, "freetype error: %s", entry->msg);
+            PyErr_Format(entry->cls, "FreeType error %x: %s", error, entry->msg);
             return 1;
         }
     }

src/pyutil.h

@@ -60,10 +60,10 @@ int ftpy_setup_buffer_type(
 int setup_pyutil(PyObject *m);
 
 
-/* For an 8-bit string in Freetype that should be returned as a Unicode
+/* For an 8-bit string in FreeType that should be returned as a Unicode
    string in Python.  If NULL, return None to Python. */
 #define T_NULL_STRING_AS_UNICODE 0x10001
-/* For an 8-bit string in Freetype that should be returned as a Unicode
+/* For an 8-bit string in FreeType that should be returned as a Unicode
    string in Python.  Should never be NULL. */
 #define T_STRING_AS_UNICODE      0x10002
 /* FT_Fixed 16.16 fixed point values.  Returned to Python as a float. */