shithub: freetype+ttf2subf

Download patch

ref: b4142d5126a77088affded240ee3bd5de823c3b8
parent: 87a5a43e673a411a08137a4f8f85bc49b86ccedd
author: Werner Lemberg <[email protected]>
date: Wed Jan 17 07:45:26 EST 2007

Whitespace and spelling fixes from Alexei.

Formatting, copyright years.

git/fs: mount .git/fs: mount/attach disallowed
--- a/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/builds/mac/FreeType.m68k_cfm.make.txt
@@ -25,7 +25,7 @@
 			-d FT2_BUILD_LIBRARY \xB6
 			-d FT_CONFIG_CONFIG_H="<ftconfig.h>" \xB6
 			-d FT_CONFIG_MODULES_H="<ftmodule.h>" \xB6
-			{Includes} {Sym-68K} -model cfmseg 
+			{Includes} {Sym-68K} -model cfmseg
 
 
 ### Source Files ###
@@ -118,7 +118,7 @@
 
 ### Libraries ###
 
-LibFiles-68K    = 
+LibFiles-68K    =
 
 
 ### Default Rules ###
--- a/builds/mac/FreeType.m68k_far.make.txt
+++ b/builds/mac/FreeType.m68k_far.make.txt
@@ -24,7 +24,7 @@
 			-d FT2_BUILD_LIBRARY \xB6
 			-d FT_CONFIG_CONFIG_H="<ftconfig.h>" \xB6
 			-d FT_CONFIG_MODULES_H="<ftmodule.h>" \xB6
-			{Includes} {Sym-68K} -model far 
+			{Includes} {Sym-68K} -model far
 
 
 ### Source Files ###
@@ -117,7 +117,7 @@
 
 ### Libraries ###
 
-LibFiles-68K    = 
+LibFiles-68K    =
 
 
 ### Default Rules ###
--- a/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/builds/mac/FreeType.ppc_carbon.make.txt
@@ -25,7 +25,7 @@
 			-d FT2_BUILD_LIBRARY \xB6
 			-d FT_CONFIG_CONFIG_H="<ftconfig.h>" \xB6
 			-d FT_CONFIG_MODULES_H="<ftmodule.h>" \xB6
-			{Includes} {Sym-PPC} -d TARGET_API_MAC_CARBON=1 
+			{Includes} {Sym-PPC} -d TARGET_API_MAC_CARBON=1
 
 
 ### Source Files ###
@@ -118,7 +118,7 @@
 
 ### Libraries ###
 
-LibFiles-PPC    = 
+LibFiles-PPC    =
 
 
 ### Default Rules ###
--- a/builds/mac/FreeType.ppc_classic.make.txt
+++ b/builds/mac/FreeType.ppc_classic.make.txt
@@ -25,7 +25,7 @@
 			-d FT2_BUILD_LIBRARY \xB6
 			-d FT_CONFIG_CONFIG_H="<ftconfig.h>" \xB6
 			-d FT_CONFIG_MODULES_H="<ftmodule.h>" \xB6
-			{Includes} {Sym-PPC} 
+			{Includes} {Sym-PPC}
 
 
 ### Source Files ###
@@ -118,7 +118,7 @@
 
 ### Libraries ###
 
-LibFiles-PPC    = 
+LibFiles-PPC    =
 
 
 ### Default Rules ###
--- a/builds/mac/README
+++ b/builds/mac/README
@@ -191,7 +191,7 @@
   just updated versions of these by Leonard. Some
   modules are added after the last maintainance, they
   are not included.
-	  
+
   4-2. Working test with ftdemos
   ------------------------------
 
@@ -316,7 +316,7 @@
 
       http://www.gyve.org/~mpsuzuki/ats_benchmark.html
 
-  A-3. Framework Availabilities 
+  A-3. Framework Availabilities
   -----------------------------
 
   The framework of MacOS are often revised, especially
@@ -386,7 +386,7 @@
     there's no InterfaceLib 9.x for m68k platforms.
     In fact, these functions are FSRef dependent.
 
-    (***) 
+    (***)
     ATSUI framework is available on ATSUnicode 8.5 on
     ppc Toolbox CFM, CarbonLib 1.0 too. But its base:
     ATS font manager is not published in these versions.
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -246,7 +246,7 @@
   /* FSSpec functions: deprecated sicne Mac OS X 10.4 */
   PBGetFCBInfoSync( paramBlock );
   FSMakeFSSpec( vRefNum, dirID, fileName, spec );
- 
+
     ],
     [AC_MSG_RESULT([ok])
      CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"],
@@ -309,7 +309,7 @@
   FSGetCatalogInfo( ref, whichInfo, catalogInfo,
                     outForkName, spec, ref );
   FSPathMakeRef( path, ref, isDirectory );
- 
+
     ],
     [AC_MSG_RESULT([ok])
      CFLAGS="$CFLAGS -DHAVE_FSREF=1"],
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -76,7 +76,7 @@
   # So we need to hack.
   #
   # Kudos to Eli Zaretskii (DJGPP guru) that helped debug it.
-  # Details are available in threads of the freetype mailing list 
+  # Details are available in threads of the freetype mailing list
   # (2004-11-11), and then in the devel mailing list (2004-11-20 to -23).
   #
   ifeq ($(OS),Windows_NT)
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -15,12 +15,16 @@
       monochrome/gray  issues  when   scaling  the  CVT.   Some  fonts
       exhibited bad rendering artifacts otherwise.
 
-    - FT_GlyphSlot_Embolden  now supports  vertical  layouts correctly
+    - `FT_GlyphSlot_Embolden' now  supports vertical layouts correctly
       (it mangled the vertical advance height).
 
-    - Fixed byte endian issues of ftmac.c to support Mac OS X on i386.
+    - Fixed byte  endian issues  of `ftmac.c' to  support Mac OS  X on
+      i386.
 
+    - The  PFR  font loader  no  longer  erroneously  tags font  files
+      without any outlines as FT_FACE_FLAG_SCALABLE.
 
+
   II. NEW API FUNCTIONS
 
     - `FT_Library_SetLcdFilter' allows you  to select a special filter
@@ -40,7 +44,7 @@
 
     - `FT_Get_Gasp'  allows you  to query  the flags  of  the TrueType
       `gasp' table for  a given character pixel size.   This is useful
-      to duplicate the  text rendering of MS Windows,  when the native
+      to duplicate  the text rendering  of MS Windows when  the native
       bytecode  interpreter is  enabled (which  isn't the  default for
       other patent reasons).
 
@@ -68,7 +72,7 @@
       release.
 
       Note  that  the API  hasn't  changed,  so  you can  still  force
-      unpatented hinting  with a special parameter  to FT_Open_Face as
+      unpatented hinting with a special parameter to `FT_Open_Face' as
       well.  This  might be useful in  same cases; for  example, a PDF
       reader might present  a user option to activate  it to deal with
       certain  `tricky'   embedded  fonts  which   cannot  be  clearly
@@ -76,16 +80,16 @@
 
       If you are  a developer for embedded systems,  you might want to
       *disable*  the   feature  to  save  code   space  by  undefining
-      TT_CONFIG_OPTION_UNPATENTED_HINTING in ftoption.h.
+      TT_CONFIG_OPTION_UNPATENTED_HINTING in file `ftoption.h'.
 
-    - LCD-optimized rendering is now DISABLED in all default builds of
-      the library, mainly due  to PATENT issues.  For more information
-      see:
+    - LCD-optimized rendering is now  *disabled* in all default builds
+      of  the  library,  mainly   due  to  patent  issues.   For  more
+      information see:
 
       http://lists.gnu.org/archive/html/freetype/2006-09/msg00064.html
 
       A  new  configuration macro  FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-      has been  introduced in ftoption.h;  manually define it  in this
+      has been introduced in  `ftoption.h'; manually define it in this
       file if you want to re-enable the feature.
 
       The  change only  affects the  implementation, not  the FreeType
@@ -105,12 +109,12 @@
       differences we had experienced with the Windows renderer.
 
     - It is now possible to cross-compile the library easily.  See the
-      file docs/INSTALL.CROSS for details.
+      file `docs/INSTALL.CROSS' for details.
 
     - The file `src/base/ftmac.c' now contains code for Mac OS X only;
       its  deprecated function  `FT_GetFile_From_Mac_Font_Name' always
-      returns an error even  if QuickDraw framework is available.  The
-      previous version has been moved to `builds/mac/ftmac.c'.
+      returns an  error even if the QuickDraw  framework is available.
+      The previous version has been moved to `builds/mac/ftmac.c'.
 
       Selecting  configure option `--with-quickdraw-carbon'  makes the
       build process use the original `ftmac.c' file instead of the Mac
@@ -123,7 +127,7 @@
       performed on  the TrueType and CFF font  loaders, sometimes with
       very drastic  benefits (e.g., the  TrueType loader is  now about
       25% faster;  FreeType should use  less heap memory  under nearly
-      all conditions)
+      all conditions).
 
     - The anti-aliased rasterizer has been optimized and is now 15% to
       25%  percent  faster than  in  previous  versions, depending  on
@@ -132,9 +136,6 @@
     - The Type 1 loader has been improved; as an example, it now skips
       top-level dictionaries properly.
 
-    - The  PFR  font loader  no  longer  erroneously  tags font  files
-      without any outlines as FT_FACE_FLAG_SCALABLE.
-
     - Better support for Mac  fonts on POSIX systems, plus compilation
       fixes for Mac OS X on ppc64 where `ftmac.c' cannot be built.
 
@@ -627,7 +628,7 @@
         of  various programming  tricks.   Cache hits  are  up to  70%
         faster than in the old code.
 
-      - The  FTC_CMapCache has  been simplied.   Charmaps can  only be
+      - The  FTC_CMapCache has  been simplified.  Charmaps can only be
         accessed by  index right now.  There  is also a  new API named
         `FT_Charmap_GetIndex' for this purpose.
 
@@ -974,7 +975,7 @@
 
     - The  automatic and  postscript hinters  have both  been updated.
       This  results in  a relatively  important increase  of rendering
-      quality since  many nasty defaults have  been supressed.  Please
+      quality since  many nasty defaults have been suppressed.  Please
       visit the web page:
 
         http://www.freetype.org/hinting/smooth-hinting.html
@@ -1140,7 +1141,7 @@
       glyph bitmaps produced by FreeType 1.x and FreeType 2.x with the
       bytecode  interpreter enabled.   This was  caused by  an invalid
       flag setting in the TrueType glyph loader, making the rasterizer
-      change  its  drop-out   control  mode.   Now  theresults  should
+      change  its  drop-out   control  mode.   Now  the results should
       _really_ be completely identical.
 
     - The TrueType name table loader has been improved to support many
@@ -1638,7 +1639,7 @@
   - Updated  the  Unix-specific  portions  of the  build  system  (new
     libtool version, etc.).
 
-  - The  SFNT kerning  lodaer now  ensures  that the  table is  sorted
+  - The  SFNT kerning  loader now  ensures  that the  table is  sorted
     (since some problem fonts do not meet this requirement).
 
 
@@ -1651,7 +1652,7 @@
     - THE  AUTO-HINTER HAS  BEEN SLIGHTLY  IMPROVED, in  order  to fix
       several annoying artefacts, mainly:
 
-        - Blue  zone alignement of  horizontal stems  wasn't performed
+        - Blue  zone alignment  of  horizontal stems  wasn't performed
           correctly, resulting in artefacts  like the `d' being placed
           one pixel below the `b' in some fonts like Time New Roman.
 
@@ -1931,7 +1932,7 @@
     * Incorrect glyph names for certain TrueType fonts.
     * The  glyph advance  was not  copied when  FT_Glyph_To_Bitmap was
       called.
-    * The  linearHoriAdvance  and  linerVertAdvance  fields  were  not
+    * The  linearHoriAdvance  and  linearVertAdvance  fields  were not
       correctly returned for glyphs processed by the auto-hinter.
     * `type1z'  renamed back to  `type1'; the  old `type1'  module has
       been removed.
@@ -2554,7 +2555,7 @@
   - introduced the `psnames' module.  It is used to:
 
       o convert  a Postscript glyph  name into the  equivalent Unicode
-        character code (used by the  Type 1 driver(s) to synthetize on
+        character code (used by the  Type 1 driver(s) to synthesize on
         the fly a Unicode charmap).
 
       o provide an  interface to retrieve the Postscript  names of the
@@ -2599,8 +2600,8 @@
 
   - Write FT_Get_Glyph_Bitmap and FT_Load_Glyph_Bitmap
 
-  - Add a function like FT_Load_Character( face, char_code, load_flags
-    )  that  would really  embbed  a  call  to FT_Get_Char_Index  then
+  - Add a function like FT_Load_Character(face, char_code, load_flags)
+    that  would   really  embed  a  call   to  FT_Get_Char_Index  then
     FT_Load_Glyph to ease developer's work.
 
   - Update the tutorial!
@@ -2639,7 +2640,7 @@
     fonts.
 
   - very minor  changes in the implementation  of FT_Set_Char_Size and
-    FT_Set_Pixel_Sizes (they now implement default to ligthen the font
+    FT_Set_Pixel_Sizes (they now implement default to lighten the font
     driver's code).
 
 
@@ -2647,8 +2648,8 @@
 
 OLD MESSAGE
 
-This file summarizes the changes that occured since the last `beta' of
-FreeType 2.  Because  the list is important, it  has been divided into
+This file summarizes the changes  that occurred  since the last `beta'
+of FreeType 2. Because the list is important, it has been divided into
 separate sections:
 
 Table Of Contents:
@@ -2735,7 +2736,7 @@
   Drivers are now able to  register new glyph image formats within the
   library.  For  now, the  base layer supports  of course  bitmaps and
   vector  outlines, but  one  could imagine  something different  like
-  colored bitmaps, bi-color vectors or wathever else (Metafonts anyone
+  colored bitmaps, bi-color vectors or whatever else (Metafonts anyone
   ??).
 
   See  the   file  `include/ftimage.h'.   Note  also  that   the  type
--- a/docs/INSTALL.CROSS
+++ b/docs/INSTALL.CROSS
@@ -79,8 +79,8 @@
   3. Building command
   -------------------
 
-    If the configuration finishes successfuly, invoking GNU make builds
-    FreeType2.  Just say
+    If  the  configuration  finishes successfully,  invoking  GNU make
+    builds FreeType2.  Just say
 
       make
 
--- a/docs/INSTALL.GNU
+++ b/docs/INSTALL.GNU
@@ -77,7 +77,7 @@
 
     If the build system correctly detected your platform, but you want
     to use a different compiler  than the one specified in the summary
-    (for most platforms, gcc is  the defaut compiler), invoke GNU Make
+    (for most platforms, gcc is the default compiler), invoke GNU Make
     with
 
       make setup <compiler>
--- a/docs/INSTALL.VMS
+++ b/docs/INSTALL.VMS
@@ -21,10 +21,10 @@
 files.
 
 
-To rebuild the  sources it is neccessary to  have MMS/MMK installed on
+To rebuild  the  sources it is necessary to  have MMS/MMK installed on
 the system.
 
-The library is avalaible in the directory
+The library is available in the directory
 
   [.LIB]
 
--- a/docs/raster.txt
+++ b/docs/raster.txt
@@ -331,7 +331,7 @@
 
     The  render pool doesn't  need to  be large.   A 4KByte  pool is
     enough for nearly all renditions, though nearly 100% slower than
-    a more confortable 16KByte or 32KByte pool (that was tested with
+    a more comfortable 16KByte or 32KByte pool (that was tested with
     complex glyphs at sizes over 500 pixels).
 
 
@@ -545,8 +545,8 @@
                                  compute its intersections with the
                                  drawn scanlines.  As already
       ---------------------      mentioned this can be done
-                                 directly, but the involed algorithm
-          * P2         _---# P3  is far too slow.
+                                 directly, but the involved
+          * P2         _---# P3  algorithm is far too slow.
       ------------- _--  --
                   _-
                 _/               Instead, it is still possible to
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for latin script (body).                */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2005, 2006 by                                    */
+/*  Copyright 2003, 2004, 2005, 2006, 2007 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -723,7 +723,8 @@
 
             segment->min_coord = (FT_Short)min_pos;
             segment->max_coord = (FT_Short)max_pos;
-            segment->height    = (FT_Short)(segment->max_coord - segment->min_coord);
+            segment->height    = (FT_Short)( segment->max_coord -
+                                             segment->min_coord );
 
             on_edge = 0;
             segment = NULL;
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -337,8 +337,8 @@
                                                          cff->psnames );
       font_info->italic_angle        = dict->italic_angle;
       font_info->is_fixed_pitch      = dict->is_fixed_pitch;
-      font_info->underline_position  = (FT_Short) dict->underline_position;
-      font_info->underline_thickness = (FT_Short) dict->underline_thickness;
+      font_info->underline_position  = (FT_Short)dict->underline_position;
+      font_info->underline_thickness = (FT_Short)dict->underline_thickness;
 
       cff->font_info = font_info;
     }
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -5417,7 +5417,8 @@
       first_point = (FT_UShort)( CUR.pts.contours[contour - 1] + 1 -
                                  CUR.pts.first_point );
 
-    last_point = (FT_UShort)(CUR.pts.contours[contour] - CUR.pts.first_point);
+    last_point = (FT_UShort)( CUR.pts.contours[contour] -
+                              CUR.pts.first_point );
 
     /* XXX: this is probably wrong... at least it prevents memory */
     /*      corruption when zp2 is the twilight zone              */
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -292,7 +292,8 @@
         }
       }
 
-      ttface->internal->ignore_unpatented_hinter = FT_BOOL(!unpatented_hinting);
+      ttface->internal->ignore_unpatented_hinter =
+        FT_BOOL( !unpatented_hinting );
     }
 
 #endif /* TT_CONFIG_OPTION_UNPATENTED_HINTING &&