* src/type1/t1load.c (is_space): Removed.

(parse_encoding, parse_charstrings): Use IS_PS_DELIM.
(parse_charstrings): Use IS_PS_TOKEN.


* autogen.sh: Avoid bash specific syntax.
This commit is contained in:
Werner Lemberg 2007-01-12 09:28:44 +00:00
parent 490503acf5
commit 17432b5e37
12 changed files with 99 additions and 93 deletions

View File

@ -1,34 +1,44 @@
2007-01-11 Werner Lemberg <wl@gnu.org>
* src/type1/t1load.c (is_space): Removed.
(parse_encoding, parse_charstrings): Use IS_PS_DELIM.
(parse_charstrings): Use IS_PS_TOKEN.
* autogen.sh: Avoid bash specific syntax.
2007-01-11 David Turner <david@freetype.org> 2007-01-11 David Turner <david@freetype.org>
* docs/CHANGES: small update * docs/CHANGES: Small update.
* builds/unix/configure.ac: updating libtool version number to 9.11.3 * builds/unix/configure.raw (version_info): Set to 9:11:3.
* src/base/ftobjs.c (IsMacResource): fixed a small bug that caused a * src/base/ftobjs.c (IsMacResource): Fix a small bug that caused a
crash with some Mac OS X .dfont files. Submitted by Masatake Yamoto. crash with some Mac OS X .dfont files. Submitted by Masatake
Yamoto.
* autogen.sh: small fix to get it working on Mac OS X properly, * autogen.sh: Small fix to get it working on Mac OS X properly:
the issue is that GNU libtool is called "glibtool" on this platform, The issue is that GNU libtool is called `glibtool' on this platform,
and we must call "glibtoolize", since "libtoolize" doesn't exist and we must call `glibtoolize', since `libtoolize' doesn't exist.
2007-01-10 David Turner <david@freetype.org> 2007-01-10 David Turner <david@freetype.org>
* all-sources: tagging all sources with VER-2-3-0-RC1 and * all-sources: Tag all sources with VER-2-3-0-RC1 and
VER-2-3-0 VER-2-3-0.
* Jamfile, README, builds/win32/visualc/freetype.dsp, * Jamfile (RefDoc), README, builds/win32/visualc/freetype.dsp,
builds/win32/visualc/freetype.vcproj, docs/VERSION.DLL, builds/win32/visualc/freetype.vcproj, docs/VERSION.DLL: Update
include/freetype/freetype.h, include/freetype/t1tables.h, version number to 2.3.0.
include/freetype/internal/tttypes.h: updating version
number to 2.3.0 !! * include/freetype/freetype.h (FREETYPE_MINOR): Set to 3.
(FREETYPE_PATCH): Set to 0.
* include/freetype/ftchapters.h, include/freetype/ftgasp.h, * include/freetype/ftchapters.h, include/freetype/ftgasp.h,
include/freetype/ftlcdfil.h: updating reference documentation include/freetype/ftlcdfil.h: Update reference documentation with
with GASP support and LCD filtering sections GASP support and LCD filtering sections.
* src/pshinter/pshalgo.c (psh_glyph_compute_inflections): * src/pshinter/pshalgo.c (psh_glyph_compute_inflections): Fix a typo
fixed a typo which created an endless loop with some malformed which created an endless loop with some malformed font files.
font files
2007-01-10 Derek Clegg <dclegg@apple.com> 2007-01-10 Derek Clegg <dclegg@apple.com>

View File

@ -1,6 +1,6 @@
# FreeType 2 top Jamfile. # FreeType 2 top Jamfile.
# #
# Copyright 2001, 2002, 2003, 2004, 2005, 2006 by # Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

2
README
View File

@ -51,7 +51,7 @@
---------------------------------------------------------------------- ----------------------------------------------------------------------
Copyright 2006 by Copyright 2006, 2007 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, This file is part of the FreeType project, and may only be used,

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright 2005, 2006 by # Copyright 2005, 2006, 2007 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -40,14 +40,13 @@ echo "generating \`configure.ac'"
sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
< configure.raw > configure.ac < configure.raw > configure.ac
# on MacOS X, the GNU libtool is named "glibtool" # On MacOS X, the GNU libtool is named `glibtool'.
HOSTOS=$(uname) HOSTOS=`uname`
LIBTOOLIZE=libtoolize LIBTOOLIZE=libtoolize
if [ "$HOSTOS"x == Darwinx ] ; then if test "$HOSTOS"x = Darwinx; then
LIBTOOLIZE=glibtoolize LIBTOOLIZE=glibtoolize
fi fi
run aclocal -I . --force run aclocal -I . --force
run $LIBTOOLIZE --force --copy run $LIBTOOLIZE --force --copy
run autoconf --force run autoconf --force

View File

@ -2,7 +2,7 @@
# #
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
# #
# Copyright 2001, 2002, 2003, 2004, 2005, 2006 by # Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL! # Don't forget to update docs/VERSION.DLL!
version_info='9:10:3' version_info='9:11:3'
AC_SUBST([version_info]) AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .` ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version]) AC_SUBST([ft_version])

View File

@ -1,4 +1,4 @@
CHANGES BETWEEN 2.2.2 and 2.2.1 CHANGES BETWEEN 2.3.0 and 2.2.1
I. IMPORTANT BUG FIXES I. IMPORTANT BUG FIXES
@ -127,8 +127,9 @@ CHANGES BETWEEN 2.2.2 and 2.2.1
- Better support for Mac Fonts on POSIX systems, plus compilation - Better support for Mac Fonts on POSIX systems, plus compilation
fixes for PPC64. fixes for PPC64.
- The TrueTypeGX validator (gxvalid) checks the order of glyph ids - The TrueTypeGX validator (gxvalid) checks the order of glyph IDs
in the kern table in the kern table.
====================================================================== ======================================================================

View File

@ -113,7 +113,7 @@ other release numbers.
------------------------------------------------------------------------ ------------------------------------------------------------------------
Copyright 2002, 2003, 2004, 2005, 2006 by Copyright 2002, 2003, 2004, 2005, 2006, 2007 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, This file is part of the FreeType project, and may only be used,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* FreeType high-level API and common types (specification only). */ /* FreeType high-level API and common types (specification only). */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ /* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */

View File

@ -22,24 +22,23 @@
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
/*************************************************************************** /***************************************************************************
* *
* @section: * @section:
* gasp_table * gasp_table
* *
* @title: * @title:
* Gasp Table * Gasp Table
* *
* @abstract: * @abstract:
* Retrieving TrueType GASP table entries * Retrieving TrueType `gasp' table entries
* *
* @description: * @description:
* The function @FT_Get_Gasp can be used to query a TrueType or OpenType * The function @FT_Get_Gasp can be used to query a TrueType or OpenType
* font for specific entries in their GASP table, if any. This is mainly * font for specific entries in their `gasp' table, if any. This is
* useful when implementing native TrueType hinting with the bytecode * mainly useful when implementing native TrueType hinting with the
* interpreter and when one wants to duplicate the Windows text rendering * bytecode interpreter to duplicate the Windows text rendering results.
* results */
*/
/************************************************************************* /*************************************************************************
* *
@ -72,7 +71,8 @@
* `ClearType' is Microsoft's implementation of LCD rendering, partly * `ClearType' is Microsoft's implementation of LCD rendering, partly
* protected by patents. * protected by patents.
* *
* @since: 2.3.0 * @since:
* 2.3.0
*/ */
#define FT_GASP_NO_TABLE -1 #define FT_GASP_NO_TABLE -1
#define FT_GASP_DO_GRIDFIT 0x01 #define FT_GASP_DO_GRIDFIT 0x01
@ -98,7 +98,8 @@
* Bit flags (see @FT_GASP_XXX), or @FT_GASP_NO_TABLE is there is no * Bit flags (see @FT_GASP_XXX), or @FT_GASP_NO_TABLE is there is no
* `gasp' table in the face. * `gasp' table in the face.
* *
* @since: 2.3.0 * @since:
* 2.3.0
*/ */
FT_EXPORT( FT_Int ) FT_EXPORT( FT_Int )
FT_Get_Gasp( FT_Face face, FT_Get_Gasp( FT_Face face,

View File

@ -5,7 +5,7 @@
/* FreeType API for color filtering of subpixel bitmap glyphs */ /* FreeType API for color filtering of subpixel bitmap glyphs */
/* (specification). */ /* (specification). */
/* */ /* */
/* Copyright 2006 by */ /* Copyright 2006, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -26,27 +26,29 @@
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************** /***************************************************************************
* *
* @section: * @section:
* lcd_filtering * lcd_filtering
* *
* @title: * @title:
* LCD Filtering * LCD Filtering
* *
* @abstract: * @abstract:
* Reduce color fringes of LCD-optimized bitmaps * Reduce color fringes of LCD-optimized bitmaps.
* *
* @description: * @description:
* The @FT_Library_SetLcdFilter API can be used to specify a low-pass filter * The @FT_Library_SetLcdFilter API can be used to specify a low-pass
* to be applied to LCD-optimized bitmaps generated through @FT_Render_Glyph. * filter which is then applied to LCD-optimized bitmaps generated
* This is useful to reduce color fringes when compared to unfiltered rendering. * through @FT_Render_Glyph. This is useful to reduce color fringes
* * which would occur with unfiltered rendering.
* Note that no filter is active by default, and that this function is *
* *not* implemented in default builds of the library. You need to #define * Note that no filter is active by default, and that this function is
* FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your ftoption.h file in order to * *not* implemented in default builds of the library. You need to
* activate it. * #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your `ftoption.h' file
*/ * in order to activate it.
*/
/**************************************************************************** /****************************************************************************
* *
@ -68,7 +70,7 @@ FT_BEGIN_HEADER
* FT_LCD_FILTER_LIGHT :: * FT_LCD_FILTER_LIGHT ::
* The light filter is a variant that produces less blurriness at the * The light filter is a variant that produces less blurriness at the
* cost of slightly more color fringes than the default one. It might * cost of slightly more color fringes than the default one. It might
* be better, depending on taste, your monitor or your personal vision. * be better, depending on taste, your monitor, or your personal vision.
* *
* FT_LCD_FILTER_LEGACY :: * FT_LCD_FILTER_LEGACY ::
* This filter corresponds to the original libXft color filter. It * This filter corresponds to the original libXft color filter. It
@ -80,7 +82,8 @@ FT_BEGIN_HEADER
* This filter is only provided for comparison purposes, and might be * This filter is only provided for comparison purposes, and might be
* disabled or stay unsupported in the future. * disabled or stay unsupported in the future.
* *
* @since: 2.3.0 * @since:
* 2.3.0
*/ */
typedef enum typedef enum
{ {
@ -145,7 +148,8 @@ FT_BEGIN_HEADER
* need to modify their layout and glyph positioning code when enabling * need to modify their layout and glyph positioning code when enabling
* the filter. * the filter.
* *
* @since: 2.3.0 * @since:
* 2.3.0
*/ */
FT_EXPORT( FT_Error ) FT_EXPORT( FT_Error )
FT_Library_SetLcdFilter( FT_Library library, FT_Library_SetLcdFilter( FT_Library library,

View File

@ -1446,7 +1446,7 @@
face_index, aface ); face_index, aface );
FT_FREE( data_offsets ); FT_FREE( data_offsets );
/* POST exists in an LWFN providing a single face */ /* POST exists in an LWFN providing a single face */
if (!error) if ( !error )
(*aface)->num_faces = 1; (*aface)->num_faces = 1;
return error; return error;
} }
@ -1463,7 +1463,7 @@
error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count, error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count,
face_index_internal, aface ); face_index_internal, aface );
FT_FREE( data_offsets ); FT_FREE( data_offsets );
if (!error) if ( !error )
(*aface)->num_faces = count; (*aface)->num_faces = count;
} }

View File

@ -1014,15 +1014,6 @@
} }
static int
is_space( FT_Byte c )
{
return ( c == ' ' || c == '\t' ||
c == '\r' || c == '\n' || c == '\f' ||
c == '\0' );
}
static int static int
read_binary_data( T1_Parser parser, read_binary_data( T1_Parser parser,
FT_Long* size, FT_Long* size,
@ -1206,9 +1197,9 @@
/* we stop when we encounter a `def' or `]' */ /* we stop when we encounter a `def' or `]' */
if ( *cur == 'd' && cur + 3 < limit ) if ( *cur == 'd' && cur + 3 < limit )
{ {
if ( cur[1] == 'e' && if ( cur[1] == 'e' &&
cur[2] == 'f' && cur[2] == 'f' &&
is_space( cur[3] ) ) IS_PS_DELIM( cur[3] ) )
{ {
FT_TRACE6(( "encoding end\n" )); FT_TRACE6(( "encoding end\n" ));
cur += 3; cur += 3;
@ -1488,7 +1479,7 @@
break; break;
/* we stop when we find a `def' or `end' keyword */ /* we stop when we find a `def' or `end' keyword */
if ( cur + 3 < limit && is_space( cur[3] ) ) if ( cur + 3 < limit && IS_PS_DELIM( cur[3] ) )
{ {
if ( cur[0] == 'd' && if ( cur[0] == 'd' &&
cur[1] == 'e' && cur[1] == 'e' &&