From 774a0719e77afec5372e5f064af408cb6cd4fd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yamato=2C=20Masatake=20=28=E5=A4=A7=E5=92=8C=E6=AD=A3?= =?UTF-8?q?=E6=AD=A6=29?= Date: Thu, 6 May 2004 12:17:41 +0000 Subject: [PATCH] */*.[ch]: Rename FTL_Glyphs_Array to FTL_GlyphArray. --- ChangeLog | 5 +++ include/freetype/ftlayout.h | 22 ++++++------- include/freetype/internal/services/svlayout.h | 4 +-- src/base/ftlayout.c | 16 +++++----- src/gxlayout/fi.c | 2 +- src/gxlayout/gxaccess.c | 10 +++--- src/gxlayout/gxaccess.h | 10 +++--- src/gxlayout/gxdemo.c | 2 +- src/gxlayout/gxlayout.c | 4 +-- src/gxlayout/gxltypes.h | 4 +-- src/gxlayout/gxvm.c | 32 +++++++++---------- src/gxlayout/gxvm.h | 20 ++++++------ src/otlayout/ot-types.h | 2 +- src/otlayout/otdemo.c | 2 +- src/otlayout/otlayout.c | 4 +-- src/otlayout/otltypes.h | 4 +-- 16 files changed, 74 insertions(+), 69 deletions(-) diff --git a/ChangeLog b/ChangeLog index 255a3efa8..afd32b5b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-06 Masatake YAMATO + + * */*.[ch]: Rename FTL_Glyphs_Array to + FTL_GlyphArray. + 2004-05-03 Masatake YAMATO * src/gxlayout/gxdemo.c (set_trace_level): Move loca variation diff --git a/include/freetype/ftlayout.h b/include/freetype/ftlayout.h index e7ce1d4df..e6fe4bf8e 100644 --- a/include/freetype/ftlayout.h +++ b/include/freetype/ftlayout.h @@ -70,13 +70,13 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* */ - /* FTL_Glyphs_Array */ + /* FTL_GlyphArray */ /* */ /* */ /* Data type represents glyphs array used in glyph substitution. */ /* See @FTL_GlyphRec for more detail. */ /* */ - typedef struct FTL_Glyphs_ArrayRec_ * FTL_Glyphs_Array; + typedef struct FTL_GlyphArrayRec_ * FTL_GlyphArray; /*************************************************************************/ /* */ @@ -181,7 +181,7 @@ FT_BEGIN_HEADER /* allocated :: The allocation size of glyphs. The client should not */ /* refer this field. */ /* */ - typedef struct FTL_Glyphs_ArrayRec_ + typedef struct FTL_GlyphArrayRec_ { FT_Memory memory; FTL_Glyph glyphs; @@ -189,7 +189,7 @@ FT_BEGIN_HEADER FT_ULong reserved1; FT_ULong length; FT_ULong allocated; - } FTL_Glyphs_ArrayRec; + } FTL_GlyphArrayRec; /*************************************************************************/ @@ -376,7 +376,7 @@ FT_BEGIN_HEADER /* */ FT_EXPORT( FT_Error ) FTL_New_Glyphs_Array ( FT_Memory memory, - FTL_Glyphs_Array * garray ); + FTL_GlyphArray * garray ); /*************************************************************************/ /* */ @@ -396,7 +396,7 @@ FT_BEGIN_HEADER /* FreeType error code. 0 means success. */ /* */ FT_EXPORT( FT_Error ) - FTL_Set_Glyphs_Array_Length ( FTL_Glyphs_Array garray, + FTL_Set_Glyphs_Array_Length ( FTL_GlyphArray garray, FT_ULong new_length ); /*************************************************************************/ @@ -417,8 +417,8 @@ FT_BEGIN_HEADER /* FreeType error code. 0 means success. */ /* */ FT_EXPORT( FT_Error ) - FTL_Copy_Glyphs_Array ( FTL_Glyphs_Array in, - FTL_Glyphs_Array out ); + FTL_Copy_Glyphs_Array ( FTL_GlyphArray in, + FTL_GlyphArray out ); /*************************************************************************/ /* */ @@ -435,7 +435,7 @@ FT_BEGIN_HEADER /* FreeType error code. 0 means success. */ /* */ FT_EXPORT( FT_Error ) - FTL_Done_Glyphs_Array ( FTL_Glyphs_Array garray ); + FTL_Done_Glyphs_Array ( FTL_GlyphArray garray ); /*************************************************************************/ @@ -460,8 +460,8 @@ FT_BEGIN_HEADER /* */ FT_EXPORT( FT_Error ) FTL_Substitute_Glyphs ( FT_Face face, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ); + FTL_GlyphArray in, + FTL_GlyphArray out ); /*************************************************************************/ /* */ diff --git a/include/freetype/internal/services/svlayout.h b/include/freetype/internal/services/svlayout.h index 060e708fc..56f0dc3cb 100644 --- a/include/freetype/internal/services/svlayout.h +++ b/include/freetype/internal/services/svlayout.h @@ -58,8 +58,8 @@ FT_BEGIN_HEADER typedef FT_Error (*FTL_Substitute_Glyphs_Func) ( FT_Face face, FTL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ); + FTL_GlyphArray in, + FTL_GlyphArray out ); FT_DEFINE_SERVICE( Layout ) { diff --git a/src/base/ftlayout.c b/src/base/ftlayout.c index a7fa5f89d..c1917d887 100644 --- a/src/base/ftlayout.c +++ b/src/base/ftlayout.c @@ -407,10 +407,10 @@ FT_EXPORT_DEF( FT_Error ) FTL_New_Glyphs_Array ( FT_Memory memory, - FTL_Glyphs_Array * garray ) + FTL_GlyphArray * garray ) { FT_Error error; - FTL_Glyphs_Array agarray; + FTL_GlyphArray agarray; if ( FT_NEW( agarray ) ) return error; @@ -425,7 +425,7 @@ } FT_EXPORT_DEF( FT_Error ) - FTL_Set_Glyphs_Array_Length ( FTL_Glyphs_Array garray, + FTL_Set_Glyphs_Array_Length ( FTL_GlyphArray garray, FT_ULong new_length ) { FT_Error error; @@ -442,8 +442,8 @@ } FT_EXPORT_DEF( FT_Error ) - FTL_Copy_Glyphs_Array ( FTL_Glyphs_Array in, - FTL_Glyphs_Array out ) + FTL_Copy_Glyphs_Array ( FTL_GlyphArray in, + FTL_GlyphArray out ) { FT_Error error; FT_ULong i; @@ -457,7 +457,7 @@ } FT_EXPORT_DEF( FT_Error ) - FTL_Done_Glyphs_Array ( FTL_Glyphs_Array garray ) + FTL_Done_Glyphs_Array ( FTL_GlyphArray garray ) { FT_Memory memory = garray->memory; FT_FREE( garray->glyphs ); @@ -468,8 +468,8 @@ FT_EXPORT_DEF( FT_Error ) FTL_Substitute_Glyphs ( FT_Face face, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ) + FTL_GlyphArray in, + FTL_GlyphArray out ) { FT_Error error; FT_Service_Layout service; diff --git a/src/gxlayout/fi.c b/src/gxlayout/fi.c index 266707681..a3f8c3a1f 100644 --- a/src/gxlayout/fi.c +++ b/src/gxlayout/fi.c @@ -95,7 +95,7 @@ try_lig( FT_Face face, char c1, char c2 ) { FT_Error error = FT_Err_Ok; FTL_EngineType engine_type; - FTL_Glyphs_Array in, out; + FTL_GlyphArray in, out; FTL_FeaturesRequest request; /* Get the engine type */ diff --git a/src/gxlayout/gxaccess.c b/src/gxlayout/gxaccess.c index 5f8440fae..105c14218 100644 --- a/src/gxlayout/gxaccess.c +++ b/src/gxlayout/gxaccess.c @@ -214,8 +214,8 @@ gx_chain_calc_selector ( GX_MetamorphosisChain chain, GXL_FeaturesRequest reques FT_LOCAL_DEF( FT_Error ) gx_mort_substitute_glyph ( GX_Mort mort, GXL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ) + FTL_GlyphArray in, + FTL_GlyphArray out ) { FT_Error error = GX_Err_Ok; GX_MetamorphosisChain chain; @@ -393,8 +393,8 @@ gx_xchain_calc_selector ( GX_XMetamorphosisChain chain, GXL_FeaturesRequest requ FT_LOCAL_DEF( FT_Error ) gx_morx_substitute_glyph ( GX_Morx morx, GXL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ) + FTL_GlyphArray in, + FTL_GlyphArray out ) { FT_Error error = GX_Err_Ok; GX_XMetamorphosisChain xchain; @@ -668,7 +668,7 @@ gx_kern_get_fmt3( GX_KerningSubtableFormat3Body fmt3, FT_LOCAL_DEF( FT_Error ) gx_kern_get_contextual_kerning( GX_Kern kern, - FTL_Glyphs_Array garray, + FTL_GlyphArray garray, FTL_Direction dir, GXL_Initial_State initial_state, FT_Vector * kerning ) diff --git a/src/gxlayout/gxaccess.h b/src/gxlayout/gxaccess.h index 5bed3e8bb..586d21e81 100644 --- a/src/gxlayout/gxaccess.h +++ b/src/gxlayout/gxaccess.h @@ -58,8 +58,8 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) gx_mort_substitute_glyph ( GX_Mort mort, GXL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ); + FTL_GlyphArray in, + FTL_GlyphArray out ); /* morx */ typedef FT_Error (* GX_Morx_Feature_Func)( GX_XMetamorphosisFeatureTable feat_Subtbl, @@ -75,8 +75,8 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) gx_morx_substitute_glyph ( GX_Morx morx, GXL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ); + FTL_GlyphArray in, + FTL_GlyphArray out ); /* kern */ FT_LOCAL( FT_Error ) gx_kern_get_pair_kerning ( GX_Kern kern, @@ -86,7 +86,7 @@ FT_BEGIN_HEADER FT_Vector* kerning ); FT_LOCAL( FT_Error ) gx_kern_get_contextual_kerning( GX_Kern kern, - FTL_Glyphs_Array garray, + FTL_GlyphArray garray, FTL_Direction dir, GXL_Initial_State initial_state, FT_Vector * kerning ); diff --git a/src/gxlayout/gxdemo.c b/src/gxlayout/gxdemo.c index 028df74c2..002393924 100644 --- a/src/gxlayout/gxdemo.c +++ b/src/gxlayout/gxdemo.c @@ -749,7 +749,7 @@ check_toggled( GtkToggleButton * toggle, gpointer setting ) void run_layout_engine ( GtkButton * button, gpointer request ) { - FTL_Glyphs_Array in, out; + FTL_GlyphArray in, out; FT_Face face = ((FTL_FeaturesRequest)request)->font->face; FT_Memory memory = face->driver->root.memory; diff --git a/src/gxlayout/gxlayout.c b/src/gxlayout/gxlayout.c index 3c619541f..b9d0b0975 100644 --- a/src/gxlayout/gxlayout.c +++ b/src/gxlayout/gxlayout.c @@ -738,8 +738,8 @@ gxl_feature_initialize_for_morx ( GXL_Feature feature, FT_LOCAL_DEF ( FT_Error ) gxl_substitute_glyphs ( FT_Face face, FTL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ) + FTL_GlyphArray in, + FTL_GlyphArray out ) { FT_Error error; GXL_Font font; diff --git a/src/gxlayout/gxltypes.h b/src/gxlayout/gxltypes.h index cc385a4dd..1bf00717d 100644 --- a/src/gxlayout/gxltypes.h +++ b/src/gxlayout/gxltypes.h @@ -108,8 +108,8 @@ FT_BEGIN_HEADER FT_LOCAL ( FT_Error ) gxl_substitute_glyphs ( FT_Face face, FTL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ); + FTL_GlyphArray in, + FTL_GlyphArray out ); FT_END_HEADER diff --git a/src/gxlayout/gxvm.c b/src/gxlayout/gxvm.c index 0fe74b8cf..3e2e94f12 100644 --- a/src/gxlayout/gxvm.c +++ b/src/gxlayout/gxvm.c @@ -229,9 +229,9 @@ ligstack_ligatured_pop(LigatureStack stack) static FT_Error glist_init ( FT_Memory memory, GlyphsList glist, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); static FT_Error glist_store ( GlyphsList glist, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); static void glist_finalize ( GlyphsList glist ); /* @@ -262,7 +262,7 @@ ligstack_ligatured_pop(LigatureStack stack) InsertionGlyphs insertion ); static FT_Error - glist_init ( FT_Memory memory, GlyphsList glist, FTL_Glyphs_Array garray ) + glist_init ( FT_Memory memory, GlyphsList glist, FTL_GlyphArray garray ) { FT_Error error; FT_ULong i; @@ -289,7 +289,7 @@ ligstack_ligatured_pop(LigatureStack stack) } static FT_Error - glist_store ( GlyphsList glist, FTL_Glyphs_Array garray ) + glist_store ( GlyphsList glist, FTL_GlyphArray garray ) { FT_Error error; FT_ULong length = 0, i; @@ -475,7 +475,7 @@ ligstack_ligatured_pop(LigatureStack stack) *************************************************************************/ FT_LOCAL_DEF( FT_Error ) gx_noncontextual_subst( GX_MetamorphosisNoncontextualBody body, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_ULong i; GX_LookupTable lookup_table = &body->lookup_table; @@ -519,7 +519,7 @@ static FT_UShort contextual_lookup_glyph( GX_MetamorphosisContextualBody body, FT_LOCAL_DEF( FT_Error ) gx_contextual_subst( GX_MetamorphosisContextualBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_ULong glength = garray->length; FTL_Glyph glyphs = garray->glyphs; @@ -631,7 +631,7 @@ static FT_UShort ligature_get_ligature ( GX_MetamorphosisLigatureBody body, FT_LOCAL_DEF( FT_Error ) gx_ligature_subst( GX_MetamorphosisLigatureBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_ULong glength = garray->length; FTL_Glyph glyphs = garray->glyphs; @@ -791,7 +791,7 @@ insertion_insert ( GX_MetamorphosisInsertionList insertion, FT_LOCAL_DEF( FT_Error ) gx_insertion_subst( GX_MetamorphosisInsertionBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_Error error; FT_Memory memory = garray->memory; @@ -904,11 +904,11 @@ insertion_insert ( GX_MetamorphosisInsertionList insertion, static void rearrangement_rearrange( GX_MetamorphosisRearrangementVerb verb, FT_ULong first_glyph, FT_ULong last_glyph, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_rearrangement_subst ( GX_MetamorphosisRearrangementBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_ULong glength = garray->length; FTL_Glyph glyphs = garray->glyphs; @@ -979,7 +979,7 @@ static void rearrangement_rearrange( GX_MetamorphosisRearrangementVerb verb, FT_ULong first_glyph, FT_ULong last_glyph, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FTL_Glyph glyphs = garray->glyphs; FT_ULong glength = garray->length; @@ -1207,7 +1207,7 @@ static FT_UShort xcontextual_lookup_glyph( GX_XMetamorphosisContextualBody body, FT_LOCAL_DEF( FT_Error ) gx_xcontextual_subst( GX_XMetamorphosisContextualBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_ULong glength = garray->length; @@ -1321,7 +1321,7 @@ static FT_UShort xligature_get_ligature ( GX_XMetamorphosisLigatureBody body, FT_LOCAL_DEF( FT_Error ) gx_xligature_subst( GX_XMetamorphosisLigatureBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_ULong glength = garray->length; FTL_Glyph glyphs = garray->glyphs; @@ -1470,7 +1470,7 @@ xligature_get_ligature ( GX_XMetamorphosisLigatureBody body, FT_LOCAL_DEF( FT_Error ) gx_xinsertion_subst( GX_XMetamorphosisInsertionBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_Error error; FT_Memory memory = garray->memory; @@ -1562,7 +1562,7 @@ gx_xinsertion_subst( GX_XMetamorphosisInsertionBody body, FT_LOCAL( FT_Error ) gx_xrearrangement_subst ( GX_XMetamorphosisRearrangementBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ) + FTL_GlyphArray garray ) { FT_ULong glength = garray->length; @@ -1674,7 +1674,7 @@ kernstack_init( KerningStack stack ) FT_LOCAL_DEF( FT_Error ) gx_contextual_kerning_calc ( GX_KerningSubtableFormat1Body kern_fmt1, - FTL_Glyphs_Array garray, + FTL_GlyphArray garray, FTL_Direction dir, FT_Bool cross_stream, GXL_Initial_State initial_state, diff --git a/src/gxlayout/gxvm.h b/src/gxlayout/gxvm.h index 0b54a3a92..cda0814d3 100644 --- a/src/gxlayout/gxvm.h +++ b/src/gxlayout/gxvm.h @@ -35,26 +35,26 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) gx_rearrangement_subst ( GX_MetamorphosisRearrangementBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_contextual_subst( GX_MetamorphosisContextualBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_ligature_subst( GX_MetamorphosisLigatureBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_noncontextual_subst( GX_MetamorphosisNoncontextualBody body, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_insertion_subst( GX_MetamorphosisInsertionBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); /* * Morx @@ -63,29 +63,29 @@ gx_insertion_subst( GX_MetamorphosisInsertionBody body, FT_LOCAL( FT_Error ) gx_xcontextual_subst( GX_XMetamorphosisContextualBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_xligature_subst( GX_XMetamorphosisLigatureBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_xinsertion_subst( GX_XMetamorphosisInsertionBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); FT_LOCAL( FT_Error ) gx_xrearrangement_subst ( GX_XMetamorphosisRearrangementBody body, GXL_Initial_State initial_state, - FTL_Glyphs_Array garray ); + FTL_GlyphArray garray ); /* * Kern */ FT_LOCAL( FT_Error ) gx_contextual_kerning_calc ( GX_KerningSubtableFormat1Body kern_fmt1, - FTL_Glyphs_Array garray, + FTL_GlyphArray garray, FTL_Direction dir, FT_Bool cross_stream, GXL_Initial_State initial_state, diff --git a/src/otlayout/ot-types.h b/src/otlayout/ot-types.h index 45d316e91..263299af9 100644 --- a/src/otlayout/ot-types.h +++ b/src/otlayout/ot-types.h @@ -30,7 +30,7 @@ extern "C" { typedef struct _OTInfo OTInfo; typedef struct _OTRuleset OTRuleset; -typedef FTL_Glyphs_ArrayRec OTGlyphString; +typedef FTL_GlyphArrayRec OTGlyphString; #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/otlayout/otdemo.c b/src/otlayout/otdemo.c index ffe1ae196..2cd0f71db 100644 --- a/src/otlayout/otdemo.c +++ b/src/otlayout/otdemo.c @@ -144,7 +144,7 @@ doit(FT_Face face) FTL_FeaturesRequest request; FT_UInt script_index, feature_index; FT_Memory memory = face->stream->memory; - FTL_Glyphs_Array in, out; + FTL_GlyphArray in, out; FT_Int i; if ( FTL_New_FeaturesRequest( face, &request ) ) { diff --git a/src/otlayout/otlayout.c b/src/otlayout/otlayout.c index 18bb55aa4..a7da6014a 100644 --- a/src/otlayout/otlayout.c +++ b/src/otlayout/otlayout.c @@ -120,8 +120,8 @@ FT_LOCAL ( FT_Error ) otl_substitute_glyphs ( FT_Face face, FTL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ) + FTL_GlyphArray in, + FTL_GlyphArray out ) { FT_Error error = FT_Err_Ok; if (( error = FTL_Copy_Glyphs_Array ( in, out ) )) diff --git a/src/otlayout/otltypes.h b/src/otlayout/otltypes.h index 6b60f48a4..8244da282 100644 --- a/src/otlayout/otltypes.h +++ b/src/otlayout/otltypes.h @@ -67,8 +67,8 @@ FT_BEGIN_HEADER FT_LOCAL ( FT_Error ) otl_substitute_glyphs ( FT_Face face, FTL_FeaturesRequest request, - FTL_Glyphs_Array in, - FTL_Glyphs_Array out ); + FTL_GlyphArray in, + FTL_GlyphArray out ); FT_END_HEADER #endif /* Not def: __OTLTYPES_H__ */