Formatting, copyright years, documentation improvements.

13 files changed, 153 insertions, 123 deletions

diff --git a/include/freetype/cache/ftccache.h b/include/freetype/cache/ftccache.h
index 3bd247683..f7241af2e 100644
--- a/include/freetype/cache/ftccache.h
+++ b/include/freetype/cache/ftccache.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType internal cache interface (specification).                   */
 /*                                                                         */
-/*  Copyright 2000-2001, 2002, 2003, 2004, 2005 by                         */
+/*  Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -82,17 +82,18 @@ FT_BEGIN_HEADER
   FTC_Node_Destroy( FTC_Node     node,
                     FTC_Manager  manager );
 
+
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
   FT_BASE( void )
   ftc_node_destroy( FTC_Node     node,
                     FTC_Manager  manager );
-                    
+
   FT_BASE( void )
   ftc_node_done( FTC_Node     node,
                  FTC_Manager  manager );
-  
 #endif
 
+
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
diff --git a/include/freetype/cache/ftccmap.h b/include/freetype/cache/ftccmap.h
index 0b97704fa..638dc4bb2 100644
--- a/include/freetype/cache/ftccmap.h
+++ b/include/freetype/cache/ftccmap.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType charmap cache (specification).                              */
 /*                                                                         */
-/*  Copyright 2000-2001, 2003, 2005 by                                     */
+/*  Copyright 2000-2001, 2003, 2005, 2006 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -25,12 +25,14 @@
 
 FT_BEGIN_HEADER
 
-/* the FT 2.1.7 Charmap cache interface 
- *
- * unfortunately, it is not possible to implement it in later
- * versions, since some function signature changed too significantly
- * to do that.
- */
+
+  /*
+   *  The FreeType 2.1.7 Charmap cache interface.
+   *
+   *  Unfortunately, it is not possible to implement it in later versions,
+   *  since some function signatures changed too significantly to do that.
+   *
+   */
 
 #if 0
 
@@ -67,7 +69,6 @@ FT_BEGIN_HEADER
   } FTC_CMapDescRec, *FTC_CMapDesc;
 
 
-#if 0
   FT_EXPORT( FT_Error )
   FTC_CMapCache_New( FTC_Manager     manager,
                      FTC_CMapCache  *acache );
@@ -77,12 +78,12 @@ FT_BEGIN_HEADER
   FTC_CMapCache_Lookup( FTC_CMapCache  cache,
                         FTC_CMapDesc   cmap_desc,
                         FT_UInt32      char_code );
-#endif
                         
-#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+#endif /* 0 */
 
   /* */
 
+
 FT_END_HEADER
 
 
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 33704092b..bb1bbee6f 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -578,22 +578,26 @@ FT_BEGIN_HEADER
    * This temporary macro is used to control various optimizations for
    * reducing the heap footprint of memory-mapped TrueType files.
    */
-#define  FT_OPTIMIZE_MEMORY
+#define FT_OPTIMIZE_MEMORY
 
 
   /*
-   * This temporary macro is used to control whether we are going to
-   * compile certain functions like ft_mem_alloc in a way that prevents recent
-   * GCC releases from emitting zillions of `strict aliasing' warning
-   * messages each time a memory-management function is called.
+   * This temporary macro is used to control whether we are going to compile
+   * certain functions like ft_mem_alloc in a way that prevents recent GCC
+   * releases from emitting zillions of `strict aliasing' warning messages
+   * each time a memory-management function is called.
    */
-#define  FT_STRICT_ALIASING
+#define FT_STRICT_ALIASING
+
+
+  /*
+   * Define this variable if you want to keep the layout of internal
+   * structures that was used prior to FreeType 2.2.  This also compiles in
+   * a few obsolete functions to avoid linking problems on typical Unix
+   * distributions.
+   */
+#define FT_CONFIG_OPTION_OLD_INTERNALS
 
-/* define this variable if you want to keep the layout of internal structures
- * that was used prior to FreeType 2.2. This also compiles in a few obsolete
- * functions to avoid linking problems on typical Unix distributions
- */
-#define  FT_CONFIG_OPTION_OLD_INTERNALS
 
 FT_END_HEADER
 
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index fdc6b945c..f0910dfd2 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType Cache subsystem (specification).                            */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005 by                         */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -844,6 +844,7 @@ FT_BEGIN_HEADER
 
 #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
+
  /* */
 
 FT_END_HEADER
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 96412d3e9..946af7378 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -176,7 +176,7 @@ FT_BEGIN_HEADER
   /*    descriptor will be released.                                       */
   /*                                                                       */
   /*    The reason why this function takes an `library' parameter is       */
-  /*    simply to use ft_mem_free().                                           */
+  /*    simply to use ft_mem_free().                                       */
   /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Outline_Done( FT_Library   library,
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index 1fe2f7b9b..53d7a6770 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Arithmetic computations (specification).                             */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004,2005 by                          */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index dd86db9ca..44992d24f 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -59,7 +59,9 @@ FT_BEGIN_HEADER
   typedef FT_Error
   (*FT_Size_SelectFunc)( FT_Size   size,
                          FT_ULong  size_index );
+
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
   typedef FT_Error
   (*FT_Size_ResetPointsFunc)( FT_Size     size,
                               FT_F26Dot6  char_width,
@@ -71,6 +73,7 @@ FT_BEGIN_HEADER
   (*FT_Size_ResetPixelsFunc)( FT_Size  size,
                               FT_UInt  pixel_width,
                               FT_UInt  pixel_height );
+
 #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
   typedef FT_Error
@@ -198,8 +201,10 @@ FT_BEGIN_HEADER
     FT_Slot_DoneFunc          done_slot;
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
     FT_Size_ResetPointsFunc   set_char_sizes;
     FT_Size_ResetPixelsFunc   set_pixel_sizes;
+
 #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
     FT_Slot_LoadFunc          load_glyph;
@@ -208,20 +213,22 @@ FT_BEGIN_HEADER
     FT_Face_AttachFunc        attach_file;
     FT_Face_GetAdvancesFunc   get_advances;
 
-    /* since FT 2.2. */
+    /* since version 2.2 */
     FT_Size_RequestFunc       request_size;
     FT_Size_SelectFunc        select_size;
 
   } FT_Driver_ClassRec, *FT_Driver_Class;
 
 
-/* the following are used as stubs for 'set_char_sizes'
- * and 'set_pixel_sizes'. their implementation uses
- * 'request_size' and 'select_size' functions instead
- *
- * implementation is in src/base/ftobjs.c
- */
+  /*
+   *  The following functions are used as stubs for `set_char_sizes' and
+   *  `set_pixel_sizes'; the code uses `request_size' and `select_size'
+   *  functions instead.
+   *
+   *  Implementation is in `src/base/ftobjs.c'.
+   */
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
   FT_BASE( FT_Error )
   ft_stub_set_char_sizes( FT_Size     size,
                           FT_F26Dot6  width,
@@ -230,11 +237,13 @@ FT_BEGIN_HEADER
                           FT_UInt     vert_res );
 
   FT_BASE( FT_Error )
-  ft_stub_set_pixel_sizes( FT_Size   size,
-                           FT_UInt   width,
-                           FT_UInt   height );
+  ft_stub_set_pixel_sizes( FT_Size  size,
+                           FT_UInt  width,
+                           FT_UInt  height );
+
 #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
+
 FT_END_HEADER
 
 #endif /* __FTDRIVER_H__ */
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index 0114ffa80..8547c8db4 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -136,59 +136,60 @@ FT_BEGIN_HEADER
                      const char*  file_name,
                      FT_Long      line_no );
 
-#define FT_MEM_ALLOC( _pointer_, _size_ )                       \
+
+#define FT_MEM_ALLOC( _pointer_, _size_ )                           \
           (_pointer_) = ft_mem_alloc_debug( memory, _size_, &error, \
-                          __FILE__, __LINE__ )
+                                            __FILE__, __LINE__ )
 
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )               \
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )                   \
           (_pointer_) = ft_mem_realloc_debug( memory, _current_, _size_, \
-                          (_pointer_), &error,                       \
-                          __FILE__, __LINE__ )
+                                              (_pointer_), &error,       \
+                                              __FILE__, __LINE__ )
 
-#define FT_MEM_QALLOC( _pointer_, _size_ )                       \
+#define FT_MEM_QALLOC( _pointer_, _size_ )                           \
           (_pointer_) = ft_mem_qalloc_debug( memory, _size_, &error, \
-                          __FILE__, __LINE__ )
+                                             __FILE__, __LINE__ )
 
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ )               \
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ )                   \
           (_pointer_) = ft_mem_qrealloc_debug( memory, _current_, _size_, \
-                          (_pointer_), &error,                        \
-                          __FILE__, __LINE__ )
+                                               (_pointer_), &error,       \
+                                               __FILE__, __LINE__ )
 
-#define FT_MEM_FREE( _pointer_ )                                        \
-          FT_BEGIN_STMNT                                                \
-            if ( _pointer_ )                                            \
-            {                                                           \
+#define FT_MEM_FREE( _pointer_ )                                            \
+          FT_BEGIN_STMNT                                                    \
+            if ( _pointer_ )                                                \
+            {                                                               \
               ft_mem_free_debug( memory, (_pointer_), __FILE__, __LINE__ ); \
-              (_pointer_) = NULL;                                       \
-            }                                                           \
+              (_pointer_) = NULL;                                           \
+            }                                                               \
           FT_END_STMNT
 
 
 #else  /* !FT_DEBUG_MEMORY */
 
 
-#define FT_MEM_ALLOC( _pointer_, _size_ )                  \
+#define FT_MEM_ALLOC( _pointer_, _size_ )                      \
           (_pointer_) = ft_mem_alloc( memory, _size_, &error )
 
-#define FT_MEM_FREE( _pointer_ )              \
-          FT_BEGIN_STMNT                      \
-            if ( (_pointer_) )                \
-            {                                 \
+#define FT_MEM_FREE( _pointer_ )                  \
+          FT_BEGIN_STMNT                          \
+            if ( (_pointer_) )                    \
+            {                                     \
               ft_mem_free( memory, (_pointer_) ); \
-              (_pointer_) = NULL;             \
-            }                                 \
+              (_pointer_) = NULL;                 \
+            }                                     \
           FT_END_STMNT
 
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )         \
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )             \
           (_pointer_) = ft_mem_realloc( memory, _current_, _size_, \
-                                    (_pointer_), &error )
+                                        (_pointer_), &error )
 
-#define FT_MEM_QALLOC( _pointer_, _size_ )                  \
+#define FT_MEM_QALLOC( _pointer_, _size_ )                      \
           (_pointer_) = ft_mem_qalloc( memory, _size_, &error )
 
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ )         \
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ )             \
           (_pointer_) = ft_mem_qrealloc( memory, _current_, _size_, \
-                                     (_pointer_), &error )
+                                         (_pointer_), &error )
 
 #endif /* !FT_DEBUG_MEMORY */
 
@@ -245,7 +246,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
-  /*    ft_mem_alloc                                                           */
+  /*    ft_mem_alloc                                                       */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Allocates a new block of memory.  The returned area is always      */
@@ -398,53 +399,53 @@ FT_BEGIN_HEADER
 #ifdef FT_DEBUG_MEMORY
 
 
-#define FT_MEM_ALLOC( _pointer_, _size_ )              \
+#define FT_MEM_ALLOC( _pointer_, _size_ )                  \
           ft_mem_alloc_debug( memory, _size_,              \
-                          (void**)(void*)&(_pointer_), \
-                          __FILE__, __LINE__ )
+                              (void**)(void*)&(_pointer_), \
+                              __FILE__, __LINE__ )
 
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )   \
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )       \
           ft_mem_realloc_debug( memory, _current_, _size_,   \
-                            (void**)(void*)&(_pointer_), \
-                            __FILE__, __LINE__ )
+                                (void**)(void*)&(_pointer_), \
+                                __FILE__, __LINE__ )
 
-#define FT_MEM_QALLOC( _pointer_, _size_ )              \
+#define FT_MEM_QALLOC( _pointer_, _size_ )                  \
           ft_mem_qalloc_debug( memory, _size_,              \
-                           (void**)(void*)&(_pointer_), \
-                           __FILE__, __LINE__ )
+                               (void**)(void*)&(_pointer_), \
+                               __FILE__, __LINE__ )
 
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ )   \
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ )       \
           ft_mem_qrealloc_debug( memory, _current_, _size_,   \
-                             (void**)(void*)&(_pointer_), \
-                             __FILE__, __LINE__ )
+                                 (void**)(void*)&(_pointer_), \
+                                 __FILE__, __LINE__ )
 
-#define FT_MEM_FREE( _pointer_ )                              \
+#define FT_MEM_FREE( _pointer_ )                                  \
           ft_mem_free_debug( memory, (void**)(void*)&(_pointer_), \
-                         __FILE__, __LINE__ )
+                             __FILE__, __LINE__ )
 
 
 #else /* !FT_DEBUG_MEMORY */
 
 
-#define FT_MEM_ALLOC( _pointer_, _size_ )         \
+#define FT_MEM_ALLOC( _pointer_, _size_ )             \
           ft_mem_alloc( memory, _size_,               \
-                    (void**)(void*)&(_pointer_) )
+                        (void**)(void*)&(_pointer_) )
 
-#define FT_MEM_FREE( _pointer_ )                 \
+#define FT_MEM_FREE( _pointer_ )                     \
           ft_mem_free( memory,                       \
-                   (void**)(void*)&(_pointer_) )
+                       (void**)(void*)&(_pointer_) )
 
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
-          ft_mem_realloc( memory, _current_, _size_,       \
-                      (void**)(void*)&(_pointer_) )
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )  \
+          ft_mem_realloc( memory, _current_, _size_,    \
+                          (void**)(void*)&(_pointer_) )
 
-#define FT_MEM_QALLOC( _pointer_, _size_ )         \
+#define FT_MEM_QALLOC( _pointer_, _size_ )             \
           ft_mem_qalloc( memory, _size_,               \
-                     (void**)(void*)&(_pointer_) )
+                         (void**)(void*)&(_pointer_) )
 
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
-          ft_mem_qrealloc( memory, _current_, _size_,       \
-          (void**)(void*)&(_pointer_) )
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ )  \
+          ft_mem_qrealloc( memory, _current_, _size_,    \
+                           (void**)(void*)&(_pointer_) )
 
 
 #endif /* !FT_DEBUG_MEMORY */
diff --git a/include/freetype/internal/ftrfork.h b/include/freetype/internal/ftrfork.h
index 490949111..94402bcfa 100644
--- a/include/freetype/internal/ftrfork.h
+++ b/include/freetype/internal/ftrfork.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Embedded resource forks accessor (specification).                    */
 /*                                                                         */
-/*  Copyright 2004 by                                                      */
+/*  Copyright 2004, 2006 by                                                */
 /*  Masatake YAMATO and Redhat K.K.                                        */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -154,7 +154,7 @@ FT_BEGIN_HEADER
   /*    offsets ::                                                         */
   /*      The stream offsets for the resource data specified by `tag'.     */
   /*      This array is allocated by the function, so you have to call     */
-  /*      @ft_mem_free after use.                                              */
+  /*      @ft_mem_free after use.                                          */
   /*                                                                       */
   /*    count ::                                                           */
   /*      The length of offsets array.                                     */
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 43017dd07..6f8ba6cc8 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -792,7 +792,7 @@ FT_BEGIN_HEADER
 
     T1_CMap_Classes  t1_cmap_classes;
 
-    /* fields from here were added after 2.1.10 */
+    /* fields after this comment line were added after version 2.1.10 */
     const AFM_Parser_FuncsRec*  afm_parser_funcs;
 
   } PSAux_ServiceRec, *PSAux_Service;
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index 27d76c046..b9d0ab970 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -126,6 +126,7 @@ FT_BEGIN_HEADER
 
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
   /*************************************************************************/
   /*                                                                       */
   /* <FuncType>                                                            */
@@ -164,7 +165,6 @@ FT_BEGIN_HEADER
                                   SFNT_Header  sfnt );
 
 
-
   /*************************************************************************/
   /*                                                                       */
   /* <FuncType>                                                            */
@@ -174,11 +174,11 @@ FT_BEGIN_HEADER
   /*    Loads the table directory into a face object.                      */
   /*                                                                       */
   /* <Input>                                                               */
-  /*    face      :: A handle to the target face object.                   */
+  /*    face   :: A handle to the target face object.                      */
   /*                                                                       */
-  /*    stream    :: The input stream.                                     */
+  /*    stream :: The input stream.                                        */
   /*                                                                       */
-  /*    sfnt      :: The SFNT header.                                      */
+  /*    sfnt   :: The SFNT header.                                         */
   /*                                                                       */
   /* <Return>                                                              */
   /*    FreeType error code.  0 means success.                             */
@@ -192,8 +192,10 @@ FT_BEGIN_HEADER
   (*TT_Load_Directory_Func)( TT_Face      face,
                              FT_Stream    stream,
                              SFNT_Header  sfnt );
+
 #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <FuncType>                                                            */
@@ -362,6 +364,7 @@ FT_BEGIN_HEADER
 
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
   /*************************************************************************/
   /*                                                                       */
   /* <FuncType>                                                            */
@@ -388,6 +391,7 @@ FT_BEGIN_HEADER
                                  FT_UInt    y_ppem,
                                  FT_ULong*  astrike_index );
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <FuncType>                                                            */
@@ -413,9 +417,9 @@ FT_BEGIN_HEADER
   /*    released.                                                          */
   /*                                                                       */
   typedef FT_Error
-  (*TT_CharMap_Load_Func)( TT_Face       face,
-                           void*         cmap,
-                           FT_Stream     input );
+  (*TT_CharMap_Load_Func)( TT_Face    face,
+                           void*      cmap,
+                           FT_Stream  input );
 
 
   /*************************************************************************/
@@ -440,6 +444,7 @@ FT_BEGIN_HEADER
 
 #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <FuncType>                                                            */
@@ -651,6 +656,7 @@ FT_BEGIN_HEADER
     FT_Module_Requester          get_interface;
 
     TT_Load_Any_Func             load_any;
+
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     TT_Load_SFNT_HeaderRec_Func  load_sfnt_header;
     TT_Load_Directory_Func       load_directory;
@@ -673,13 +679,16 @@ FT_BEGIN_HEADER
     TT_Load_Table_Func           load_hdmx_stub;
     TT_Free_Table_Func           free_hdmx_stub;
 #endif
-    TT_Load_Table_Func           load_kern;  /* a.k.a load_kerning <= 2.1.10 */
+
+    /* this field was called `load_kerning' up to version 2.1.10 */
+    TT_Load_Table_Func           load_kern;
 
     TT_Load_Table_Func           load_gasp;
     TT_Load_Table_Func           load_pclt;
 
-    /* see `ttload.h' */
-    TT_Load_Table_Func           load_bhed;  /* a.k.a load_bitmap_header <= 2.1.10 */
+    /* see `ttload.h'; this field was called `load_bitmap_header' up to */
+    /* version 2.1.10                                                   */
+    TT_Load_Table_Func           load_bhed;
 
     /* see `ttsbit.h' */
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
@@ -688,6 +697,7 @@ FT_BEGIN_HEADER
 #endif
 
     TT_Load_SBit_Image_Func      load_sbit_image;
+
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     TT_Free_Table_Func           free_sbits_stub;
 #endif
@@ -696,23 +706,24 @@ FT_BEGIN_HEADER
     TT_Get_PS_Name_Func          get_psname;
     TT_Free_Table_Func           free_psnames;
 
-#ifdef FT_CONFIG_OPTION_OLD_INTERNALS  /* the following disappeared in 2.1.8, but were there before */
+#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     TT_CharMap_Load_Func         load_charmap_stub;
     TT_CharMap_Free_Func         free_charmap_stub;
 #endif
 
-    /* from here, the structure differs from 2.1.7 */
+    /* starting here, the structure differs from version 2.1.7 */
 
-    /* since FT 2.1.8, but appeared before 'get_psname' */
+    /* this field was introduced in version 2.1.8, named `get_psname' */
     TT_Face_GetKerningFunc       get_kerning;
 
-   /* the following appeared in 2.1.8, but were placed
-    * between 'load_sbits' and 'load_sbit_image'. BOOOOH
-    */
-    TT_Find_SBit_Image_Func      find_sbit_image;    /* NULL if FT_OPTIMIZE_MEMORY */
-    TT_Load_SBit_Metrics_Func    load_sbit_metrics;  /* NULL if FT_OPTIMIZE_MEMORY */
+    /* The following appeared in 2.1.8, but were placed between     */
+    /* `load_sbits' and `load_sbit_image'.  Both fields are NULL if */
+    /* FT_OPTIMIZE_MEMORY is used.                                  */
+    TT_Find_SBit_Image_Func      find_sbit_image;
+    TT_Load_SBit_Metrics_Func    load_sbit_metrics;
+
+    /* new elements introduced after version 2.1.10 */
 
-    /* since FreeType 2.2 */
     /* load the font directory, i.e., the offset table and */
     /* the table directory                                 */
     TT_Load_Table_Func           load_font_dir;
diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h
index d66d10974..65d9ca92e 100644
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@@ -200,14 +200,15 @@ FT_BEGIN_HEADER
     const void*     afm_data;
     FT_CharMapRec   charmaprecs[2];
     FT_CharMap      charmaps[2];
+
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
-    PS_Unicodes     unicode_map;  /* apparently unused, keep for old internals */
+    PS_Unicodes     unicode_map;
 #endif    
 
     /* support for Multiple Masters fonts */
     PS_Blend        blend;
 
-    /* since FT 2.1 - interface to PostScript hinter */
+    /* since version 2.1 - interface to PostScript hinter */
     const void*     pshinter;
 
   } T1_FaceRec;
@@ -222,10 +223,10 @@ FT_BEGIN_HEADER
     void*            afm_data;
     CID_Subrs        subrs;
 
-    /* since FT 2.1 - interface to PostScript hinter */
+    /* since version 2.1 - interface to PostScript hinter */
     void*            pshinter;
 
-    /* since FT 2.1.8, but was originally after 'afm_data' */
+    /* since version 2.1.8, but was originally positioned after `afm_data' */
     FT_Byte*         binary_data; /* used if hex data has been converted */
     FT_Stream        cid_stream;
 
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 3e71b308a..cc47a3d6a 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -5,7 +5,7 @@
 /*    Basic SFNT/TrueType type definitions and interface (specification    */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2004, 2005 by                               */
+/*  Copyright 1996-2001, 2002, 2004, 2005, 2006 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1383,16 +1383,17 @@ FT_BEGIN_HEADER
 
     const char*           postscript_name;
 
-    /* since FreeType 2.1.8, but was originally placed after 'glyph_locations_stub' */
+    /* since version 2.1.8, but was originally placed after */
+    /* `glyph_locations_stub'                               */
     FT_ULong              glyf_len;
 
-    /* since FreeType 2.1.8, but was originally placed before 'extra' */
+    /* since version 2.1.8, but was originally placed before `extra' */
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
     FT_Bool               doblend;
     GX_Blend              blend;
 #endif
 
-    /* since FreeType 2.2 */
+    /* since version 2.2 */
 
 #ifdef FT_OPTIMIZE_MEMORY
     FT_Byte*              horz_metrics;
@@ -1514,7 +1515,7 @@ FT_BEGIN_HEADER
     /* for possible extensibility in other formats */
     void*            other;
 
-    /* since FT 2.1.8 */
+    /* since version 2.1.8 */
     FT_Int           top_bearing;
     FT_Int           vadvance;
     FT_Vector        pp3;