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.
120 lines
3.1 KiB
C
120 lines
3.1 KiB
C
/***************************************************************************/
|
|
/* */
|
|
/* psauxmod.c */
|
|
/* */
|
|
/* FreeType auxiliary PostScript module implementation (body). */
|
|
/* */
|
|
/* Copyright 2000-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. */
|
|
/* */
|
|
/***************************************************************************/
|
|
|
|
|
|
#include <ft2build.h>
|
|
#include "psauxmod.h"
|
|
#include "psobjs.h"
|
|
#include "t1decode.h"
|
|
#include "t1cmap.h"
|
|
|
|
|
|
FT_CALLBACK_TABLE_DEF
|
|
const PS_Table_FuncsRec ps_table_funcs =
|
|
{
|
|
ps_table_new,
|
|
ps_table_done,
|
|
ps_table_add,
|
|
ps_table_release
|
|
};
|
|
|
|
|
|
FT_CALLBACK_TABLE_DEF
|
|
const PS_Parser_FuncsRec ps_parser_funcs =
|
|
{
|
|
ps_parser_init,
|
|
ps_parser_done,
|
|
ps_parser_skip_spaces,
|
|
ps_parser_skip_PS_token,
|
|
ps_parser_to_int,
|
|
ps_parser_to_fixed,
|
|
ps_parser_to_bytes,
|
|
ps_parser_to_coord_array,
|
|
ps_parser_to_fixed_array,
|
|
ps_parser_to_token,
|
|
ps_parser_to_token_array,
|
|
ps_parser_load_field,
|
|
ps_parser_load_field_table
|
|
};
|
|
|
|
|
|
FT_CALLBACK_TABLE_DEF
|
|
const T1_Builder_FuncsRec t1_builder_funcs =
|
|
{
|
|
t1_builder_init,
|
|
t1_builder_done,
|
|
t1_builder_check_points,
|
|
t1_builder_add_point,
|
|
t1_builder_add_point1,
|
|
t1_builder_add_contour,
|
|
t1_builder_start_point,
|
|
t1_builder_close_contour
|
|
};
|
|
|
|
|
|
FT_CALLBACK_TABLE_DEF
|
|
const T1_Decoder_FuncsRec t1_decoder_funcs =
|
|
{
|
|
t1_decoder_init,
|
|
t1_decoder_done,
|
|
t1_decoder_parse_charstrings
|
|
};
|
|
|
|
|
|
FT_CALLBACK_TABLE_DEF
|
|
const T1_CMap_ClassesRec t1_cmap_classes =
|
|
{
|
|
&t1_cmap_standard_class_rec,
|
|
&t1_cmap_expert_class_rec,
|
|
&t1_cmap_custom_class_rec,
|
|
&t1_cmap_unicode_class_rec
|
|
};
|
|
|
|
|
|
static
|
|
const PSAux_Interface psaux_interface =
|
|
{
|
|
&ps_table_funcs,
|
|
&ps_parser_funcs,
|
|
&t1_builder_funcs,
|
|
&t1_decoder_funcs,
|
|
|
|
t1_decrypt,
|
|
|
|
(const T1_CMap_ClassesRec*) &t1_cmap_classes,
|
|
};
|
|
|
|
|
|
FT_CALLBACK_TABLE_DEF
|
|
const FT_Module_Class psaux_module_class =
|
|
{
|
|
0,
|
|
sizeof( FT_ModuleRec ),
|
|
"psaux",
|
|
0x20000L,
|
|
0x20000L,
|
|
|
|
&psaux_interface, /* module-specific interface */
|
|
|
|
(FT_Module_Constructor)0,
|
|
(FT_Module_Destructor) 0,
|
|
(FT_Module_Requester) 0
|
|
};
|
|
|
|
|
|
/* END */
|