kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index 5056251..1519712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-01  Alexei Podtelezhnikov  >apodtele@gmail.com>
+
+	* builds/unix/freetype2.m4 (AC_CHECK_FT2): Fix spelling of warning
+	message.
+
+	* src/gxvalid/gxvmort1.c
+	(gxv_mort_subtable_type1_substTable_validate): Fix debugging
+	message.
+
 2007-01-31  Werner Lemberg  <wl@gnu.org>
 
 
@@ -1401,7 +1410,7 @@
 
 	* src/base/ftutil.c (ft_mem_qrealloc): Fix the function to accept
 	`item_size == 0' as well -- though this sounds weird, it can
-	theorically happen.  This fixes Savannah bug #16669.
+	theoretically happen.  This fixes Savannah bug #16669.
 
 	* src/pfr/pfrobjs.c (pfr_face_init): Fix the computation
 	of `face->num_glyphs' which missed the last glyph, due to
diff --git a/ChangeLog.20 b/ChangeLog.20
index 122c796..8fcc5e7 100644
--- a/ChangeLog.20
+++ b/ChangeLog.20
@@ -369,7 +369,7 @@
 
 	* src/cff/cffgload.c (CFF_Parse_CharStrings), src/psaux/t1decode.c
 	(T1_Decoder_Parse_Charstrings), src/pshinter/pshalgo2.c (*), Fixed a
-	bug where the X and Y axis where inversed in the postscript hinter.
+	bug where the X and Y axis where inverted in the postscript hinter.
 	This caused problem when displaying on non-square surfaces.
 
 	* src/pshinter/pshalgo2.c: s/vertical/dimension/.
@@ -790,7 +790,7 @@
 	* include/freetype/internal/ftmemory.h, src/base/ftdbgmem.c:
 	Improvements to the memory debugger to report more information in
 	case of errors.  Also, some allocations that occurred through REALLOC
-	couldn't be previously catched correctly.
+	couldn't be previously caught correctly.
 
 	* src/autohint/ahglyph.c (ah_outline_compute_segments,
 	ah_outline_compute_edges), src/raster/ftraster.c (ft_black_new),
@@ -862,7 +862,7 @@
 
 	* src/type1/t1load.c (parse_font_name, parse_subrs): Added a test
 	for when loading synthetic fonts to make sure that the font name
-	and subrotuines are not loaded twice.  This is to remove a memory
+	and subroutines are not loaded twice.  This is to remove a memory
 	leak that occurred because the original memory blocks for these
 	objects were not deallocated when the objects were parsed the
 	second time.
@@ -1157,7 +1157,7 @@
 	supports glyph names.
 
 	* include/freetype/internal/ftobjs.h (FT_Name_Index_Requester):
-	New function pointer type defintion used in the function
+	New function pointer type definition used in the function
 	FT_Get_Name_Index.
 
 	* include/freetype/freetype.h (FT_Get_Name_Index): Added
@@ -1618,7 +1618,7 @@
 	* builds/compiler/gcc-dev.mk: Add `-Wno-long-long' flag.
 
 	* include/freetype/internal/ftcalc.h: Define FT_SqrtFixed()
-	uncoditionally.
+	unconditionally.
 	* src/base/ftbbox.c: Include FT_INTERNAL_CALC_H.
 	Fix compiler warnings.
 	* src/base/ftcalc.c: Fix (potential) compiler warnings.
@@ -2482,7 +2482,7 @@
 2000-11-29  ??? ???  <darin@eazel.com>
 
 	* include/freetype/internal/ftdebug.h: Replaced FT_CAT and FT_XCAT
-	with a direct solution (which also satifies picky compilers).
+	with a direct solution (which also satisfies picky compilers).
 
 2000-11-28  YAMANO-UCHI Hidetoshi  <mer@din.or.jp>
 
@@ -2597,7 +2597,7 @@
 
 ----------------------------------------------------------------------------
 
-Copyright 2000, 2001, 2002 by
+Copyright 2000, 2001, 2002, 2007 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This file is part of the FreeType project, and may only be used, modified,
diff --git a/ChangeLog.21 b/ChangeLog.21
index fddb130..1d8bb30 100644
--- a/ChangeLog.21
+++ b/ChangeLog.21
@@ -683,7 +683,7 @@
 	FT_QRENEW_ARRAY, FT_ALLOC_ARRAY, FT_REALLOC_ARRAY): Updated.
 
 	* include/freetype/internal/ftserv.h (FT_FACE_FIND_SERVICE,
-	FT_FACE_FIND_GLOBAL_SERVICE, FT_FACE_LOOKUP_SERVICE) [__cpluscplus]:
+	FT_FACE_FIND_GLOBAL_SERVICE, FT_FACE_LOOKUP_SERVICE) [__cplusplus]:
 	Provide macro versions which avoid compiler warnings.
 
 	* src/base/ftutil.c (ft_highpow2): New utility function.
@@ -1220,7 +1220,7 @@
 
 2004-11-16  Owen Taylor  <otaylor@redhat.com>
 
-	* builds/unix/freetype-config.in: Supress -L$libdir for
+	* builds/unix/freetype-config.in: Suppress -L$libdir for
 	/usr/lib64 as well as /usr/lib. (Reported by Dan Winship -
 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=139199)
 
@@ -1544,7 +1544,7 @@
 	(otl_pos_class_set_validate, otl_pos_class_rule_validate): Removed.
 	(otl_gpos_lookup7_validate): Complete code for format 2.
 	(otl_chain_pos_class_rule_validate,
-	otl_chaim_pos_class_set_validate): Removed.
+	otl_chain_pos_class_set_validate): Removed.
 	(otl_gpos_lookup8_validate): Don't call
 	otl_chain_pos_class_set_validate but
 	otl_chain_pos_rule_set_validate.
@@ -1738,7 +1738,7 @@
 
 	* src/otlayout/otlbase.c (otl_base_coord_validate): Fix call to
 	otl_device_table_validate.
-	(otl_base_scsript_validate): Add missing variable declarations.
+	(otl_base_script_validate): Add missing variable declarations.
 	(otl_base_script_list_validate): Fix call to
 	otl_base_script_validate.
 	(otl_axis_table_validate): Fix calls to otl_base_tag_list_validate
@@ -3292,7 +3292,7 @@
 
 2004-01-22  Werner Lemberg  <wl@gnu.org>
 
-	Add support for the hexadicimal representation of binary data
+	Add support for the hexadecimal representation of binary data
 	started with `StartData' in CID-keyed Type 1 fonts.
 
 	* include/freetype/internal/t1types.h (CID_FaceRec): Add new
@@ -4565,7 +4565,7 @@
 	is now of type `FT_Module_Requester'.
 	(SFNT_Get_Interface_Func, SFNT_Load_Table_Func): Function pointers
 	moved (in modified form) to...
-	* include/freetype/internal/servies/sfnt.h: New file.
+	* include/freetype/internal/services/sfnt.h: New file.
 
 	* include/freetype/tttables.h (FT_Get_Sfnt_Table_Func): Function
 	pointer moved (in modified form) to `services/sfnt.h'.
@@ -6554,7 +6554,7 @@
 	src/otlayout/otlgsub.c, src/otlayout/otlgsub.h,
 	src/otlayout/otlparse.c, src/otlayout/otlparse.h,
 	src/otlayout/otlutils.h: Updating the OpenType Layout code, adding
-	support fot the first GSUB lookups.  Nothing that really compiles
+	support for the first GSUB lookups.  Nothing that really compiles
 	for now though.
 
 	* src/autohint/ahhint.c (ah_align_serif_edge): Disabled serif stem
@@ -8066,7 +8066,7 @@
 
 	* src/cache/ftccache.c (ftc_node_hash_unlink): Fixed a
 	bug that caused nasty memory overwrites.  The hash table's
-	buckets array wasn't correctly resized when shrinked.
+	buckets array wasn't correctly resized when shrunk.
 
 2002-06-08  Detlef Würkner  <TetiSoft@apg.lahn.de>
 
@@ -8236,7 +8236,7 @@
 	* include/freetype/config/ftheader.h (FT_XFREE86_H): New macro (not
 	documented yet).
 
-	* src/base/fttype1.c: New file, provoding two new API functions
+	* src/base/fttype1.c: New file, providing two new API functions
 	(FT_Get_PS_Font_Info and FT_Has_PS_Glyph_Names).
 	* include/freetype/t1tables.h: Updated.
 
@@ -9086,7 +9086,7 @@
 	SFNT/TrueType type definitions.
 
 	* include/freetype/freetype.h, include/freetype/internal/ftgloadr.h:
-	Updating type defintiions for the glyph loader.
+	Updating type definitions for the glyph loader.
 
 2002-03-13  Antoine Leca  <antoine@oriolnet.com>
 
@@ -9423,7 +9423,7 @@
 
 ----------------------------------------------------------------------------
 
-Copyright 2002, 2003, 2004, 2005 by
+Copyright 2002, 2003, 2004, 2005, 2007 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This file is part of the FreeType project, and may only be used, modified,
diff --git a/ChangeLog.22 b/ChangeLog.22
index 8d3da4d..22bf4f9 100644
--- a/ChangeLog.22
+++ b/ChangeLog.22
@@ -143,7 +143,7 @@
 2006-05-02  David Turner  <david@freetype.org>
 
 	Update the memory management functions and macros to safely deal
-	with array size buffer overflows.  This corresponds to attemps to
+	with array size buffer overflows.  This corresponds to attempts to
 	allocate arrays that are too large.  For an example, consider the
 	following code:
 
@@ -1531,7 +1531,7 @@
 	* src/base/ftobjs.c (FT_Load_Glyph): Resolve flag dependencies and
 	decide whether to use the auto-hinter according to documentation.
 	There should to be no real difference.
-	Some checks (e.g., is text height positve?) after the glyph is
+	Some checks (e.g., is text height positive?) after the glyph is
 	loaded.
 	(FT_Select_Size, FT_Request_Size): Scales are set to wrong values.
 	Be careful that scales won't be negative.
@@ -1823,7 +1823,7 @@
 	FT_SERVICE_BDF_H.
 	(sfnt_get_charset_it) [TT_CONFIG_OPTION_BDF]: New function.
 	(sfnt_service_bdf) [TT_CONFIG_OPTION_BDF]: New service.
-	(sfnt_servives) [TT_CONFIG_OPTION_BDF]: Add sfnt_service_bdf.
+	(sfnt_services) [TT_CONFIG_OPTION_BDF]: Add sfnt_service_bdf.
 
 	* src/sfnt/sfnt.c [TT_CONFIG_OPTION_BDF]: Include ttbdf.c.
 
@@ -2307,7 +2307,7 @@
 
 	`SING Glyphlet' is an extension to OpenType developed by Adobe
 	primarily to facilitate adding supplemental glyphs to an OpenType
-	font (with emphasis on, but not necessariy limited to, gaiji to a
+	font (with emphasis on, but not necessarily limited to, gaiji to a
 	CJK font).  A SING Glyphlet Font is an OpenType font that contains
 	the outline(s), either in a `glyf' or `CFF' table, for a glyph;
 	`cmap', `BASE', and `GSUB' tables are present with the same format
@@ -2637,7 +2637,7 @@
 	* src/truetype/ttgload.c: Heavy cleanup and refactoring.
 	(org_to_cur): Removed.
 	(TT_Load_Simple_Glyph): Call FT_GlyphLoader_CheckPoints.
-	(TT_Hint_Glyph): New funcion to hint a zone, prepared by caller.
+	(TT_Hint_Glyph): New function to hint a zone, prepared by caller.
 	(TT_Process_Simple_Glyph): s/load/loader/.
 	Use loader->pp values instead of recalculation.
 	Use TT_Hint_Glyph.
@@ -2821,7 +2821,7 @@
 
 ----------------------------------------------------------------------------
 
-Copyright 2005, 2006 by
+Copyright 2005, 2006, 2007 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This file is part of the FreeType project, and may only be used, modified,
diff --git a/builds/amiga/src/base/ftsystem.c b/builds/amiga/src/base/ftsystem.c
index a9a3627..016f1e2 100644
--- a/builds/amiga/src/base/ftsystem.c
+++ b/builds/amiga/src/base/ftsystem.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType low-level system interface (body).           */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2006 by                               */
+/*  Copyright 1996-2001, 2002, 2005, 2006, 2007 by                         */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -33,7 +33,7 @@
   /* malloc(), realloc(), and free().                                      */
   /*                                                                       */
   /* Those C library functions are often not thread-safe or cant be        */
-  /* used in a shared Amiga library. If thats not a problem for you,       */
+  /* used in a shared Amiga library. If that's not a problem for you,       */
   /* you can of course use the default ftsystem.c with C library calls     */
   /* instead.                                                              */
   /*                                                                       */
diff --git a/builds/mac/README b/builds/mac/README
index e976ca4..edd57b1 100644
--- a/builds/mac/README
+++ b/builds/mac/README
@@ -104,7 +104,7 @@ environment by Metrowerks. GCC for MPW and Symantec
       MacOS 9. Carbon API is used.
 
     At present, static library is only supported,
-    although targets except of m68k_far are capatble
+    although targets except of m68k_far are capable
     to use shared library.
 
     MPW makefile syntax uses 8bit characters. To keep
@@ -189,7 +189,7 @@ environment by Metrowerks. GCC for MPW and Symantec
 
   At present, MPW makefiles and CW project file are
   just updated versions of these by Leonard. Some
-  modules are added after the last maintainance, they
+  modules are added after the last maintenance, they
   are not included.
 
   4-2. Working test with ftdemos
@@ -197,7 +197,7 @@ environment by Metrowerks. GCC for MPW and Symantec
 
   At present, MPW makefiles and CW project file can
   build FreeType for classic MacOS. But their working
-  behaviours are not tested at all. Buidling ftdemos
+  behaviours are not tested at all. Building ftdemos
   for classic MacOS and working test is required.
 
   4-3. Porting Jam onto MPW
@@ -233,7 +233,7 @@ APPENDIX I
 
   * resolving font name to font file
   The font menu of MacOS application prefers font name
-  written in FOND resource than sfnt resoure. FreeType2
+  written in FOND resource than sfnt resource. FreeType2
   provides functions to find font file by name in MacOS
   application, they are based on QuickDraw Font Manager
   and Apple Type Service framework of MacOS.
@@ -376,7 +376,7 @@ ATSFontGetFileSpecification()         |    x    |    x    |    x    |    x    | 
     In the "Classic": the original binary executable
     format, these framework functions are directly
     transformed to MacOS system call. Therefore, the
-    exact availabilitly should be checked by running
+    exact availability should be checked by running
     system.
 
     (**)
@@ -392,7 +392,7 @@ ATSFontGetFileSpecification()         |    x    |    x    |    x    |    x    | 
     ATS font manager is not published in these versions.
 
 ------------------------------------------------------------
-Last update: 2006/01/10, by suzuki toshiya
+Last update: 2007-Feb-01, by Alexei Podtelezhnikov.
 
 Currently maintained by
 	suzuki toshiya, <mpsuzuki@hiroshima-u.ac.jp>
diff --git a/builds/unix/freetype2.m4 b/builds/unix/freetype2.m4
index cf6b0ab..d1da07d 100644
--- a/builds/unix/freetype2.m4
+++ b/builds/unix/freetype2.m4
@@ -1,7 +1,7 @@
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
 #
-# Copyright 2001, 2003 by
+# Copyright 2001, 2003, 2007 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -176,7 +176,7 @@ main()
   The FreeType test program failed to run.  If your system uses
   shared libraries and they are installed outside the normal
   system library path, make sure the variable LD_LIBRARY_PATH
-  (or whatever is appropiate for your system) is correctly set.
+  (or whatever is appropriate for your system) is correctly set.
          ])
        fi
      fi
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index 7e35060..1906539 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2004, 2006 by
+# Copyright 1996-2000, 2003, 2004, 2006, 2007 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -48,7 +48,7 @@ ifeq ($(PLATFORM),ansi)
     #
     # Note that on Windows NT, such an environment variable will not be seen
     # from DOS-based tools like DJGPP's make; this is not actually a problem
-    # since NT is detected independantly above.  But do not try to be clever!
+    # since NT is detected independently above.  But do not try to be clever!
     #
     ifdef winbootdir
       ifdef windir
diff --git a/docs/CHANGES b/docs/CHANGES
index 8ad4e66..95a7a94 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -2692,7 +2692,7 @@ High-Level Interface:
       FT_New_Size or FT_New_Glyph.
 
     - similarly,  FT_Load_Glyph  now  only  takes  a  `face'  argument
-      (instead  of a  glyph  slot  and a  size).  Also, it's  `result'
+      (instead  of a  glyph  slot  and a  size).  Also,  its  `result'
       parameter is  gone, as the glyph  image type is  returned in the
       field `face->glyph.format'
 
diff --git a/docs/raster.txt b/docs/raster.txt
index c263398..95d9e24 100644
--- a/docs/raster.txt
+++ b/docs/raster.txt
@@ -3,7 +3,7 @@
 
                           by David Turner
 
-                        Revised 2003-Dec-08
+                        Revised 2007-Feb-01
 
 
 This file  is an  attempt to explain  the internals of  the FreeType
@@ -529,7 +529,7 @@ II. Rendering Technology
     for each scanline.
 
     In  the case  of segments,  the computation  is straightforward,
-    using  the  Euclidian   algorithm  (also  known  as  Bresenham).
+    using  the  Euclidean   algorithm  (also  known  as  Bresenham).
     However, for Bézier arcs, the job is a little more complicated.
 
     We assume  that all Béziers that  are part of a  profile are the
@@ -618,7 +618,7 @@ II. Rendering Technology
 
 ------------------------------------------------------------------------
 
-Copyright 2003 by
+Copyright 2003, 2007 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file  is  part  of the  FreeType  project, and may  only be  used,
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 17ad31f..4c20a68 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -1563,7 +1563,7 @@
                  check_points( builder, 6 )               )
               goto Fail;
 
-            /* Record the starting point's y postion for later use */
+            /* Record the starting point's y position for later use */
             start_y = y;
 
             /* first control point */
@@ -1666,7 +1666,7 @@
                  check_points( builder, 6 )               )
               goto Fail;
 
-            /* record the starting point's x, y postion for later use */
+            /* record the starting point's x, y position for later use */
             start_x = x;
             start_y = y;
 
diff --git a/src/gxvalid/README b/src/gxvalid/README
index 8f95414..28e535b 100644
--- a/src/gxvalid/README
+++ b/src/gxvalid/README
@@ -118,7 +118,7 @@ gxvalid: TrueType GX validator
     this `State  Machine' in a  `StateTable' data structure.   While the
     State  Machine receives  a series  of glyph  IDs, the  State Machine
     starts with `start  of text' state, walks around  various states and
-    generates various  layout informations to the  renderer, and finally
+    generates various  layout information  to the  renderer, and finally
     reaches the `end of text' state.
 
     gxvalid can check essential errors like:
@@ -401,8 +401,8 @@ gxvalid: TrueType GX validator
       but the Apple TrueType specification does not mention the subtable
       formats available in the classic version.
 
-    5-2-2. Avaibale subtable formats in classic version
-    ---------------------------------------------------
+    5-2-2. Available subtable formats in classic version
+    ----------------------------------------------------
 
       Although the  Apple TrueType  specification recommends to  use the
       classic version in  the case if the font is  designed for both the
@@ -518,7 +518,7 @@ gxvalid: TrueType GX validator
 
 ------------------------------------------------------------------------
 
-Copyright 2004, 2005 by
+Copyright 2004, 2005, 2007 by
 suzuki toshiya, Masatake YAMATO, Red hat K.K.,
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
diff --git a/src/gxvalid/gxvmort1.c b/src/gxvalid/gxvmort1.c
index 0b4c180..0575b12 100644
--- a/src/gxvalid/gxvmort1.c
+++ b/src/gxvalid/gxvmort1.c
@@ -5,7 +5,7 @@
 /*    TrueTypeGX/AAT mort table validation                                 */
 /*    body for type1 (Contextual Substitution) subtable.                   */
 /*                                                                         */
-/*  Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K.,       */
+/*  Copyright 2005, 2007 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -188,7 +188,7 @@
     FT_UShort  i;
 
 
-    GXV_NAME_ENTER( "validating contents of substitionTable" );
+    GXV_NAME_ENTER( "validating contents of substitutionTable" );
     for ( i = 0; i < num_gids ; i ++ )
     {
       FT_UShort  dst_gid;
@@ -215,7 +215,7 @@
 
 
   /*
-   * subtable for Contextual glyph substition is a modified StateTable.
+   * subtable for Contextual glyph substitution is a modified StateTable.
    * In addition to classTable, stateArray, and entryTable, the field
    * `substitutionTable' is added.
    */
diff --git a/src/gxvalid/gxvmorx1.c b/src/gxvalid/gxvmorx1.c
index 4090be9..331d4cc 100644
--- a/src/gxvalid/gxvmorx1.c
+++ b/src/gxvalid/gxvmorx1.c
@@ -5,7 +5,7 @@
 /*    TrueTypeGX/AAT morx table validation                                 */
 /*    body for type1 (Contextual Substitution) subtable.                   */
 /*                                                                         */
-/*  Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K.,       */
+/*  Copyright 2005, 2007 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -229,7 +229,7 @@
 
 
   /*
-   * subtable for Contextual glyph substition is a modified StateTable.
+   * subtable for Contextual glyph substitution is a modified StateTable.
    * In addition to classTable, stateArray, entryTable, the field
    * `substitutionTable' is added.
    */
diff --git a/src/pcf/README b/src/pcf/README
index 2798d27..cc1480b 100644
--- a/src/pcf/README
+++ b/src/pcf/README
@@ -12,7 +12,7 @@ in X world. This code implements a PCF driver for the FreeType library.
 Glyph images are loaded into memory only on demand, thus leading to a small
 memory footprint.
 
-Informations on the PCF font format can only be worked out from
+Information on the PCF font format can only be worked out from
 `pcfread.c', and `pcfwrite.c', to be found, for instance, in the XFree86
 (www.xfree86.org) source tree (xc/lib/font/bitmap/).
 
@@ -75,7 +75,7 @@ ink_metrics.
 
 - height is defined as (ascent - descent).  Is this correct?
 
-- if unable to read size informations from the font, PCF_Init_Face
+- if unable to read size information from the font, PCF_Init_Face
   sets available_size->width and available_size->height to 12.
 
 - too many english grammar errors in the readme file :-(
diff --git a/src/tools/docmaker/content.py b/src/tools/docmaker/content.py
index 6f8ac94..b14c52e 100644
--- a/src/tools/docmaker/content.py
+++ b/src/tools/docmaker/content.py
@@ -1,6 +1,7 @@
+#  Content (c) 2002, 2004, 2006, 2007 David Turner <david@freetype.org>
 #
-#  this file contains routines used to parse the content of documentation
-#  comment block and build a more structured objects out of them
+#  This file contains routines used to parse the content of documentation
+#  comment blocks and build more structured objects out of them.
 #
 
 from sources import *
@@ -8,7 +9,7 @@ from utils import *
 import string, re
 
 
-# this regular expresion is used to detect code sequences. these
+# this regular expression is used to detect code sequences. these
 # are simply code fragments embedded in '{' and '}' like in:
 #
 #  {
@@ -19,7 +20,7 @@ import string, re
 #    }
 #  }
 #
-# note that identation of the starting and ending accolades must be
+# note that indentation of the starting and ending accolades must be
 # exactly the same. the code sequence can contain accolades at greater
 # indentation
 #
@@ -583,3 +584,5 @@ class DocBlock:
             return m.fields[0].items
         except:
             return None
+
+# eof
diff --git a/src/tools/docmaker/formatter.py b/src/tools/docmaker/formatter.py
index eaa5d69..363410e 100644
--- a/src/tools/docmaker/formatter.py
+++ b/src/tools/docmaker/formatter.py
@@ -1,14 +1,17 @@
+#  Formatter (c) 2002, 2004, 2007 David Turner <david@freetype.org>
+#
+
 from sources import *
 from content import *
 from utils   import *
 
-# This is the base Formatter class. its purpose is to convert
-# a content processor's data into specific documents (i.e. table of
+# This is the base Formatter class.  Its purpose is to convert
+# a content processor's data into specific documents (i.e., table of
 # contents, global index, and individual API reference indices).
 #
-# You'll need to sub-class it to output anything sensible.  For example,
+# You need to sub-class it to output anything sensible.  For example,
 # the file tohtml.py contains the definition of the HtmlFormatter sub-class
-# used to output, you guessed it, HTML.
+# used to output -- you guessed it -- HTML.
 #
 
 class Formatter:
@@ -198,6 +201,4 @@ class Formatter:
     #  Formatting a block
     #
 
-
-
-
+# eof
diff --git a/src/tools/docmaker/sources.py b/src/tools/docmaker/sources.py
index e5a8899..09ff7f9 100644
--- a/src/tools/docmaker/sources.py
+++ b/src/tools/docmaker/sources.py
@@ -1,3 +1,6 @@
+#  Sources (c) 2002, 2003, 2004, 2006, 2007
+#    David Turner <david@freetype.org>
+#
 #
 # this file contains definitions of classes needed to decompose
 # C sources files into a series of multi-line "blocks". There are
@@ -68,7 +71,7 @@ column = r'''
   /\*{1}   # followed by '/' and precisely one asterisk
   ([^*].*) # followed by anything (group 1)
   \*{1}/   # followed by one asterisk and a '/'
-  \s*$     # enventually followed by whitespace
+  \s*$     # eventually followed by whitespace
 '''
 
 re_source_block_format1 = SourceBlockFormat( 1, start, column, start )
@@ -312,7 +315,7 @@ class SourceProcessor:
                     self.lines.append( line )
 
                 else:
-                    # humm.. this is an unexcepted block end,
+                    # humm.. this is an unexpected block end,
                     # create a new block, but don't process the line
                     self.add_block_lines()
 
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 63c123d..04dfba3 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -1,3 +1,6 @@
+#  ToHTML (c) 2002, 2003, 2005, 2006, 2007
+#    David Turner <david@freetype.org>
+
 from sources import *
 from content import *
 from formatter import *
@@ -532,3 +535,4 @@ class HtmlFormatter(Formatter):
         for section in self.sections:
             self.section_dump( section, self.file_prefix + section.name + '.html' )
 
+# eof
diff --git a/src/tools/docmaker/utils.py b/src/tools/docmaker/utils.py
index a75bbc4..e751c56 100644
--- a/src/tools/docmaker/utils.py
+++ b/src/tools/docmaker/utils.py
@@ -1,3 +1,6 @@
+#  Utils (c) 2002, 2004, 2007  David Turner <david@freetype.org>
+#
+
 import string, sys, os, glob
 
 # current output directory
@@ -126,3 +129,4 @@ def make_file_list( args = None ):
 
     return file_list
 
+# eof
diff --git a/src/tools/glnames.py b/src/tools/glnames.py
index 6131098..9a6da38 100644
--- a/src/tools/glnames.py
+++ b/src/tools/glnames.py
@@ -6,7 +6,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2007 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -4821,7 +4821,7 @@ class StringTable:
 #     name         bitsize     description
 #     -----------------------------------------
 #     hasvalue           1     Set to 1 if a 16-bit Unicode value follows.
-#     num_children       7     Number of childrens.  Can be 0 only if
+#     num_children       7     Number of children.  Can be 0 only if
 #                              `hasvalue' is set to 1.
 #     value             16     Optional Unicode value.
 #
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 7a8611d..e9af0f5 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -108,7 +108,7 @@
     if ( face->vertical_info )
       ( (SFNT_Service)face->sfnt )->get_metrics( face, 1, idx, tsb, ah );
 
-#if 1             /* Emperically determined, at variance with what MS said */
+#if 1             /* Empirically determined, at variance with what MS said */
 
     else
     {
@@ -934,7 +934,7 @@
   /*                                                                       */
   /* <Description>                                                         */
   /*    This is slightly different from TT_Process_Simple_Glyph, in that   */
-  /*    it's sole purpose is to hint the glyph.  Thus this function is     */
+  /*    its sole purpose is to hint the glyph.  Thus this function is      */
   /*    only available when bytecode interpreter is enabled.               */
   /*                                                                       */
   static FT_Error
diff --git a/vms_make.com b/vms_make.com
index 3d4bd4f..7d27684 100644
--- a/vms_make.com
+++ b/vms_make.com
@@ -1101,7 +1101,7 @@ $   write sys$output "and afterwards re-execute ''myproc'"
 $   goto err_exit
 $ endif
 $!
-$! Init symbols used to hold CPP definitons and include path
+$! Init symbols used to hold CPP definitions and include path
 $!
 $ libdefs = ""
 $ libincs = ""