diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/font')
5 files changed, 10 insertions, 15 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/luatexfont.h b/Build/source/texk/web2c/luatexdir/font/luatexfont.h index 8da0d77099b..987517266ed 100644 --- a/Build/source/texk/web2c/luatexdir/font/luatexfont.h +++ b/Build/source/texk/web2c/luatexdir/font/luatexfont.h @@ -200,7 +200,7 @@ extern integer ttf_length; int readchar(boolean, chardesc *); /* macnames.c */ -extern char notdef[]; +extern const char notdef[]; /* vfovf.c */ void vf_expand_local_fonts(internal_font_number f); diff --git a/Build/source/texk/web2c/luatexdir/font/macnames.c b/Build/source/texk/web2c/luatexdir/font/macnames.c index 56bce90264e..a62de50edcb 100644 --- a/Build/source/texk/web2c/luatexdir/font/macnames.c +++ b/Build/source/texk/web2c/luatexdir/font/macnames.c @@ -21,7 +21,7 @@ static const char __svn_version[] = "$Id: macnames.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.6/source/texk/web2c/luatexdir/font/macnames.c $"; -char notdef[] = ".notdef"; +const char notdef[] = ".notdef"; const char *mac_glyph_names[] = { /* 0x00 */ diff --git a/Build/source/texk/web2c/luatexdir/font/writet1.c b/Build/source/texk/web2c/luatexdir/font/writet1.c index 251f6702244..01881ccbb52 100644 --- a/Build/source/texk/web2c/luatexdir/font/writet1.c +++ b/Build/source/texk/web2c/luatexdir/font/writet1.c @@ -47,7 +47,6 @@ static const char _svn_version[] = integer t1_length1, t1_length2, t1_length3; static integer t1_save_offset; static integer t1_fontname_offset; -extern char *fb_array; /* from luatexdir/utils.c */ static unsigned char *t1_buffer = NULL; static integer t1_size = 0; diff --git a/Build/source/texk/web2c/luatexdir/font/writettf.c b/Build/source/texk/web2c/luatexdir/font/writettf.c index eb615ad82ac..0e4bb43802c 100644 --- a/Build/source/texk/web2c/luatexdir/font/writettf.c +++ b/Build/source/texk/web2c/luatexdir/font/writettf.c @@ -39,10 +39,9 @@ integer ttf_size = 0; integer ttf_curbyte = 0; typedef struct { - char *name; /* name of glyph */ + const char *name; /* name of glyph */ long code; /* charcode in case of subfonts */ long newindex; /* new index of glyph in output file */ - } ttfenc_entry; typedef struct { @@ -98,9 +97,6 @@ integer ttf_length; #include "macnames.c" -extern char *fb_array; /* from luatexdir/utils.c */ -extern char charsetstr[]; /* from mpdir/psout.w */ - static const char *newtabnames[] = { "OS/2", "PCLT", @@ -263,7 +259,7 @@ static void ttf_copy_encoding(void) assert(glyph_names != NULL); for (i = 0; i < 256; i++) - ttfenc_tab[i].name = (char *) notdef; + ttfenc_tab[i].name = notdef; /* a workaround for a bug of AcroReader 4.0 */ if (strcmp(glyph_names[97], "a") == 0) { @@ -399,7 +395,7 @@ static void ttf_read_mapx(void) glyph->newindex = -1; glyph->newoffset = 0; glyph->name_index = 0; - glyph->name = (char *) notdef; + glyph->name = notdef; } glyph_index = xtalloc(glyphs_count, long); glyph_index[0] = 0; /* index of ".notdef" glyph */ @@ -493,7 +489,7 @@ void ttf_read_post(void) switch (post_format) { case 0x10000: for (glyph = glyph_tab; glyph - glyph_tab < NMACGLYPHS; glyph++) { - glyph->name = (char *) mac_glyph_names[glyph - glyph_tab]; + glyph->name = mac_glyph_names[glyph - glyph_tab]; glyph->name_index = glyph - glyph_tab; } break; @@ -511,7 +507,7 @@ void ttf_read_post(void) } for (glyph = glyph_tab; glyph - glyph_tab < nnames; glyph++) { if (glyph->name_index < NMACGLYPHS) - glyph->name = (char *) mac_glyph_names[glyph->name_index]; + glyph->name = mac_glyph_names[glyph->name_index]; else { p = glyph_name_buf; k = glyph->name_index - NMACGLYPHS; @@ -1233,7 +1229,7 @@ static void ttf_write_OS2(void) ttf_set_chksm(tab); } -static boolean unsafe_name(char *s) +static boolean unsafe_name(const char *s) { const char **p; for (p = ambiguous_names; *p != NULL; p++) @@ -1246,7 +1242,7 @@ static void ttf_write_post(void) { dirtab_entry *tab = ttf_seek_tab("post", TTF_FIXED_SIZE); glyph_entry *glyph; - char *s; + const char *s; long *id; int l; ttf_reset_chksm(tab); diff --git a/Build/source/texk/web2c/luatexdir/font/writettf.h b/Build/source/texk/web2c/luatexdir/font/writettf.h index b0db58ef2f1..03b5cc9da12 100644 --- a/Build/source/texk/web2c/luatexdir/font/writettf.h +++ b/Build/source/texk/web2c/luatexdir/font/writettf.h @@ -137,7 +137,7 @@ typedef struct { TTF_LONG newoffset; TTF_UFWORD advWidth; TTF_FWORD lsb; - char *name; /* name of glyph */ + const char *name; /* name of glyph */ TTF_SHORT newindex; /* new index of glyph in output file */ TTF_USHORT name_index; /* index of name as read from font file */ } glyph_entry; |