shithub: freetype+ttf2subf

Download patch

ref: 47a5f41de65b358ccbdada33a7c2fec4790aa3f9
parent: c1635d44f921a30bd8d33b0855d8109824e60875
author: Werner Lemberg <[email protected]>
date: Mon Oct 16 23:38:43 EDT 2000

Added copyright messages to all Makefiles.

Added documentation to FT_Get_Sfnt_* stuff (in ftnames.[ch])

minor other doc fixes

git/fs: mount .git/fs: mount/attach disallowed
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,16 @@
 #
 
 
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 # Project names
 #
 PROJECT := freetype
--- a/builds/ansi/ansi-def.mk
+++ b/builds/ansi/ansi-def.mk
@@ -1,6 +1,17 @@
 #
-#  configuration rules for a `normal' ANSI system
+# FreeType 2 configuration rules for a `normal' ANSI system
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 ifndef TOP
   TOP := .
--- a/builds/ansi/ansi.mk
+++ b/builds/ansi/ansi.mk
@@ -2,6 +2,17 @@
 # FreeType 2 configuration rules for a `normal' pseudo ANSI compiler/system
 #
 
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 include $(TOP)/builds/ansi/ansi-def.mk
 include $(TOP)/builds/compiler/ansi-cc.mk
 
--- a/builds/compiler/ansi-cc.mk
+++ b/builds/compiler/ansi-cc.mk
@@ -1,7 +1,17 @@
-# Copyright 2000 David Turner
 #
-#  generic pseudo ANSI compiler
+# FreeType 2 generic pseudo ANSI compiler
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # Compiler command line name
 #
--- a/builds/compiler/gcc-dev.mk
+++ b/builds/compiler/gcc-dev.mk
@@ -1,7 +1,17 @@
-# Copyright 2000 David Turner
 #
-#  gcc-specific with NO OPTIMIZATIONS + DEBUGGING
+# FreeType 2 gcc-specific with NO OPTIMIZATIONS + DEBUGGING
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # Compiler command line name
 #
--- a/builds/compiler/gcc.mk
+++ b/builds/compiler/gcc.mk
@@ -1,7 +1,17 @@
-# Copyright 2000 David Turner
 #
-#  gcc-specific definitions
+# FreeType 2 gcc-specific definitions
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # Compiler command line name
 #
--- a/builds/compiler/visualage.mk
+++ b/builds/compiler/visualage.mk
@@ -1,6 +1,17 @@
 #
-# Visual Age C++ specific definitions
+# FreeType 2 Visual Age C++ specific definitions
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # command line compiler name
 #
--- a/builds/compiler/visualc.mk
+++ b/builds/compiler/visualc.mk
@@ -1,6 +1,17 @@
 #
-# Visual C++ definitions
+# FreeType 2 Visual C++ definitions
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # compiler command line name
 #
--- a/builds/compiler/win-lcc.mk
+++ b/builds/compiler/win-lcc.mk
@@ -1,6 +1,17 @@
 #
-#  Win32-LCC specific definitions
+# FreeType 2 Win32-LCC specific definitions
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # Command line name
 #
--- a/builds/cygwin/cygwin-dev.mk
+++ b/builds/cygwin/cygwin-dev.mk
@@ -5,6 +5,17 @@
 #   and no installation
 #
 
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 include $(TOP)/builds/cygwin/cygwinddef.mk
 include $(TOP)/builds/compiler/gcc-dev.mk
 include $(TOP)/builds/link_std.mk
--- a/builds/cygwin/cygwin.mk
+++ b/builds/cygwin/cygwin.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 configuration file for CygWin host platform.
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 include $(TOP)/builds/cygwin/cygwin-def.mk
 include $(TOP)/builds/cygwin/cygwin-cc.mk
 
--- a/builds/cygwin/cygwinddef.mk
+++ b/builds/cygwin/cygwinddef.mk
@@ -1,8 +1,9 @@
 #
 # FreeType 2 configuration rules templates for
-# development under Unix with no configure (gcc only)
+# development under Unix-like platforms with no configure script (gcc only)
 #
 
+
 # Copyright 1996-2000 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
@@ -11,6 +12,7 @@
 # LICENSE.TXT.  By continuing to use, modify, or distribute this file you
 # indicate that you have read the license and understand and accept it
 # fully.
+
 
 ifndef TOP
   TOP := .
--- a/builds/cygwin/install.mk
+++ b/builds/cygwin/install.mk
@@ -1,7 +1,17 @@
 #
-#  installation instructions for Unix systems
-#  this file is FreeType-specific
+# FreeType 2 installation instructions for Unix-like systems
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # Unix installation and deinstallation targets.
 
--- a/builds/dos/dos-def.mk
+++ b/builds/dos/dos-def.mk
@@ -1,8 +1,17 @@
 #
-# Copyright 2000 David Turner <[email protected]>
+# FreeType 2 DOS specific definitions
 #
-#  DOS specific definitions
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
 #
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 DELETE   := del
 HOSTSEP  := $(strip \ )
--- a/builds/dos/dos-gcc.mk
+++ b/builds/dos/dos-gcc.mk
@@ -2,6 +2,17 @@
 # FreeType 2 configuration rules for the DJGPP compiler
 #
 
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 SEP := /
 CLEAN_LIBRARY := $(DELETE) $@
 include $(TOP)/builds/dos/dos-def.mk
--- a/builds/link_dos.mk
+++ b/builds/link_dos.mk
@@ -2,6 +2,17 @@
 #  Link instructions for Dos-like systems (Dos, Win32, OS/2)
 #
 
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 ifdef BUILD_PROJECT
 
   # Now include the main sub-makefile.  It contains all the rules used to
--- a/builds/link_std.mk
+++ b/builds/link_std.mk
@@ -2,6 +2,17 @@
 #  Link instructions for standard systems
 #
 
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 ifdef BUILD_PROJECT
 
   # Now include the main sub-makefile.  It contains all the rules used to
--- a/builds/modules.mk
+++ b/builds/modules.mk
@@ -2,6 +2,7 @@
 # FreeType 2 modules sub-Makefile
 #
 
+
 # Copyright 1996-2000 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
--- a/builds/os2/os2-def.mk
+++ b/builds/os2/os2-def.mk
@@ -1,8 +1,17 @@
 #
-# Copyright 2000 David Turner <[email protected]>
+# FreeType 2 OS/2 specific definitions
 #
-#  OS/2 specific definitions
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
 #
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 DELETE   := del
 HOSTSEP  := $(strip \ )
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -2,7 +2,15 @@
 # FreeType build system -- top-level sub-Makefile
 #
 
-# Copyright 2000 by David Turner
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
 
 
 # This file is designed for GNU Make, do not use it with another Make tool!
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -1,7 +1,17 @@
 #
-#  installation instructions for Unix systems --
-#  this file is FreeType-specific
+# FreeType 2 installation instructions for Unix systems
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # Unix installation and deinstallation targets.
 install: $(PROJECT_LIBRARY)
--- a/builds/unix/unix-dev.mk
+++ b/builds/unix/unix-dev.mk
@@ -2,8 +2,19 @@
 # FreeType 2 Configuration rules for Unix + GCC
 #
 #   Development version without optimizations & libtool
-#   and no installation..
+#   and no installation.
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 include $(TOP)/builds/unix/unixddef.mk
 include $(TOP)/builds/compiler/gcc-dev.mk
--- a/builds/unix/unix.mk
+++ b/builds/unix/unix.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 configuration rules for UNIX platforms
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 include $(TOP)/builds/unix/unix-def.mk
 include $(TOP)/builds/unix/unix-cc.mk
 
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -3,6 +3,7 @@
 # development under Unix with no configure script (gcc only)
 #
 
+
 # Copyright 1996-2000 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
--- a/builds/win32/w32-dev.mk
+++ b/builds/win32/w32-dev.mk
@@ -1,5 +1,5 @@
 #
-# FreeType 2 Configuration rules for Win32 + GCC
+# FreeType 2 configuration rules for Win32 + GCC
 #
 #   Development version without optimizations.
 #
@@ -13,7 +13,8 @@
 # LICENSE.TXT.  By continuing to use, modify, or distribute this file you
 # indicate that you have read the license and understand and accept it
 # fully.
-#
+
+
 # NOTE: This version requires that GNU Make is invoked from the Windows
 #       Shell (_not_ Cygwin BASH)!
 #
--- a/builds/win32/w32-gcc.mk
+++ b/builds/win32/w32-gcc.mk
@@ -1,6 +1,17 @@
 #
-# FreeType 2 Configuration rules for Win32 + GCC
+# FreeType 2 configuration rules for Win32 + GCC
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 # the separator must be set before including win32-def
 # as it defaults to "\" on Win32
--- a/builds/win32/w32-icc.mk
+++ b/builds/win32/w32-icc.mk
@@ -1,6 +1,17 @@
 #
-# FreeType 2 Configuration rules for Win32 + IBM Visual Age C++
+# FreeType 2 configuration rules for Win32 + IBM Visual Age C++
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 include $(TOP)/builds/win32/win32-def.mk
 include $(TOP)/builds/compiler/visualage.mk
--- a/builds/win32/w32-lcc.mk
+++ b/builds/win32/w32-lcc.mk
@@ -1,6 +1,17 @@
 #
-# Configuration rules for Win32 + LCC
+# FreeType 2 configuration rules for Win32 + LCC
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 SEP := /
 include $(TOP)/builds/win32/win32-def.mk
--- a/builds/win32/w32-vcc.mk
+++ b/builds/win32/w32-vcc.mk
@@ -1,6 +1,17 @@
 #
-# Visual C++ on Win32
+# FreeType 2 Visual C++ on Win32
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 SEP := /
 include $(TOP)/builds/win32/win32-def.mk
--- a/builds/win32/win32-def.mk
+++ b/builds/win32/win32-def.mk
@@ -1,7 +1,17 @@
-# Copyright 2000 David Turner <[email protected]>
 #
-# Win32 specific definitions
+# FreeType 2 Win32 specific definitions
 #
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
 
 DELETE   := del
 HOSTSEP  := $(strip \ )
--- a/include/freetype/ftnames.h
+++ b/include/freetype/ftnames.h
@@ -3,7 +3,7 @@
 /*  ftnames.h                                                              */
 /*                                                                         */
 /*    Simple interface to access SFNT name tables (which are used          */
-/*    to hold font names, copyright info, notices, etc.).                  */
+/*    to hold font names, copyright info, notices, etc.) (specification).  */
 /*                                                                         */
 /*    This is _not_ used to retrieve glyph names!                          */
 /*                                                                         */
@@ -31,6 +31,34 @@
 #endif
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Struct>                                                              */
+  /*    FT_SfntName                                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A structure used to model an SFNT `name' table entry.              */
+  /*                                                                       */
+  /* <Fields>                                                              */
+  /*    platform_id :: The platform ID for `string'.                       */
+  /*                                                                       */
+  /*    encoding_id :: The encoding ID for `string'.                       */
+  /*                                                                       */
+  /*    language_id :: The language ID for `string'.                       */
+  /*                                                                       */
+  /*    name_id     :: An identifier for `string'.                         */
+  /*                                                                       */
+  /*    string      :: The `name' string.  Note that this string is in     */
+  /*                   Pascal convention, i.e., the string hasn't a final  */
+  /*                   null byte.                                          */
+  /*                                                                       */
+  /*    string_len  :: The length of `string' in bytes.                    */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    Possible values for `platform_id', `encoding_id', `language_id',   */
+  /*    and `name_id' are given in the file `ttnameid.h'.  For details     */
+  /*    please refer to the TrueType or OpenType specification.            */
+  /*                                                                       */
   typedef struct  FT_SfntName_
   {
     FT_UShort  platform_id;
@@ -38,14 +66,56 @@
     FT_UShort  language_id;
     FT_UShort  name_id;
   
-    FT_Byte*   string;
+    FT_Byte*   string;      /* this string is *not* null-terminated! */
     FT_UInt    string_len;  /* in bytes */
   
   } FT_SfntName;
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Sfnt_Name_Count                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieves the number of name strings in the SFNT `name' table.     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face   :: A handle to the source face.                             */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The number of strings in the `name' table.                         */
+  /*                                                                       */
   FT_EXPORT_DEF( FT_UInt )  FT_Get_Sfnt_Name_Count( FT_Face  face );
-  
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Sfnt_Name                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieves a string of the SFNT `name' table for a given index.     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face  :: A handle to the source face.                              */
+  /*                                                                       */
+  /*    index :: The index of the `name' string.                           */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aname :: The indexed FT_SfntName structure.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The `string' array returned in the `aname' structure is not        */
+  /*    null-terminated.                                                   */
+  /*                                                                       */
+  /*    Use FT_Get_Sfnt_Name_Count() to get the total number of available  */
+  /*    `name' table entries, then do a loop until you get the right       */
+  /*    platform, encoding, and name ID.                                   */
+  /*                                                                       */
   FT_EXPORT_DEF( FT_Error )  FT_Get_Sfnt_Name( FT_Face       face,
                                                FT_UInt       index,
                                                FT_SfntName*  aname );
--- a/include/freetype/ftrender.h
+++ b/include/freetype/ftrender.h
@@ -174,10 +174,10 @@
   /*                                                                       */
   /*    This doesn't change the current renderer for other formats.        */
   /*                                                                       */
-  FT_EXPORT_DEF(FT_Error) FT_Set_Renderer( FT_Library     library,
-                                           FT_Renderer    renderer,
-                                           FT_UInt        num_params,
-                                           FT_Parameter*  parameters );
+  FT_EXPORT_DEF( FT_Error )  FT_Set_Renderer( FT_Library     library,
+                                              FT_Renderer    renderer,
+                                              FT_UInt        num_params,
+                                              FT_Parameter*  parameters );
 
 
 #ifdef __cplusplus
--- a/include/freetype/ttnameid.h
+++ b/include/freetype/ttnameid.h
@@ -1,6 +1,6 @@
 /***************************************************************************/
 /*                                                                         */
-/*  ttmakeid.h                                                             */
+/*  ttnameid.h                                                             */
 /*                                                                         */
 /*    TrueType name ID definitions (specification only).                   */
 /*                                                                         */
--- a/src/autohint/module.mk
+++ b/src/autohint/module.mk
@@ -1,3 +1,21 @@
+#
+# FreeType 2 auto-hinter module definition 
+#
+
+
+# Copyright 2000 Catharon Productions Inc.
+# Author: David Turner
+#
+# This file is part of the Catharon Typography Project and shall only
+# be used, modified, and distributed under the terms of the Catharon
+# Open Source License that should come with this file under the name
+# `CatharonLicense.txt'.  By continuing to use, modify, or distribute
+# this file you indicate that you have read the license and
+# understand and accept it fully.
+#
+# Note that this license is compatible with the FreeType license.
+
+
 make_module_list: add_autohint_module
 
 add_autohint_module:
--- a/src/base/ftnames.c
+++ b/src/base/ftnames.c
@@ -3,7 +3,7 @@
 /*  ftnames.c                                                              */
 /*                                                                         */
 /*    Simple interface to access SFNT name tables (which are used          */
-/*    to hold font names, copyright info, notices, etc.).                  */
+/*    to hold font names, copyright info, notices, etc.) (body).           */
 /*                                                                         */
 /*    This is _not_ used to retrieve glyph names!                          */
 /*                                                                         */
@@ -26,6 +26,20 @@
 #ifdef TT_CONFIG_OPTION_SFNT_NAMES
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Sfnt_Name_Count                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieves the number of name strings in the SFNT `name' table.     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A handle to the source face.                               */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The number of strings in the `name' table.                         */
+  /*                                                                       */
   FT_EXPORT_FUNC( FT_UInt )  FT_Get_Sfnt_Name_Count( FT_Face  face )
   {
     return face && ( FT_IS_SFNT( face ) ? ((TT_Face)face)->num_names : 0 );
@@ -32,6 +46,33 @@
   }
   
   
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_Sfnt_Name                                                   */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Retrieves a string of the SFNT `name' table for a given index.     */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face  :: A handle to the source face.                              */
+  /*                                                                       */
+  /*    index :: The index of the `name' string.                           */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aname :: The indexed FT_SfntName structure.                        */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The `string' array returned in the `aname' structure is not        */
+  /*    null-terminated.                                                   */
+  /*                                                                       */
+  /*    Use FT_Get_Sfnt_Name_Count() to get the total number of available  */
+  /*    `name' table entries, then do a loop until you get the right       */
+  /*    platform, encoding, and name ID.                                   */
+  /*                                                                       */
   FT_EXPORT_FUNC( FT_Error ) FT_Get_Sfnt_Name( FT_Face       face,
                                                FT_UInt       index,
                                                FT_SfntName*  aname )
--- a/src/cff/module.mk
+++ b/src/cff/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 CFF module definition 
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_cff_driver
 
 add_cff_driver:
--- a/src/cid/module.mk
+++ b/src/cid/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 CID module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_type1cid_driver
 
 add_type1cid_driver:
--- a/src/psaux/module.mk
+++ b/src/psaux/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 PSaux module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_psaux_module
 
 add_psaux_module:
--- a/src/psaux/rules.mk
+++ b/src/psaux/rules.mk
@@ -1,5 +1,5 @@
 #
-# FreeType 2 PSAUX driver configuration rules
+# FreeType 2 PSaux driver configuration rules
 #
 
 
--- a/src/psnames/module.mk
+++ b/src/psnames/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 PSnames module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_psnames_module
 
 add_psnames_module:
--- a/src/raster1/module.mk
+++ b/src/raster1/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 renderer module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_raster1_module
 
 add_raster1_module:
--- a/src/sfnt/module.mk
+++ b/src/sfnt/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 SFNT module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_sfnt_module
 
 add_sfnt_module:
--- a/src/smooth/module.mk
+++ b/src/smooth/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 smooth renderer module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_smooth_renderer
 
 add_smooth_renderer:
--- a/src/smooth/rules.mk
+++ b/src/smooth/rules.mk
@@ -1,5 +1,5 @@
 #
-# FreeType 2 renderer module build rules
+# FreeType 2 smooth renderer module build rules
 #
 
 
--- a/src/truetype/module.mk
+++ b/src/truetype/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 TrueType module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_truetype_driver
 
 add_truetype_driver:
--- a/src/type1z/module.mk
+++ b/src/type1z/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 Type1z module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_type1_driver
 
 add_type1_driver:
--- a/src/winfonts/module.mk
+++ b/src/winfonts/module.mk
@@ -1,3 +1,18 @@
+#
+# FreeType 2 Windows FNT/FON module definition
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
 make_module_list: add_windows_driver
 
 add_windows_driver: