[ft-devel] Re: Your FreeType patch (part3)

[Jens Claudius]

Patch for 3): Preliminary support for Multiple Master fonts like Adobe Jenson.

* freetype2/include/freetype/internal/psaux.h (enum  T1_FieldLocation_):
Add T1_FIELD_LOCATION_LOADER, T1_FIELD_LOCATION_FACE, and
T1_FIELD_LOCATION_BLEND.
(struct T1_DecoderRec_): New fields buildchar and face.
Move macros 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
(IS_PS_TOKEN): New macro

* freetype2/include/freetype/internal/t1types.h (struct  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): support
(partially commented out) for 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): New function.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(parse_private): New function.
(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'.

* freetype2/src/type1/t1load.h (struct T1_LoaderRect_): New field
`keywords_encountered'.

* freetype2/src/type1/t1tokens.h New entries for parsing /NDV, /CDV, and
/DesignVector.

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com

t1parse.patch
Description: 547774089-t1parse.patch