52f911a12d
correctly. This doesn't slow down the loading of PS fonts significantly since charstrings aren't affected. * include/freetype/config/ftstdlib.h (ft_xdigit): Renamed to... (ft_isxdigit): This. Updated all callers. (ft_isdigit): New alias to `isdigit'. * include/freetype/internal/psaux.h (PS_Parser_FuncsRec): Renamed `skip_alpha' to `skip_PS_token'. Add parameter to `to_bytes' and change some argument types. * src/psaux/psauxmod.c (ps_parser_funcs): Updated. * src/psaux/psobjs.c (ft_char_table): New array to map character codes (ASCII and EBCDIC) of digits to numbers. (OP): New auxiliary macro holding either `>=' or `<' depending on the character encoding. (skip_comment): New function. (skip_spaces): Use it. (skip_alpha): Removed. (skip_literal_string, skip_string): New functions. (ps_parser_skip_PS_token): New function. This is a better replacement of... (ps_parser_skip_alpha): Removed. (ps_parser_to_token, ps+parser_to_token_array): Updated. (T1Radix): Rewritten, using `ft_char_table'. (t1_toint): Renamed to... (ps_toint): This. Update all callers. Use `ft_char_table'. (ps_tobytes): Add parameter to handle delimiters and change some argument types. Use `ft_char_table'. (t1_tofixed): Renamed to... (ps_tofixed): This. Update all callers. Use `ft_char_table'. (t1_tocoordarray): Renamed and updated to... (ps_tocoordarray): This. Update all callers. (t1_tofixedarray): Renamed and updated to... (ps_tofixedarray): This. Update all callers. (t1_tobool): Renamed to... (ps_tobool): This. Update all callers. (ps_parser_load_field): Updated. (ps_parser_load_field_table): Use `T1_MAX_TABLE_ELEMENTS' everywhere. (ps_parser_to_int, ps_parser_to_fixed, ps_parser_to_coord_array, ps_parser_to_fixed_array): Skip spaces. Updated. (ps_parser_to_bytes): Add parameter to handle delimiters and change some argument types. Updated. * src/psaux/psobjs.h: Updated. * src/cid/cidload.c (cid_parse_dict): Updated. * src/cid/cidparse.c (cid_parser_new): Check whether the `StartData' token was really found. * src/cid/cidparse.h (cid_parser_skip_alpha): Updated and renamed to... (cid_parser_skip_PS_token): This. * src/type1/t1parse.h (T1_ParserRec): Use `FT_Bool' for boolean fields. (T1_Skip_Alpha): Replaced with... (T1_Skip_PS_Token): This new macro. * src/type1/t1parse.c (hexa_value): Removed. (T1_Get_Private_Dict): Use `ft_isxdigit' and `psaux->ps_parser_funcs_to_bytes' for handling ASCII hexadecimal encoding. After decrypting, replace the four random bytes at the beginning with whitespace. * src/type1/t1load.c (t1_allocate_blend): Use proper error values. (parser_blend_design_positions, parse_blend_design_map, parse_weight_vector): Updated. (is_space): Handle `\f' also. (is_name_char): Removed. (read_binary_data): Updated. (parse_encoding): Use `ft_isdigit'. Updated. (parse_subrs): Updated. (TABLE_EXTEND): New macro. (parse_charstrings): Updated. Provide a workaround for buggy fonts which have more entries in the /CharStrings dictionary then expected; the function now adds some slots and skips entries which still exceed the new limit. (parse_dict): Updated. Terminate on the token `closefile'. * src/type42/t42parse.c (T1_Skip_Alpha): Replaced with... (T1_Skip_PS_Token): This new macro. Updated all callers. (t42_parse_encoding): Use `ft_isdigit'. * src/base/ftmm.c (ft_face_get_mm_service): Return FT_Err_OK if success.
136 lines
5.9 KiB
C
136 lines
5.9 KiB
C
/***************************************************************************/
|
|
/* */
|
|
/* t1parse.h */
|
|
/* */
|
|
/* Type 1 parser (specification). */
|
|
/* */
|
|
/* 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, */
|
|
/* 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. */
|
|
/* */
|
|
/***************************************************************************/
|
|
|
|
|
|
#ifndef __T1PARSE_H__
|
|
#define __T1PARSE_H__
|
|
|
|
|
|
#include <ft2build.h>
|
|
#include FT_INTERNAL_TYPE1_TYPES_H
|
|
#include FT_INTERNAL_STREAM_H
|
|
|
|
|
|
FT_BEGIN_HEADER
|
|
|
|
|
|
/*************************************************************************/
|
|
/* */
|
|
/* <Struct> */
|
|
/* T1_ParserRec */
|
|
/* */
|
|
/* <Description> */
|
|
/* A PS_ParserRec is an object used to parse a Type 1 fonts very */
|
|
/* quickly. */
|
|
/* */
|
|
/* <Fields> */
|
|
/* root :: The root parser. */
|
|
/* */
|
|
/* stream :: The current input stream. */
|
|
/* */
|
|
/* base_dict :: A pointer to the top-level dictionary. */
|
|
/* */
|
|
/* base_len :: The length in bytes of the top dictionary. */
|
|
/* */
|
|
/* private_dict :: A pointer to the private dictionary. */
|
|
/* */
|
|
/* private_len :: The length in bytes of the private dictionary. */
|
|
/* */
|
|
/* in_pfb :: A boolean. Indicates that we are handling a PFB */
|
|
/* file. */
|
|
/* */
|
|
/* in_memory :: A boolean. Indicates a memory-based stream. */
|
|
/* */
|
|
/* single_block :: A boolean. Indicates that the private dictionary */
|
|
/* is stored in lieu of the base dictionary. */
|
|
/* */
|
|
typedef struct T1_ParserRec_
|
|
{
|
|
PS_ParserRec root;
|
|
FT_Stream stream;
|
|
|
|
FT_Byte* base_dict;
|
|
FT_Long base_len;
|
|
|
|
FT_Byte* private_dict;
|
|
FT_Long private_len;
|
|
|
|
FT_Bool in_pfb;
|
|
FT_Bool in_memory;
|
|
FT_Bool single_block;
|
|
|
|
} T1_ParserRec, *T1_Parser;
|
|
|
|
|
|
#define T1_Add_Table( p, i, o, l ) (p)->funcs.add( (p), i, o, l )
|
|
#define T1_Done_Table( p ) \
|
|
do \
|
|
{ \
|
|
if ( (p)->funcs.done ) \
|
|
(p)->funcs.done( p ); \
|
|
} while ( 0 )
|
|
#define T1_Release_Table( p ) \
|
|
do \
|
|
{ \
|
|
if ( (p)->funcs.release ) \
|
|
(p)->funcs.release( p ); \
|
|
} while ( 0 )
|
|
|
|
|
|
#define T1_Skip_Spaces( p ) (p)->root.funcs.skip_spaces( &(p)->root )
|
|
#define T1_Skip_PS_Token( p ) (p)->root.funcs.skip_PS_token( &(p)->root )
|
|
|
|
#define T1_ToInt( p ) (p)->root.funcs.to_int( &(p)->root )
|
|
#define T1_ToFixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t )
|
|
|
|
#define T1_ToCoordArray( p, m, c ) \
|
|
(p)->root.funcs.to_coord_array( &(p)->root, m, c )
|
|
#define T1_ToFixedArray( p, m, f, t ) \
|
|
(p)->root.funcs.to_fixed_array( &(p)->root, m, f, t )
|
|
#define T1_ToToken( p, t ) \
|
|
(p)->root.funcs.to_token( &(p)->root, t )
|
|
#define T1_ToTokenArray( p, t, m, c ) \
|
|
(p)->root.funcs.to_token_array( &(p)->root, t, m, c )
|
|
|
|
#define T1_Load_Field( p, f, o, m, pf ) \
|
|
(p)->root.funcs.load_field( &(p)->root, f, o, m, pf )
|
|
|
|
#define T1_Load_Field_Table( p, f, o, m, pf ) \
|
|
(p)->root.funcs.load_field_table( &(p)->root, f, o, m, pf )
|
|
|
|
|
|
FT_LOCAL( FT_Error )
|
|
T1_New_Parser( T1_Parser parser,
|
|
FT_Stream stream,
|
|
FT_Memory memory,
|
|
PSAux_Service psaux );
|
|
|
|
FT_LOCAL( FT_Error )
|
|
T1_Get_Private_Dict( T1_Parser parser,
|
|
PSAux_Service psaux );
|
|
|
|
FT_LOCAL( void )
|
|
T1_Finalize_Parser( T1_Parser parser );
|
|
|
|
|
|
FT_END_HEADER
|
|
|
|
#endif /* __T1PARSE_H__ */
|
|
|
|
|
|
/* END */
|