diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/freetype/cache/ftccmap.h | 12 | ||||
-rw-r--r-- | include/freetype/cache/ftcimage.h | 3 | ||||
-rw-r--r-- | include/freetype/freetype.h | 62 | ||||
-rw-r--r-- | include/freetype/ftcache.h | 11 | ||||
-rw-r--r-- | include/freetype/ftglyph.h | 93 | ||||
-rw-r--r-- | include/freetype/ftgzip.h | 6 | ||||
-rw-r--r-- | include/freetype/ftimage.h | 4 | ||||
-rw-r--r-- | include/freetype/ftincrem.h | 2 | ||||
-rw-r--r-- | include/freetype/t1tables.h | 4 | ||||
-rw-r--r-- | include/freetype/ttnameid.h | 2 |
10 files changed, 128 insertions, 71 deletions
diff --git a/include/freetype/cache/ftccmap.h b/include/freetype/cache/ftccmap.h index 11f7b03b6..a41989b28 100644 --- a/include/freetype/cache/ftccmap.h +++ b/include/freetype/cache/ftccmap.h @@ -4,7 +4,7 @@ /* */ /* FreeType charmap cache (specification). */ /* */ -/* Copyright 2000-2001 by */ +/* Copyright 2000-2001, 2003 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -36,7 +36,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* @type: */ - /* FTC_CmapCache */ + /* FTC_CMapCache */ /* */ /* @description: */ /* An opaque handle used to manager a charmap cache. This cache is */ @@ -54,8 +54,8 @@ FT_BEGIN_HEADER /* A handle to an @FTC_CMapDescRec structure used to describe a given */ /* charmap in a charmap cache. */ /* */ - /* Each @FTC_CMapDesc describes which charmap (of which @FTC_Face) we */ - /* want to use in @FTC_CMapCache_Lookup. */ + /* Each @FTC_CMapDesc describes which charmap (of which @FTC_FaceID) */ + /* we want to use in @FTC_CMapCache_Lookup. */ /* */ typedef struct FTC_CMapDescRec_* FTC_CMapDesc; @@ -66,8 +66,8 @@ FT_BEGIN_HEADER /* FTC_CMapType */ /* */ /* @description: */ - /* The list of valid @FTC_CMap types. They indicate how we want to */ - /* address a charmap within an @FTC_FaceID. */ + /* The list of valid @FTC_CMapDesc types. They indicate how we want */ + /* to address a charmap within an @FTC_FaceID. */ /* */ /* @values: */ /* FTC_CMAP_BY_INDEX :: */ diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h index 6acbf81b6..2d0b780e1 100644 --- a/include/freetype/cache/ftcimage.h +++ b/include/freetype/cache/ftcimage.h @@ -202,13 +202,14 @@ FT_BEGIN_HEADER /* scaled outline */ #define ftc_image_outline ftc_image_format_outline + /*************************************************************************/ /* */ /* <Struct> */ /* FTC_Image_Desc */ /* */ /* <Description> */ - /* THIS TYPE IS DEPRECATED. Use @FTC_ImageDescRec instead. */ + /* THIS TYPE IS DEPRECATED. Use @FTC_ImageTypeRec instead. */ /* */ /* A simple structure used to describe a given glyph image category. */ /* */ diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 6c17c7154..17b40132b 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -35,7 +35,7 @@ /* */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 1 -#define FREETYPE_PATCH 4 +#define FREETYPE_PATCH 5 #include <ft2build.h> @@ -147,6 +147,12 @@ FT_BEGIN_HEADER /* FT_LOAD_NO_RECURSE */ /* FT_LOAD_PEDANTIC */ /* */ + /* FT_LOAD_TARGET_NORMAL */ + /* FT_LOAD_TARGET_LIGHT */ + /* FT_LOAD_TARGET_MONO */ + /* FT_LOAD_TARGET_LCD */ + /* FT_LOAD_TARGET_LCD_V */ + /* */ /* FT_Render_Glyph */ /* FT_Render_Mode */ /* FT_Get_Kerning */ @@ -534,7 +540,7 @@ FT_BEGIN_HEADER /* */ /* FT_ENCODING_ADOBE_STANDARD :: */ /* Corresponds to the Adobe Standard encoding, as found in Type 1, */ - /* CFF, and OpenType/CFF fonts. It is limited to 256character */ + /* CFF, and OpenType/CFF fonts. It is limited to 256 character */ /* codes. */ /* */ /* FT_ENCODING_ADOBE_EXPERT :: */ @@ -955,7 +961,7 @@ FT_BEGIN_HEADER /* Indicates that the font contains glyph names that can be */ /* retrieved through @FT_Get_Glyph_Name. Note that some TrueType */ /* fonts contain broken glyph name tables. Use the function */ - /* @FT_Has_PS_Glyph_Name when needed. */ + /* @FT_Has_PS_Glyph_Names when needed. */ /* */ /* FT_FACE_FLAG_EXTERNAL_STREAM :: */ /* Used internally by FreeType to indicate that a face's stream was */ @@ -1370,8 +1376,8 @@ FT_BEGIN_HEADER /* num_subglyphs :: The number of subglyphs in a composite glyph. */ /* This field is only valid for the composite */ /* glyph format that should normally only be */ - /* loaded with the FT_LOAD_NO_RECURSE flag. For */ - /* now this is internal to FreeType. */ + /* loaded with the @FT_LOAD_NO_RECURSE flag. */ + /* For now this is internal to FreeType. */ /* */ /* subglyphs :: An array of subglyph descriptors for */ /* composite glyphs. There are `num_subglyphs' */ @@ -1547,15 +1553,15 @@ FT_BEGIN_HEADER /* */ /* FT_OPEN_PARAMS :: Use the `num_params' & `params' field. */ /* */ - /* ft_open_memory :: Deprecated. use @FT_OPEN_MEMORY instead. */ + /* ft_open_memory :: Deprecated; use @FT_OPEN_MEMORY instead. */ /* */ - /* ft_open_stream :: Deprecated. use @FT_OPEN_STREAM instead. */ + /* ft_open_stream :: Deprecated; use @FT_OPEN_STREAM instead. */ /* */ - /* ft_open_pathname :: Deprecated. use @FT_OPEN_PATHNAME instead. */ + /* ft_open_pathname :: Deprecated; use @FT_OPEN_PATHNAME instead. */ /* */ - /* ft_open_driver :: Deprecated, use @FT_OPEN_DRIVER instead. */ + /* ft_open_driver :: Deprecated; use @FT_OPEN_DRIVER instead. */ /* */ - /* ft_open_params :: Deprecated, use @FT_OPEN_PARAMS instead. */ + /* ft_open_params :: Deprecated; use @FT_OPEN_PARAMS instead. */ /* */ /* <Note> */ /* The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME' */ @@ -2065,7 +2071,7 @@ FT_BEGIN_HEADER FT_Int32 load_flags ); - /**************************************************************************** + /*************************************************************************** * * @enum: * FT_LOAD_XXX @@ -2186,6 +2192,7 @@ FT_BEGIN_HEADER * being used. This can be important for certain fonts where unhinted * output is better than auto-hinted one. */ +#define FT_LOAD_DEFAULT 0x0 #define FT_LOAD_NO_SCALE 0x1 #define FT_LOAD_NO_HINTING 0x2 #define FT_LOAD_RENDER 0x4 @@ -2206,16 +2213,43 @@ FT_BEGIN_HEADER /* */ + #define FT_LOAD_TARGET_( x ) ( (FT_Int32)( (x) & 15 ) << 16 ) #define FT_LOAD_TARGET_MODE( x ) ( (FT_Render_Mode)( ( (x) >> 16 ) & 15 ) ) + + /*************************************************************************** + * + * @enum: + * FT_LOAD_TARGET_XXX + * + * @description: + * A list of load targets. XXX + * + * @values: + * FT_LOAD_TARGET_NORMAL :: + * XXX + * + * FT_LOAD_TARGET_LIGHT :: + * XXX + * + * FT_LOAD_TARGET_MONO :: + * XXX + * + * FT_LOAD_TARGET_LCD :: + * XXX + * + * FT_LOAD_TARGET_LCD_V :: + * XXX + */ + #define FT_LOAD_TARGET_NORMAL FT_LOAD_TARGET_( FT_RENDER_MODE_NORMAL ) #define FT_LOAD_TARGET_LIGHT FT_LOAD_TARGET_( FT_RENDER_MODE_LIGHT ) #define FT_LOAD_TARGET_MONO FT_LOAD_TARGET_( FT_RENDER_MODE_MONO ) #define FT_LOAD_TARGET_LCD FT_LOAD_TARGET_( FT_RENDER_MODE_LCD ) #define FT_LOAD_TARGET_LCD_V FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V ) -#define FT_LOAD_DEFAULT 0x0 + /* */ /*************************************************************************/ @@ -2241,7 +2275,7 @@ FT_BEGIN_HEADER /* The transformation is only applied to scalable image formats after */ /* the glyph has been loaded. It means that hinting is unaltered by */ /* the transformation and is performed on the character size given in */ - /* the last call to @FT_Set_Char_Sizes or @FT_Set_Pixel_Sizes. */ + /* the last call to @FT_Set_Char_Size or @FT_Set_Pixel_Sizes. */ /* */ FT_EXPORT( void ) FT_Set_Transform( FT_Face face, @@ -2826,7 +2860,7 @@ FT_BEGIN_HEADER /* <Note> */ /* The optimization for FT_DivFix() is simple: If (a << 16) fits in */ /* 32 bits, then the division is computed directly. Otherwise, we */ - /* use a specialized version of the old @FT_MulDiv64. */ + /* use a specialized version of @FT_MulDiv. */ /* */ FT_EXPORT( FT_Long ) FT_DivFix( FT_Long a, diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index 82af39142..fd13f5d09 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -4,7 +4,7 @@ /* */ /* FreeType Cache subsystem (specification). */ /* */ -/* Copyright 1996-2001 by */ +/* Copyright 1996-2001, 2002, 2003 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -71,7 +71,6 @@ FT_BEGIN_HEADER /* FTC_Node_Unref */ /* */ /* FTC_Font */ - /* FTC_ImageDesc */ /* FTC_ImageCache */ /* FTC_ImageCache_New */ /* FTC_ImageCache_Lookup */ @@ -242,9 +241,9 @@ FT_BEGIN_HEADER /* If you lookup nodes, you have the ability to "acquire" them, i.e., */ /* to increment their reference count. This will prevent the node */ /* from being flushed out of the cache until you explicitly "release" */ - /* it (see @FTC_Node_Release). */ + /* it (see @FTC_Node_Unref). */ /* */ - /* See also @FTC_BitsetCache_Lookup and @FTC_ImageCache_Lookup. */ + /* See also @FTC_SBitCache_Lookup and @FTC_ImageCache_Lookup. */ /* */ typedef struct FTC_NodeRec_* FTC_Node; @@ -368,12 +367,12 @@ FT_BEGIN_HEADER /* */ /* <Description> */ /* Retrieves the @FT_Face and @FT_Size objects that correspond to a */ - /* given @FTC_SizeID. */ + /* given font. */ /* */ /* <Input> */ /* manager :: A handle to the cache manager. */ /* */ - /* size_id :: The ID of the `font size' to use. */ + /* font :: The font to use. */ /* */ /* <Output> */ /* aface :: A pointer to the handle of the face object. Set it to */ diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index f635fc68d..9c2a999b9 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -282,7 +282,64 @@ FT_BEGIN_HEADER FT_Matrix* matrix, FT_Vector* delta ); - /* */ + + /*************************************************************************/ + /* */ + /* <Enum> */ + /* FT_Glyph_BBox_Mode */ + /* */ + /* <Description> */ + /* The mode how the values of @FT_Glyph_Get_CBox are returned. */ + /* */ + /* <Values> */ + /* FT_GLYPH_BBOX_UNSCALED :: */ + /* Return unscaled font units. */ + /* */ + /* FT_GLYPH_BBOX_SUBPIXELS :: */ + /* Return unfitted 26.6 coordinates. */ + /* */ + /* FT_GLYPH_BBOX_GRIDFIT :: */ + /* Return grid-fitted 26.6 coordinates. */ + /* */ + /* FT_GLYPH_BBOX_TRUNCATE :: */ + /* Return coordinates in integer pixels. */ + /* */ + /* FT_GLYPH_BBOX_PIXELS :: */ + /* Return grid-fitted pixel coordinates. */ + /* */ + typedef enum FT_Glyph_BBox_Mode_ + { + FT_GLYPH_BBOX_UNSCALED = 0, + FT_GLYPH_BBOX_SUBPIXELS = 0, + FT_GLYPH_BBOX_GRIDFIT = 1, + FT_GLYPH_BBOX_TRUNCATE = 2, + FT_GLYPH_BBOX_PIXELS = 3 + + } FT_Glyph_BBox_Mode; + + + /*************************************************************************/ + /* */ + /* <Enum> */ + /* ft_glyph_bbox_xxx */ + /* */ + /* <Description> */ + /* These constants are deprecated. Use the corresponding */ + /* @FT_Glyph_BBox_Mode values instead. */ + /* */ + /* <Values> */ + /* ft_glyph_bbox_unscaled :: see @FT_GLYPH_BBOX_UNSCALED */ + /* ft_glyph_bbox_subpixels :: see @FT_GLYPH_BBOX_SUBPIXELS */ + /* ft_glyph_bbox_gridfit :: see @FT_GLYPH_BBOX_GRIDFIT */ + /* ft_glyph_bbox_truncate :: see @FT_GLYPH_BBOX_TRUNCATE */ + /* ft_glyph_bbox_pixels :: see @FT_GLYPH_BBOX_PIXELS */ + /* */ +#define ft_glyph_bbox_unscaled FT_GLYPH_BBOX_UNSCALED +#define ft_glyph_bbox_subpixels FT_GLYPH_BBOX_SUBPIXELS +#define ft_glyph_bbox_gridfit FT_GLYPH_BBOX_GRIDFIT +#define ft_glyph_bbox_truncate FT_GLYPH_BBOX_TRUNCATE +#define ft_glyph_bbox_pixels FT_GLYPH_BBOX_PIXELS + /*************************************************************************/ /* */ @@ -342,40 +399,6 @@ FT_BEGIN_HEADER /* To get the bbox in grid-fitted pixel coordinates, set `bbox_mode' */ /* to `FT_GLYPH_BBOX_PIXELS'. */ /* */ - typedef enum FT_Glyph_BBox_Mode_ - { - FT_GLYPH_BBOX_UNSCALED = 0, /* return unscaled font units */ - FT_GLYPH_BBOX_SUBPIXELS = 0, /* return unfitted 26.6 coordinates */ - FT_GLYPH_BBOX_GRIDFIT = 1, /* return grid-fitted 26.6 coordinates */ - FT_GLYPH_BBOX_TRUNCATE = 2, /* return coordinates in integer pixels */ - FT_GLYPH_BBOX_PIXELS = 3 /* return grid-fitted pixel coordinates */ - - } FT_Glyph_BBox_Mode; - - - /*************************************************************************/ - /* */ - /* <Enum> */ - /* ft_glyph_bbox_xxx */ - /* */ - /* <Description> */ - /* These constats are deprecated. Use the corresponding */ - /* @FT_Glyph_BBox_Mode values instead. */ - /* */ - /* <Values> */ - /* ft_glyph_bbox_unscaled :: see @FT_GLYPH_BBOX_UNSCALED */ - /* ft_glyph_bbox_subpixels :: see @FT_GLYPH_BBOX_SUBPIXELS */ - /* ft_glyph_bbox_gridfit :: see @FT_GLYPH_BBOX_GRIDFIT */ - /* ft_glyph_bbox_truncate :: see @FT_GLYPH_BBOX_TRUNCATE */ - /* ft_glyph_bbox_pixels :: see @FT_GLYPH_BBOX_PIXELS */ - /* */ -#define ft_glyph_bbox_unscaled FT_GLYPH_BBOX_UNSCALED -#define ft_glyph_bbox_subpixels FT_GLYPH_BBOX_SUBPIXELS -#define ft_glyph_bbox_gridfit FT_GLYPH_BBOX_GRIDFIT -#define ft_glyph_bbox_truncate FT_GLYPH_BBOX_TRUNCATE -#define ft_glyph_bbox_pixels FT_GLYPH_BBOX_PIXELS - - FT_EXPORT( void ) FT_Glyph_Get_CBox( FT_Glyph glyph, FT_UInt bbox_mode, diff --git a/include/freetype/ftgzip.h b/include/freetype/ftgzip.h index 64e43aaeb..673b4885b 100644 --- a/include/freetype/ftgzip.h +++ b/include/freetype/ftgzip.h @@ -62,9 +62,9 @@ FT_BEGIN_HEADER * @note: * The source stream must be opened _before_ calling this function. * - * Calling @FT_Stream_Close on the new stream will *not* call - * @FT_Stream_Close on the source stream. None of the stream objects - * will be released to the heap. + * Calling the internal function FT_Stream_Close on the new stream will + * *not* call FT_Stream_Close on the source stream. None of the stream + * objects will be released to the heap. * * The stream implementation is very basic and resets the decompression * process each time seeking backwards is needed within the stream. diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h index e2e8025b7..d54ef2dec 100644 --- a/include/freetype/ftimage.h +++ b/include/freetype/ftimage.h @@ -687,8 +687,8 @@ FT_BEGIN_HEADER /* */ /* FT_GLYPH_FORMAT_COMPOSITE :: */ /* The glyph image is a composite of several other images. This */ - /* format is _only_ used with @FT_LOAD_FLAG_NO_RECURSE, and is */ - /* used to report compound glyphs (like accented characters). */ + /* format is _only_ used with @FT_LOAD_NO_RECURSE, and is used to */ + /* report compound glyphs (like accented characters). */ /* */ /* FT_GLYPH_FORMAT_BITMAP :: */ /* The glyph image is a bitmap, and can be described as an */ diff --git a/include/freetype/ftincrem.h b/include/freetype/ftincrem.h index 782846a4e..e3477120e 100644 --- a/include/freetype/ftincrem.h +++ b/include/freetype/ftincrem.h @@ -199,7 +199,7 @@ FT_BEGIN_HEADER * * @description: * A table of functions for accessing fonts that load data - * incrementally. Used in @FT_Incremental_Interface. + * incrementally. Used in @FT_Incremental_InterfaceRec. * * @fields: * get_glyph_data :: diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h index 8659c9363..dd971c764 100644 --- a/include/freetype/t1tables.h +++ b/include/freetype/t1tables.h @@ -314,7 +314,7 @@ FT_BEGIN_HEADER /* CID_Info */ /* */ /* <Description> */ - /* This type is equivalent to @CID_FaceInfoRec. It is deprecated but */ + /* This type is equivalent to CID_FaceInfoRec. It is deprecated but */ /* kept to maintain source compatibility between various versions of */ /* FreeType. */ /* */ @@ -373,7 +373,7 @@ FT_BEGIN_HEADER * the face and don't need to be freed by the caller. * * If the font's format is not Postscript-based, this function will - * return the @FT_Err_Invalid_Argument error code. + * return the FT_Err_Invalid_Argument error code. */ FT_EXPORT( FT_Error ) FT_Get_PS_Font_Info( FT_Face face, diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h index 4e7513903..afb21b84c 100644 --- a/include/freetype/ttnameid.h +++ b/include/freetype/ttnameid.h @@ -41,7 +41,7 @@ FT_BEGIN_HEADER * * @description: * A list of valid values for the `platform_id' identifier code in - * @FT_CharmapRec and @FT_SfntName structures. + * @FT_CharMapRec and @FT_SfntName structures. * * @values: * TT_PLATFORM_APPLE_UNICODE :: |