1a380e02d1
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h). (T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER, T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND. (T1_DecoderRec): New fields `buildchar' and `face'. (IS_PS_TOKEN): New macro. * freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New fields `ndv_idx', `cdv_idx', and `len_buildchar'. * freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields `default_design_vector' and `num_default_design_vector'. * freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT, and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h. * freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow `token' argument to be NULL if we want only to count the number of tokens. (ps_tocoordarray): Allow `coords' argument to be NULL if we just want to skip the array. (ps_tofixedarray): Allow `values' argument to be NULL if we just want to skip the array. * freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add support for (partially commented out) othersubrs 19-25, 27, and 28. (t1_decoder_init): Initialize new fields `face' and `buildchar'. (t1_decoder_done): Release new field `buildchar'. * freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New functions. (t1_keywords): Register them. (t1_allocate_blend): Updated. (t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER, T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND. (parse_dict): Remove `keyword_flags' argument. Use new macro IS_PS_TOKEN. Changed function so that later PostScript definitions override earlier ones. (t1_init_loader): Initialize new field `keywords_encountered'. (T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and `len_buildchar'. Remove `keywords_flags'. * freetype2/src/type1/t1load.h (T1_LoaderRect): New field `keywords_encountered'. (T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros. * freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]: New entries for parsing /NDV, /CDV, and /DesignVector.
103 lines
3.2 KiB
C
103 lines
3.2 KiB
C
/***************************************************************************/
|
|
/* */
|
|
/* t1load.h */
|
|
/* */
|
|
/* Type 1 font loader (specification). */
|
|
/* */
|
|
/* Copyright 1996-2001, 2002, 2004, 2006 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 __T1LOAD_H__
|
|
#define __T1LOAD_H__
|
|
|
|
|
|
#include <ft2build.h>
|
|
#include FT_INTERNAL_STREAM_H
|
|
#include FT_INTERNAL_POSTSCRIPT_AUX_H
|
|
#include FT_MULTIPLE_MASTERS_H
|
|
|
|
#include "t1parse.h"
|
|
|
|
|
|
FT_BEGIN_HEADER
|
|
|
|
|
|
typedef struct T1_Loader_
|
|
{
|
|
T1_ParserRec parser; /* parser used to read the stream */
|
|
|
|
FT_Int num_chars; /* number of characters in encoding */
|
|
PS_TableRec encoding_table; /* PS_Table used to store the */
|
|
/* encoding character names */
|
|
|
|
FT_Int num_glyphs;
|
|
PS_TableRec glyph_names;
|
|
PS_TableRec charstrings;
|
|
PS_TableRec swap_table; /* For moving .notdef glyph to index 0. */
|
|
|
|
FT_Int num_subrs;
|
|
PS_TableRec subrs;
|
|
FT_Bool fontdata;
|
|
|
|
FT_UInt keywords_encountered; /* T1_LOADER_ENCOUNTERED_XXX */
|
|
|
|
} T1_LoaderRec, *T1_Loader;
|
|
|
|
|
|
/* treatment of some keywords differs depending on whether */
|
|
/* they preceed or follow certain other keywords */
|
|
|
|
#define T1_PRIVATE ( 1 << 0 )
|
|
#define T1_FONTDIR_AFTER_PRIVATE ( 1 << 1 )
|
|
|
|
|
|
FT_LOCAL( FT_Error )
|
|
T1_Open_Face( T1_Face face );
|
|
|
|
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
|
|
|
|
FT_LOCAL( FT_Error )
|
|
T1_Get_Multi_Master( T1_Face face,
|
|
FT_Multi_Master* master );
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
T1_Get_MM_Var( T1_Face face,
|
|
FT_MM_Var* *master );
|
|
|
|
FT_LOCAL( FT_Error )
|
|
T1_Set_MM_Blend( T1_Face face,
|
|
FT_UInt num_coords,
|
|
FT_Fixed* coords );
|
|
|
|
FT_LOCAL( FT_Error )
|
|
T1_Set_MM_Design( T1_Face face,
|
|
FT_UInt num_coords,
|
|
FT_Long* coords );
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
T1_Set_Var_Design( T1_Face face,
|
|
FT_UInt num_coords,
|
|
FT_Fixed* coords );
|
|
|
|
FT_LOCAL( void )
|
|
T1_Done_Blend( T1_Face face );
|
|
|
|
#endif /* !T1_CONFIG_OPTION_NO_MM_SUPPORT */
|
|
|
|
|
|
FT_END_HEADER
|
|
|
|
#endif /* __T1LOAD_H__ */
|
|
|
|
|
|
/* END */
|