diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/font/mapfile.c')
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/font/mapfile.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/mapfile.c b/Build/source/texk/web2c/luatexdir/font/mapfile.c index 551ff59e49e..91ce21d60e3 100644 --- a/Build/source/texk/web2c/luatexdir/font/mapfile.c +++ b/Build/source/texk/web2c/luatexdir/font/mapfile.c @@ -26,7 +26,7 @@ #include "luatex-api.h" static const char _svn_version[] = - "$Id: mapfile.c 2271 2009-04-12 23:42:21Z oneiros $ " + "$Id: mapfile.c 2331 2009-04-18 16:39:50Z hhenkel $ " "$URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/font/mapfile.c $"; #define FM_BUF_SIZE 1024 @@ -44,6 +44,8 @@ static integer fm_curbyte = 0; #define fm_close() xfclose(fm_file, cur_file_name) #define fm_getchar() fm_buffer[fm_curbyte++] #define fm_eof() (fm_curbyte>fm_size) +#define is_cfg_comment(c) \ + (c == 10 || c == '*' || c == '#' || c == ';' || c == '%') typedef enum { FM_DUPIGNORE, FM_REPLACE, FM_DELETE } updatemode; typedef enum { MAPFILE, MAPLINE } maptype; @@ -136,6 +138,7 @@ struct avl_table *encname_tree = NULL; static int comp_fm_entry_tfm(const void *pa, const void *pb, void *p) { + (void) p; return strcmp(((const fm_entry *) pa)->tfm_name, ((const fm_entry *) pb)->tfm_name); } @@ -146,6 +149,7 @@ static int comp_fm_entry_ps(const void *pa, const void *pb, void *p) { int i; const fm_entry *p1 = (const fm_entry *) pa, *p2 = (const fm_entry *) pb; + (void) p; assert(p1->ps_name != NULL && p2->ps_name != NULL); if ((i = strcmp(p1->ps_name, p2->ps_name))) return i; @@ -158,6 +162,7 @@ static int comp_fm_entry_ps(const void *pa, const void *pb, void *p) static int comp_ff_entry(const void *pa, const void *pb, void *p) { + (void) p; return strcmp(((const ff_entry *) pa)->ff_name, ((const ff_entry *) pb)->ff_name); } @@ -884,7 +889,6 @@ void pdf_init_map_file(string map_name) mitem->line = map_name; } - /**********************************************************************/ /* * Early check whether a font file exists. Search tree ff_tree is used @@ -939,11 +943,20 @@ ff_entry *check_ff_exist(char *ff_name, boolean is_tt) } /**********************************************************************/ + +int is_subsetable(fm_entry * fm) +{ + assert(is_included(fm)); + return is_subsetted(fm); +} + +/**********************************************************************/ /* cleaning up... */ static void destroy_fm_entry_tfm(void *pa, void *pb) { fm_entry *fm; + (void) pb; fm = (fm_entry *) pa; if (!has_pslink(fm)) delete_fm_entry(fm); @@ -954,6 +967,7 @@ static void destroy_fm_entry_tfm(void *pa, void *pb) static void destroy_fm_entry_ps(void *pa, void *pb) { fm_entry *fm; + (void) pb; fm = (fm_entry *) pa; if (!has_tfmlink(fm)) delete_fm_entry(fm); @@ -964,6 +978,7 @@ static void destroy_fm_entry_ps(void *pa, void *pb) static void destroy_ff_entry(void *pa, void *pb) { ff_entry *ff; + (void) pb; ff = (ff_entry *) pa; delete_ff_entry(ff); } |