[sfnt] Formatting.
This commit is contained in:
parent
b355b5693a
commit
d77b1ea012
|
@ -508,7 +508,7 @@
|
||||||
FT_TRACE2(( "`" #x "' " )); \
|
FT_TRACE2(( "`" #x "' " )); \
|
||||||
FT_TRACE3(( "-->\n" )); \
|
FT_TRACE3(( "-->\n" )); \
|
||||||
\
|
\
|
||||||
error = sfnt->load_##x( face, stream ); \
|
error = sfnt->load_ ## x( face, stream ); \
|
||||||
\
|
\
|
||||||
FT_TRACE2(( "%s\n", ( !error ) \
|
FT_TRACE2(( "%s\n", ( !error ) \
|
||||||
? "loaded" \
|
? "loaded" \
|
||||||
|
@ -524,7 +524,7 @@
|
||||||
vertical ? "vertical " : "" )); \
|
vertical ? "vertical " : "" )); \
|
||||||
FT_TRACE3(( "-->\n" )); \
|
FT_TRACE3(( "-->\n" )); \
|
||||||
\
|
\
|
||||||
error = sfnt->load_##x( face, stream, vertical ); \
|
error = sfnt->load_ ## x( face, stream, vertical ); \
|
||||||
\
|
\
|
||||||
FT_TRACE2(( "%s\n", ( !error ) \
|
FT_TRACE2(( "%s\n", ( !error ) \
|
||||||
? "loaded" \
|
? "loaded" \
|
||||||
|
@ -536,7 +536,7 @@
|
||||||
|
|
||||||
#define GET_NAME( id, field ) \
|
#define GET_NAME( id, field ) \
|
||||||
do { \
|
do { \
|
||||||
error = tt_face_get_name( face, TT_NAME_ID_##id, field ); \
|
error = tt_face_get_name( face, TT_NAME_ID_ ## id, field ); \
|
||||||
if ( error ) \
|
if ( error ) \
|
||||||
goto Exit; \
|
goto Exit; \
|
||||||
} while ( 0 )
|
} while ( 0 )
|
||||||
|
@ -562,6 +562,7 @@
|
||||||
|
|
||||||
FT_UNUSED( face_index );
|
FT_UNUSED( face_index );
|
||||||
|
|
||||||
|
|
||||||
/* Check parameters */
|
/* Check parameters */
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* TrueType character mapping table (cmap) support (specification). */
|
/* TrueType character mapping table (cmap) support (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2002, 2003, 2004, 2005 by */
|
/* Copyright 2002-2005, 2009, 2012 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -55,29 +55,61 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
} TT_CMap_ClassRec;
|
} TT_CMap_ClassRec;
|
||||||
|
|
||||||
|
|
||||||
#ifndef FT_CONFIG_OPTION_PIC
|
#ifndef FT_CONFIG_OPTION_PIC
|
||||||
|
|
||||||
#define FT_DEFINE_TT_CMAP(class_, size_, init_, done_, char_index_, \
|
#define FT_DEFINE_TT_CMAP( class_, \
|
||||||
char_next_, char_var_index_, char_var_default_, variant_list_, \
|
size_, \
|
||||||
charvariant_list_,variantchar_list_, \
|
init_, \
|
||||||
format_, validate_, get_cmap_info_) \
|
done_, \
|
||||||
|
char_index_, \
|
||||||
|
char_next_, \
|
||||||
|
char_var_index_, \
|
||||||
|
char_var_default_, \
|
||||||
|
variant_list_, \
|
||||||
|
charvariant_list_, \
|
||||||
|
variantchar_list_, \
|
||||||
|
format_, \
|
||||||
|
validate_, \
|
||||||
|
get_cmap_info_ ) \
|
||||||
FT_CALLBACK_TABLE_DEF \
|
FT_CALLBACK_TABLE_DEF \
|
||||||
const TT_CMap_ClassRec class_ = \
|
const TT_CMap_ClassRec class_ = \
|
||||||
{ \
|
{ \
|
||||||
{size_, init_, done_, char_index_, \
|
{ size_, \
|
||||||
char_next_, char_var_index_, char_var_default_, variant_list_, \
|
init_, \
|
||||||
charvariant_list_, variantchar_list_}, \
|
done_, \
|
||||||
format_, validate_, get_cmap_info_ \
|
char_index_, \
|
||||||
|
char_next_, \
|
||||||
|
char_var_index_, \
|
||||||
|
char_var_default_, \
|
||||||
|
variant_list_, \
|
||||||
|
charvariant_list_, \
|
||||||
|
variantchar_list_ \
|
||||||
|
}, \
|
||||||
|
\
|
||||||
|
format_, \
|
||||||
|
validate_, \
|
||||||
|
get_cmap_info_ \
|
||||||
};
|
};
|
||||||
|
|
||||||
#else /* FT_CONFIG_OPTION_PIC */
|
#else /* FT_CONFIG_OPTION_PIC */
|
||||||
|
|
||||||
#define FT_DEFINE_TT_CMAP(class_, size_, init_, done_, char_index_, \
|
#define FT_DEFINE_TT_CMAP( class_, \
|
||||||
char_next_, char_var_index_, char_var_default_, variant_list_, \
|
size_, \
|
||||||
charvariant_list_,variantchar_list_, \
|
init_, \
|
||||||
format_, validate_, get_cmap_info_) \
|
done_, \
|
||||||
|
char_index_, \
|
||||||
|
char_next_, \
|
||||||
|
char_var_index_, \
|
||||||
|
char_var_default_, \
|
||||||
|
variant_list_, \
|
||||||
|
charvariant_list_, \
|
||||||
|
variantchar_list_, \
|
||||||
|
format_, \
|
||||||
|
validate_, \
|
||||||
|
get_cmap_info_ ) \
|
||||||
void \
|
void \
|
||||||
FT_Init_Class_##class_( TT_CMap_ClassRec* clazz ) \
|
FT_Init_Class_ ## class_( TT_CMap_ClassRec* clazz ) \
|
||||||
{ \
|
{ \
|
||||||
clazz->clazz.size = size_; \
|
clazz->clazz.size = size_; \
|
||||||
clazz->clazz.init = init_; \
|
clazz->clazz.init = init_; \
|
||||||
|
@ -96,6 +128,7 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
#endif /* FT_CONFIG_OPTION_PIC */
|
#endif /* FT_CONFIG_OPTION_PIC */
|
||||||
|
|
||||||
|
|
||||||
typedef struct TT_ValidatorRec_
|
typedef struct TT_ValidatorRec_
|
||||||
{
|
{
|
||||||
FT_ValidatorRec validator;
|
FT_ValidatorRec validator;
|
||||||
|
@ -104,7 +137,7 @@ FT_BEGIN_HEADER
|
||||||
} TT_ValidatorRec, *TT_Validator;
|
} TT_ValidatorRec, *TT_Validator;
|
||||||
|
|
||||||
|
|
||||||
#define TT_VALIDATOR( x ) ((TT_Validator)( x ))
|
#define TT_VALIDATOR( x ) ( (TT_Validator)( x ) )
|
||||||
#define TT_VALID_GLYPH_COUNT( x ) TT_VALIDATOR( x )->num_glyphs
|
#define TT_VALID_GLYPH_COUNT( x ) TT_VALIDATOR( x )->num_glyphs
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,39 +17,40 @@
|
||||||
|
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_0
|
#ifdef TT_CONFIG_CMAP_FORMAT_0
|
||||||
TTCMAPCITEM(tt_cmap0_class_rec)
|
TTCMAPCITEM( tt_cmap0_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_2
|
#ifdef TT_CONFIG_CMAP_FORMAT_2
|
||||||
TTCMAPCITEM(tt_cmap2_class_rec)
|
TTCMAPCITEM( tt_cmap2_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_4
|
#ifdef TT_CONFIG_CMAP_FORMAT_4
|
||||||
TTCMAPCITEM(tt_cmap4_class_rec)
|
TTCMAPCITEM( tt_cmap4_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_6
|
#ifdef TT_CONFIG_CMAP_FORMAT_6
|
||||||
TTCMAPCITEM(tt_cmap6_class_rec)
|
TTCMAPCITEM( tt_cmap6_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_8
|
#ifdef TT_CONFIG_CMAP_FORMAT_8
|
||||||
TTCMAPCITEM(tt_cmap8_class_rec)
|
TTCMAPCITEM( tt_cmap8_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_10
|
#ifdef TT_CONFIG_CMAP_FORMAT_10
|
||||||
TTCMAPCITEM(tt_cmap10_class_rec)
|
TTCMAPCITEM( tt_cmap10_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_12
|
#ifdef TT_CONFIG_CMAP_FORMAT_12
|
||||||
TTCMAPCITEM(tt_cmap12_class_rec)
|
TTCMAPCITEM( tt_cmap12_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_13
|
#ifdef TT_CONFIG_CMAP_FORMAT_13
|
||||||
TTCMAPCITEM(tt_cmap13_class_rec)
|
TTCMAPCITEM( tt_cmap13_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_CMAP_FORMAT_14
|
#ifdef TT_CONFIG_CMAP_FORMAT_14
|
||||||
TTCMAPCITEM(tt_cmap14_class_rec)
|
TTCMAPCITEM( tt_cmap14_class_rec )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* END */
|
/* END */
|
||||||
|
|
Loading…
Reference in New Issue