* src/sfnt/sfdriver.c: Include FT_SERVICE_SFNT_H.

(sfnt_service_sfnt_table): New service.
(sfnt_services): Updated.

* docs/license.txt: Reworded.

4 files changed, 38 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index c4587bdf9..296e2fc57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-04  Werner Lemberg  <wl@gnu.org>
+
+	* src/sfnt/sfdriver.c: Include FT_SERVICE_SFNT_H.
+	(sfnt_service_sfnt_table): New service.
+	(sfnt_services): Updated.
+
+	* docs/license.txt: Reworded.
+
 2003-11-03  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/*: Add a guard to all public header files which
diff --git a/docs/license.txt b/docs/license.txt
index dc011d1d5..2c6d3ec10 100644
--- a/docs/license.txt
+++ b/docs/license.txt
@@ -2,24 +2,26 @@
 The  FreeType 2  font  engine is  copyrighted  work and  cannot be  used
 legally  without a  software license.   In  order to  make this  project
 usable  to a vast  majority of  developers, we  distribute it  under two
-mutually exclusive licenses.
+mutually exclusive open-source licenses.
 
-This means  that *you*  must choose *one*  license of the  two described
+This means  that *you* must choose  *one* of the  two licenses described
 below, then obey  all its terms and conditions when  using FreeType 2 in
 any of your projects or products.
 
-  - The  FreeType License,  found in  the  file "FTL.TXT",  which is  an
-    BSD-style  open-source  license *with*  an  advertising clause  that
-    forces  you  to  explicitely  cite  the  FreeType  project  in  your
-    product's documentation.  All details are in the license file.
+  - The FreeType License, found in  the file `FTL.TXT', which is similar
+    to the original BSD license *with* an advertising clause that forces
+    you  to  explicitly cite  the  FreeType  project  in your  product's
+    documentation.  All  details are in the license  file.  This license
+    is  suited  to products  which  don't  use  the GNU  General  Public
+    License.
 
-  - The GNU  General Public  License, found in  "GPL.TXT", which  is the
-    traditionnal and "viral" GPL license that forces you to redistribute
-    the _complete_ sources of all your products that use FreeType 2.
+  - The  GNU General Public  License, found  in `GPL.TXT',  for programs
+    which already use  the GPL.  Note that the  FTL is incompatible with
+    the GPL due to its advertisement clause.
 
-Note that  the contributed  PCF driver comes  with a license  similar to
-that of  X Window System which  is compatible to the  above two licenses
-(see file src/pcf/readme).
+The contributed PCF driver comes with a license similar to that of the X
+Window System.   It is  compatible to the  above two licenses  (see file
+src/pcf/readme).
 
 
 --- end of licence.txt ---
diff --git a/include/freetype/internal/services/svsfnt.h b/include/freetype/internal/services/svsfnt.h
index e24de785b..06a5b1c23 100644
--- a/include/freetype/internal/services/svsfnt.h
+++ b/include/freetype/internal/services/svsfnt.h
@@ -1,6 +1,6 @@
 /***************************************************************************/
 /*                                                                         */
-/*  svpostnm.h                                                             */
+/*  svsfnt.h                                                               */
 /*                                                                         */
 /*    The FreeType PostScript name services (specification).               */
 /*                                                                         */
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index 784da9992..f0469e6e9 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -37,6 +37,13 @@
 
 #include FT_SERVICE_GLYPH_DICT_H
 #include FT_SERVICE_POSTSCRIPT_NAME_H
+#include FT_SERVICE_SFNT_H
+
+
+ /*
+  *  SFNT TABLE SERVICE
+  *
+  */
 
   static void*
   get_sfnt_table( TT_Face      face,
@@ -83,6 +90,13 @@
   }
 
 
+  static const FT_Service_SFNT_TableRec  sfnt_service_sfnt_table =
+  {
+    (FT_SFNT_TableLoadFunc)tt_face_load_any,
+    (FT_SFNT_TableGetFunc) get_sfnt_table
+  };
+
+
 #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
 
  /*
@@ -255,6 +269,7 @@
 
   static const FT_ServiceDescRec  sfnt_services[] =
   {
+    { FT_SERVICE_ID_SFNT_TABLE,           &sfnt_service_sfnt_table },
     { FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &sfnt_service_ps_name },
 #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
     { FT_SERVICE_ID_GLYPH_DICT,           &sfnt_service_glyph_dict },