forked from minhngoc25a/freetype2
e7d4fea866
fonts. Additionally, some entries were handled as `integer' instead of `number'. * include/freetype/internal/psaux.h (T1_FieldType): Add T1_FIELD_TYPE_BOOL_P, T1_FIELD_TYPE_INTEGER_P, and T1_FIELD_TYPE_FIXED_P. (T1_FIELD_BOOL_P, T1_FIELD_NUM_P, T1_FIELD_FIXED_P): New macros. * src/psaux/psobjs.c (ps_parser_load_field): Handle new field types. * include/freetype/internal/cfftypes.h (CFF_FontRecDict), src/cff/cfftoken.h: Change type of underline_position and underline_thickness to FT_Fixed. * src/cff/cffload.c (cff_subfont_load): Fix default values of underline_position and underline_thickness. * src/cff/cffobjs.c (cff_face_init): Set underline_position and underline_thickness in `root'. * include/freetype/internal/t1types.h (T1_Font): Change point_type and stroke_width to pointers. * include/freetype/t1tables.h (PS_FontInfo): Change italic_angle, is_fixed_pitch, underline_position, and underline_thickness to pointers. * src/type1/t1tokens.h: Change italic_angle, is_fixed_pitch, underline_position, and underline_thickness to pointers. Change the type of the latter two to `fixed'. Change type of stroke_width to `fixed' and make it a pointer. Change paint_type to pointer. * src/type1/t1objs.c (T1_Face_Done): Updated. (T1_Face_Init): Updated. Fix assignment of underline_position and underline_thickness. * src/cid/cidtoken.h: Change italic_angle, is_fixed_pitch, underline_position, and underline_thickness to pointers. Change the type of the latter two to `fixed'. Change type of stroke_width to `fixed'. * src/cid/cidobjs.c (cid_face_done): Updated. (cid_face_init): Updated. Fix assignment of underline_position and underline_thickness. * src/type42/t42parse.c: Change italic_angle, is_fixed_pitch, underline_position, and underline_thickness to pointers. Change the type of the latter two to `fixed'. Change type of stroke_width to `fixed' and make it a pointer. Change paint_type to pointer. * src/type42/t42objs.c (T42_Face_Init): Updated. Fix assignment of underline_position and underline_thickness. (T42_Face_Done): Updated. * src/base/ftobjs.c (open_face_from_buffer): Fix compiler warning. * src/pshinter/pshglob.c, src/pshinter/pshglob.h (psh_globals_set_scale): Make it a local function. * test/gview.c: Fix remaming ps3->ps typo. Formatting.
97 lines
3.9 KiB
C
97 lines
3.9 KiB
C
/***************************************************************************/
|
|
/* */
|
|
/* cidtoken.h */
|
|
/* */
|
|
/* CID token definitions (specification only). */
|
|
/* */
|
|
/* 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. */
|
|
/* */
|
|
/***************************************************************************/
|
|
|
|
|
|
#undef FT_STRUCTURE
|
|
#define FT_STRUCTURE CID_FaceInfoRec
|
|
#undef T1CODE
|
|
#define T1CODE T1_FIELD_LOCATION_CID_INFO
|
|
|
|
T1_FIELD_STRING( "CIDFontName", cid_font_name )
|
|
T1_FIELD_NUM ( "CIDFontVersion", cid_version )
|
|
T1_FIELD_NUM ( "CIDFontType", cid_font_type )
|
|
T1_FIELD_STRING( "Registry", registry )
|
|
T1_FIELD_STRING( "Ordering", ordering )
|
|
T1_FIELD_NUM ( "Supplement", supplement )
|
|
T1_FIELD_NUM ( "UIDBase", uid_base )
|
|
T1_FIELD_NUM ( "CIDMapOffset", cidmap_offset )
|
|
T1_FIELD_NUM ( "FDBytes", fd_bytes )
|
|
T1_FIELD_NUM ( "GDBytes", gd_bytes )
|
|
T1_FIELD_NUM ( "CIDCount", cid_count )
|
|
|
|
|
|
#undef FT_STRUCTURE
|
|
#define FT_STRUCTURE PS_FontInfoRec
|
|
#undef T1CODE
|
|
#define T1CODE T1_FIELD_LOCATION_FONT_INFO
|
|
|
|
T1_FIELD_STRING ( "version", version )
|
|
T1_FIELD_STRING ( "Notice", notice )
|
|
T1_FIELD_STRING ( "FullName", full_name )
|
|
T1_FIELD_STRING ( "FamilyName", family_name )
|
|
T1_FIELD_STRING ( "Weight", weight )
|
|
T1_FIELD_FIXED_P ( "ItalicAngle", italic_angle )
|
|
T1_FIELD_TYPE_BOOL_P( "isFixedPitch", is_fixed_pitch )
|
|
T1_FIELD_FIXED_P ( "UnderlinePosition", underline_position )
|
|
T1_FIELD_FIXED_P ( "UnderlineThickness", underline_thickness )
|
|
|
|
|
|
#undef FT_STRUCTURE
|
|
#define FT_STRUCTURE CID_FaceDictRec
|
|
#undef T1CODE
|
|
#define T1CODE T1_FIELD_LOCATION_FONT_DICT
|
|
|
|
T1_FIELD_NUM ( "PaintType", paint_type )
|
|
T1_FIELD_NUM ( "FontType", font_type )
|
|
T1_FIELD_NUM ( "SubrMapOffset", subrmap_offset )
|
|
T1_FIELD_NUM ( "SDBytes", sd_bytes )
|
|
T1_FIELD_NUM ( "SubrCount", num_subrs )
|
|
T1_FIELD_NUM ( "lenBuildCharArray", len_buildchar )
|
|
T1_FIELD_FIXED( "ForceBoldThreshold", forcebold_threshold )
|
|
T1_FIELD_FIXED( "ExpansionFactor", expansion_factor )
|
|
T1_FIELD_FIXED( "StrokeWidth", stroke_width )
|
|
|
|
|
|
#undef FT_STRUCTURE
|
|
#define FT_STRUCTURE PS_PrivateRec
|
|
#undef T1CODE
|
|
#define T1CODE T1_FIELD_LOCATION_PRIVATE
|
|
|
|
T1_FIELD_NUM ( "UniqueID", unique_id )
|
|
T1_FIELD_NUM ( "lenIV", lenIV )
|
|
T1_FIELD_NUM ( "LanguageGroup", language_group )
|
|
T1_FIELD_NUM ( "password", password )
|
|
|
|
T1_FIELD_FIXED ( "BlueScale", blue_scale )
|
|
T1_FIELD_NUM ( "BlueShift", blue_shift )
|
|
T1_FIELD_NUM ( "BlueFuzz", blue_fuzz )
|
|
|
|
T1_FIELD_NUM_TABLE ( "BlueValues", blue_values, 14 )
|
|
T1_FIELD_NUM_TABLE ( "OtherBlues", other_blues, 10 )
|
|
T1_FIELD_NUM_TABLE ( "FamilyBlues", family_blues, 14 )
|
|
T1_FIELD_NUM_TABLE ( "FamilyOtherBlues", family_other_blues, 10 )
|
|
|
|
T1_FIELD_NUM_TABLE2( "StdHW", standard_width, 1 )
|
|
T1_FIELD_NUM_TABLE2( "StdVW", standard_height, 1 )
|
|
T1_FIELD_NUM_TABLE2( "MinFeature", min_feature, 2 )
|
|
|
|
T1_FIELD_NUM_TABLE ( "StemSnapH", snap_widths, 12 )
|
|
T1_FIELD_NUM_TABLE ( "StemSnapV", snap_heights, 12 )
|
|
|
|
|
|
/* END */
|