* docs/CHANGES: Mention SING Glyphlet support.

Other minor doc fixes and CRLF issues.

5 files changed, 84 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 9bad0e597..686c9e9fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2005-09-22  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Mention SING Glyphlet support.
+
 2005-09-22  David Turner  <david@freetype.org>
 
-        * src/base/Jamfile: fixing broken Jamfile
+	* src/base/Jamfile: Disable compilation of ftgxval module
+	temporarily.
 
 2005-09-19  David Somers  <dsomers@omz13.com>
 
diff --git a/docs/CHANGES b/docs/CHANGES
index 44978299f..cfca7d953 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -40,6 +40,11 @@ LATEST CHANGES BETWEEN 2.2.0 and 2.1.10
       (meaning `left  sidebearing  point  at x=0').   This helps  with
       some buggy fonts.
 
+    - Rudimentary support for Adobe's new `SING Glyphlet' format.  See
+
+        http://www.adobe.com/products/indesign/sing_gaiji.html
+
+      for more information.
 
 ======================================================================
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 7976b4fb2..a00ad1018 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2349,6 +2349,20 @@ FT_BEGIN_HEADER
   *
   *   FT_LOAD_TARGET_LCD_V ::
   *     Use hinting for @FT_RENDER_MODE_LCD_V.
+  *
+  * @note:
+  *   You should use only _one_ of the FT_LOAD_TARGET_XXX values; they
+  *   can't be ORed.
+  *
+  *   However, FreeType makes a distinction between the hinting algorithm
+  *   being used, and the pixel mode of the target bitmaps.  For example,
+  *   it is possible to use the `light' hinting algorithm and have the
+  *   results rendered in horizontal LCD pixel mode, with code like this:
+  *
+  *     FT_Load_Glyph( face, glyph_index,
+  *                    load_flags | FT_LOAD_TARGET_LIGHT );
+  *     FT_Render_Glyph( face->glyph, FT_RENDER_MODE_LCD );
+  *
   */
 #define FT_LOAD_DEFAULT                      0x0
 #define FT_LOAD_NO_SCALE                     0x1
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 985641c1b..3c251d4b6 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 by                               */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -257,8 +257,10 @@ FT_BEGIN_HEADER
   /* <Input>                                                               */
   /*    library     :: The parent FreeType library handle to use.          */
   /*                                                                       */
-  /*    max_bytes   :: Maximum number of bytes to use for cached data.     */
-  /*                   Use 0 for defaults.                                 */
+  /*    max_bytes   :: Maximum number of bytes to use for cached data      */
+  /*                   nodes.  Use 0 for defaults.  Note that this value   */
+  /*                   does not account for managed FT_Face and FT_Size    */
+  /*                   objects.                                            */
   /*                                                                       */
   /*    requester   :: An application-provided callback used to translate  */
   /*                   face IDs into real @FT_Face objects.                */
@@ -273,6 +275,15 @@ FT_BEGIN_HEADER
   /* <Return>                                                              */
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
+  /* <Note>                                                                */
+  /*    When you perform a lookup, out-of-memory errors are detected       */
+  /*    _within_ the lookup and force incremental flushes of the cache     */
+  /*    until enough memory is released for the lookup to succeed.         */
+  /*                                                                       */
+  /*    If a lookup fails with FT_Err_Out_Of_Memory the cache has already  */
+  /*    been completely flushed, and still no memory is available for the  */
+  /*    operation.                                                         */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FTC_Manager_New( FT_Library          library,
                    FT_UInt             max_faces,
diff --git a/src/base/Jamfile b/src/base/Jamfile
index b71dd08a0..6222009d4 100644
--- a/src/base/Jamfile
+++ b/src/base/Jamfile
@@ -1,45 +1,45 @@
-# FreeType 2 src/base Jamfile

-#

-# Copyright 2001, 2002, 2003, 2004, 2005 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.

-

-SubDir  FT2_TOP $(FT2_SRC_DIR) base ;

-

-

-{

-  local  _sources ;

-

-  if $(FT2_MULTI)

-  {

-    _sources = ftutil ftdbgmem ftstream ftcalc fttrigon ftgloadr ftoutln

-               ftobjs ftnames  ftrfork  ;

-  }

-  else

-  {

-    _sources = ftbase ;

-  }

-

-  Library  $(FT2_LIB) : $(_sources).c ;

-}

-

-# Add the optional/replaceable files.

-#

-Library  $(FT2_LIB) : ftsystem.c   ftinit.c    ftglyph.c  ftmm.c     ftbdf.c

-                      ftbbox.c     ftdebug.c   ftxf86.c   fttype1.c  ftpfr.c

-                      ftstroke.c   ftwinfnt.c  ftotval.c  ftbitmap.c

-                      ftsynth.c ;

-

-# Add Macintosh-specific file to the library when necessary.

-#

-if $(MAC)

-{

-  Library  $(FT2_LIB) : ftmac.c ;

-}

-

-# end of src/base Jamfile

+# FreeType 2 src/base Jamfile
+#
+# Copyright 2001, 2002, 2003, 2004, 2005 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.
+
+SubDir  FT2_TOP $(FT2_SRC_DIR) base ;
+
+
+{
+  local  _sources ;
+
+  if $(FT2_MULTI)
+  {
+    _sources = ftutil ftdbgmem ftstream ftcalc fttrigon ftgloadr ftoutln
+               ftobjs ftnames  ftrfork  ;
+  }
+  else
+  {
+    _sources = ftbase ;
+  }
+
+  Library  $(FT2_LIB) : $(_sources).c ;
+}
+
+# Add the optional/replaceable files.
+#
+Library  $(FT2_LIB) : ftsystem.c   ftinit.c    ftglyph.c  ftmm.c     ftbdf.c
+                      ftbbox.c     ftdebug.c   ftxf86.c   fttype1.c  ftpfr.c
+                      ftstroke.c   ftwinfnt.c  ftotval.c  ftbitmap.c
+                      ftsynth.c ;
+
+# Add Macintosh-specific file to the library when necessary.
+#
+if $(MAC)
+{
+  Library  $(FT2_LIB) : ftmac.c ;
+}
+
+# end of src/base Jamfile