diff options
Diffstat (limited to 'Build/source/texk/web2c')
33 files changed, 99 insertions, 81 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index af4fa10ae24..28356f6e671 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -371,7 +371,8 @@ am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/writejbig2.h pdftexdir/writejpg.c \ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ - pdftexdir/regex/regex.c pdftexdir/regex/regex.h + pdftexdir/regex/regex.c pdftexdir/regex/regex.h \ + pdftexdir/inc-epdf.h pdftexdir/inc-extra.h @MINGW32_TRUE@am__objects_7 = libpdftex_a-regex.$(OBJEXT) am_libpdftex_a_OBJECTS = libpdftex_a-avl.$(OBJEXT) \ libpdftex_a-avlstuff.$(OBJEXT) libpdftex_a-epdf.$(OBJEXT) \ @@ -1582,7 +1583,7 @@ pdftex_ch_srcs = \ pdftexdir/pdftex.ch libpdftex_a_CPPFLAGS = $(pdftex_cppflags) -libpdftex_a_CFLAGS = # $(WARNING_CFLAGS) +libpdftex_a_CFLAGS = $(WARNING_CFLAGS) libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/avlstuff.c pdftexdir/avlstuff.h pdftexdir/epdf.c \ @@ -1595,7 +1596,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/writejbig2.h pdftexdir/writejpg.c \ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ - $(am__append_17) + $(am__append_17) pdftexdir/inc-epdf.h pdftexdir/inc-extra.h EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \ pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \ pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c @@ -1966,7 +1967,8 @@ libluatex_a_SOURCES = luatexdir/commands.h luatexdir/font/dofont.c \ luatexdir/utils/synctex.h luatexdir/utils/synctex.c \ luatexdir/utils/utils.c luatexdir/utils/utils.h \ luatexdir/utils/writezip.c mplibdir/lmplib.c \ - luatexdir/inc-epdf.h luatexdir/inc-vfovf.h + luatexdir/inc-epdf.h luatexdir/inc-extra.h \ + luatexdir/inc-vfovf.h EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c # Force Automake to use CXXLD for linking diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index 5d4700232fd..f7fc871b091 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -1,6 +1,6 @@ ## texk/web2c/am/web.am: Makefile fragment for normal web programs (except tangle). ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \ diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 1861a9af65e..f6e62d6af5c 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,6 +1,26 @@ +2010-01-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * font/writettf.c: Remove extern charsetstr[]. + * lua/lkpselib.c: Remove extern luainit. + * lua/luainit.c: Remove extern normalize_quotes(), argc, argv. + * tex/textoken.c: Remove extern insert_vj_template(). + + * utils/utils.h: Add extern declaration of fb_array ... + * font/writet1.c, font/writettf.c: ... removed from here. + * luatex-api.h: Add extern declaration of program_name_set ... + * lua/luainit.c, lua/luatex.c: ... removed from here. + * luatex-api.h: Add extern declaration of startup_filename, + safer_option, and nosocket_option ... + * lua/luastuff.c: ... removed from here. + * lua/llualib.c (luabytecode_max): Change integer=>int. + * luatex-api.h: Add extern declaration of luabytecode_max, + luabytecode_bytes, luastate_bytes, callback_count, and + saved_callback_count ... + * lstatslib.c: ... removed from here. + 2010-01-25 Peter Breitenlohner <peb@mppmu.mpg.de> - * am/luatex (luatex_CFLAGS, luatex_CXXFLAGS), + * am/luatex.am (luatex_CFLAGS, luatex_CXXFLAGS), am/libluatex.am (libluatex_a_CFLAGS): Enable compiler warnings. Avoid most compiler warnings: @@ -24,16 +44,16 @@ * font/texfont.h, font/writecff.h, luatex-api.h, luatex.h, nodes.h, primitive.h, ptexlib.h, utils/utils.h, font/dofont.c, font/luafont.c, font/tfmofm.c, font/vfovf.c, font/writecff.c, - font/writefont.c, font/writet1.c, lang/hyphen.c, lang/texlang.c, - lua/lcallbacklib.c, lua/lfontlib.c, lua/limglib.c, - lua/lkpselib.c, lua/llualib.c, lua/lnodelib.c, lua/loslibext.c, - lua/lpdflib.c, lua/lstatslib.c, lua/ltexiolib.c, lua/ltexlib.c, - lua/ltokenlib.c, lua/luainit.c, lua/luanode.c, lua/luastuff.c, - lua/luatex.c, lua/luatoken.c, luatex.ch, tex/filename.c, - tex/linebreak.c, tex/math.c, tex/mlist.c, tex/primitive.c, - tex/texdeffont.c, tex/texnodes.c, tex/textoken.c, utils/utils.c: - Declare various function params and args, local and global vars, - and struct members as const. + font/writefont.c, font/writet1.c, font/writettf.[ch], + lang/hyphen.c, lang/texlang.c, lua/lcallbacklib.c, + lua/lfontlib.c, lua/limglib.c, lua/lkpselib.c, lua/llualib.c, + lua/lnodelib.c, lua/loslibext.c, lua/lpdflib.c, lua/lstatslib.c, + lua/ltexiolib.c, lua/ltexlib.c, lua/ltokenlib.c, lua/luainit.c, + lua/luanode.c, lua/luastuff.c, lua/luatex.c, lua/luatoken.c, + luatex.ch, tex/filename.c, tex/linebreak.c, tex/math.c, + tex/mlist.c, tex/primitive.c, tex/texdeffont.c, tex/texnodes.c, + tex/textoken.c, utils/utils.c: Declare various function params + and args, local and global vars, and struct members as const. * font/luafont.c, font/texfont.c, font/tfmofm.c, font/vfovf.c, font/writeenc.c, font/writefont.c, font/writet1.c, @@ -54,8 +74,14 @@ * utils/synctex.c: #include "synctex.h". * utils/utils.c: #include "utils.h". + * lua/lcallbacklib.c: Remove prototype for lua_traceback(). * ptexlib.h: Add prototype for get_command_id() ... * lua/ltokenlib.c: ... removed from here. + * nodes.h: Add prototype for list_node_mem_usage() ... + * lua/lnodelib.c: ... removed from here. + * managed-sa.h: Add prototype for rawset_sa_item() ... + * mathcodes.c, tex/math.c: ... removed from here. + * inc-epdf.h: New file with prototypes for epdf_mark_glyphs(), epdf_create_fontdescriptor(), and epdf_write_enc() ... * image/epdf.h: ... removed from here. @@ -63,6 +89,12 @@ * inc-vfovf.h: New file with prototype for make_vf_table() ... * lua/lfontlib.c: ... removed from here. * font/vfovf.c, lua/lfontlib.c: #include inc-vfovf.h. + * inc-extra.h: New file with prototypes for check_isnode() + and lua_nodelib_push_fast() ... + * lua/limglib.c, lua/llanglib.c, lua/lstatslib.c, lua/ltexlib.c: + ... removed from here. + * lua/limglib.c, lua/llanglib.c, lua/lnodelib.c, + lua/lstatslib.c, lua/ltexlib.c: #include "inc-extra.h". * am/libluatex.am (libluatex_a_SOURCES): Add the new files. * font/texfont.c (lua_char_exists_callback), @@ -84,9 +116,6 @@ * utils/synctex.c: Rename synctexchar => synctex_char and synctexnode => synctex_node as declared in utils/synctex.h. - * font/luatexfont.h, font/macnames.c: Declare notdef as - non-const to avoid cast warnings. FIXME? - 2010-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> * luatangle.ch: Declare web_name, chg_name, pascal_name, and diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index e582aa467a4..626cdc4ab64 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/libluatex.am: Makefile fragment for libluatex. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libluatex @@ -126,6 +126,7 @@ libluatex_a_SOURCES = \ ## FIXME: temporary additional headers: libluatex_a_SOURCES += \ luatexdir/inc-epdf.h \ + luatexdir/inc-extra.h \ luatexdir/inc-vfovf.h ## included by luatexdir/font/writettf.c diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index a2e3522f25e..7c393936d5c 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/luatex.am: Makefile fragment for luaTeX. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## luaTeX 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; diff --git a/Build/source/texk/web2c/luatexdir/inc-extra.h b/Build/source/texk/web2c/luatexdir/inc-extra.h new file mode 100644 index 00000000000..98ca98f8670 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/inc-extra.h @@ -0,0 +1,4 @@ +/* from lua/lnodelib.c */ + +extern halfword *check_isnode(lua_State * L, int ud); +extern void lua_nodelib_push_fast(lua_State * L, halfword n); diff --git a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c index 6b350a1249b..adbbd43becb 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c @@ -24,7 +24,6 @@ static const char _svn_version[] = "$Id: lcallbacklib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.6/source/texk/web2c/luatexdir/lua/lcallbacklib.c $"; static int do_run_callback(int special, const char *values, va_list vl); -extern int lua_traceback(lua_State * L); int callback_count = 0; int saved_callback_count = 0; diff --git a/Build/source/texk/web2c/luatexdir/lua/limglib.c b/Build/source/texk/web2c/luatexdir/lua/limglib.c index 090f3d43d82..7663d022c03 100644 --- a/Build/source/texk/web2c/luatexdir/lua/limglib.c +++ b/Build/source/texk/web2c/luatexdir/lua/limglib.c @@ -23,7 +23,8 @@ #include <../lua51/lua.h> #include <../lua51/lauxlib.h> #include <ptexlib.h> -#include "../luatex-api.h" +#include "luatex-api.h" +#include "inc-extra.h" static const char _svn_version[] = "$Id: limglib.c 2329 2009-04-18 14:25:30Z hhenkel $ " @@ -588,8 +589,6 @@ typedef enum { WR_WRITE, WR_IMMEDIATEWRITE, WR_NODE, WR_VF_IMG } wrtype_e; const char *wrtype_s[] = { "img.write()", "img.immediatewrite()", "img.node()", "write vf image" }; -extern void lua_nodelib_push_fast(lua_State * L, halfword n); - static void setup_image(lua_State * L, image * a, wrtype_e writetype) { image_dict *ad; diff --git a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c index d4af0600dde..71c772eb732 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c @@ -329,8 +329,6 @@ static int lua_kpathsea_var_value(lua_State * L) * Current approach: run |os.setenv()| if you have to. */ -extern int luainit; - static int set_program_name(lua_State * L) { const char *exe_name = luaL_checkstring(L, 1); diff --git a/Build/source/texk/web2c/luatexdir/lua/llanglib.c b/Build/source/texk/web2c/luatexdir/lua/llanglib.c index e71565f94b4..2e5544ca37f 100644 --- a/Build/source/texk/web2c/luatexdir/lua/llanglib.c +++ b/Build/source/texk/web2c/luatexdir/lua/llanglib.c @@ -21,6 +21,7 @@ #include <ptexlib.h> #include "nodes.h" +#include "inc-extra.h" static const char _svn_version[] = "$Id: llanglib.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/lua/llanglib.c $"; @@ -29,8 +30,6 @@ static const char _svn_version[] = #define check_islang(L,b) (struct tex_language **)luaL_checkudata(L,b,LANG_METATABLE) -extern halfword *check_isnode(lua_State * L, int ud); - static int lang_new(lua_State * L) { diff --git a/Build/source/texk/web2c/luatexdir/lua/llualib.c b/Build/source/texk/web2c/luatexdir/lua/llualib.c index fb1fe305a55..57cffe36ab1 100644 --- a/Build/source/texk/web2c/luatexdir/lua/llualib.c +++ b/Build/source/texk/web2c/luatexdir/lua/llualib.c @@ -35,7 +35,7 @@ typedef struct { static bytecode *lua_bytecode_registers = NULL; -integer luabytecode_max = -1; +int luabytecode_max = -1; unsigned int luabytecode_bytes = 0; static char *luanames[65536] = { NULL }; diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c index d78fea95d8c..4b5738da4be 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c @@ -21,6 +21,7 @@ #include <ptexlib.h> #include "nodes.h" +#include "inc-extra.h" #include "commands.h" @@ -3208,8 +3209,6 @@ static int lua_nodelib_do_ligature_n(lua_State * L) return 1; } -extern halfword list_node_mem_usage(void); - static int lua_nodelib_usedlist(lua_State * L) { lua_pushnumber(L, list_node_mem_usage()); diff --git a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c index f3866f4878f..1f264cd55bb 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c @@ -19,6 +19,7 @@ #include "luatex-api.h" #include <ptexlib.h> +#include "inc-extra.h" static const char _svn_version[] = @@ -30,8 +31,6 @@ typedef struct statistic { void *value; } statistic; -extern void lua_nodelib_push_fast(lua_State * L, halfword n); - typedef const char *(*charfunc) (void); typedef integer(*intfunc) (void); @@ -61,12 +60,7 @@ static char *luatexrevision(void) return makecstring(get_luatexrevision()); } -extern int luabytecode_max; -extern int luabytecode_bytes; static int luastate_max = 1; /* fixed value */ -extern int luastate_bytes; -extern int callback_count; -extern int saved_callback_count; static struct statistic stats[] = { {"pdf_gone", 'g', &pdf_gone}, diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c index 8d64219dae2..82a54cc35bc 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c @@ -20,15 +20,13 @@ #include "luatex-api.h" #include <ptexlib.h> #include "nodes.h" +#include "inc-extra.h" #include "commands.h" #include "tokens.h" static const char _svn_version[] = "$Id: ltexlib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.6/source/texk/web2c/luatexdir/lua/ltexlib.c $"; -extern halfword *check_isnode(lua_State * L, int ud); -extern void lua_nodelib_push_fast(lua_State * L, halfword n); - typedef struct { char *text; unsigned int tsize; diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.c b/Build/source/texk/web2c/luatexdir/lua/luainit.c index baa40d3cfe9..917cf462f7e 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luainit.c +++ b/Build/source/texk/web2c/luatexdir/lua/luainit.c @@ -44,8 +44,6 @@ static const char _svn_version[] = * */ -extern string normalize_quotes(const_string name, const_string mesg); - const_string LUATEX_IHELP[] = { "Usage: luatex --lua=FILE [OPTION]... [TEXNAME[.tex]] [COMMANDS]", " or: luatex --lua=FILE [OPTION]... \\FIRST-LINE", @@ -123,12 +121,6 @@ const_string input_name = NULL; static const_string user_progname = NULL; -extern int program_name_set; /* in lkpselib.c */ - -/* for topenin() */ -extern char **argv; -extern int argc; - const char *startup_filename = NULL; int lua_only = 0; int lua_offset = 0; diff --git a/Build/source/texk/web2c/luatexdir/lua/luastuff.c b/Build/source/texk/web2c/luatexdir/lua/luastuff.c index 44148f30928..75bdaf367ef 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luastuff.c +++ b/Build/source/texk/web2c/luatexdir/lua/luastuff.c @@ -25,10 +25,6 @@ static const char _svn_version[] = lua_State *Luas = NULL; -extern const char *startup_filename; -extern int safer_option; -extern int nosocket_option; - int luastate_bytes = 0; int lua_active = 0; @@ -256,7 +252,7 @@ void unhide_lua_value(lua_State * L, const char *name, const char *item, int r) } -int lua_traceback(lua_State * L) +static int lua_traceback(lua_State * L) { lua_getfield(L, LUA_GLOBALSINDEX, "debug"); if (!lua_istable(L, -1)) { diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex.c b/Build/source/texk/web2c/luatexdir/lua/luatex.c index 4db4660540e..88903fe338b 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatex.c +++ b/Build/source/texk/web2c/luatexdir/lua/luatex.c @@ -26,8 +26,6 @@ static const char _svn_version[] = /* do this aleph stuff here, for now */ -extern int program_name_set; /* in lkpselib.c */ - void b_test_in(void) { if (program_name_set) { diff --git a/Build/source/texk/web2c/luatexdir/luatex-api.h b/Build/source/texk/web2c/luatexdir/luatex-api.h index 8131eb54979..57d1504c329 100644 --- a/Build/source/texk/web2c/luatexdir/luatex-api.h +++ b/Build/source/texk/web2c/luatexdir/luatex-api.h @@ -126,3 +126,15 @@ extern command_item command_names[]; extern int callback_callbacks_id; extern void luainterpreter(void); + +extern int program_name_set; + +extern const char *startup_filename; +extern int safer_option; +extern int nosocket_option; + +extern int luabytecode_max; +extern unsigned int luabytecode_bytes; +extern int luastate_bytes; +extern int callback_count; +extern int saved_callback_count; diff --git a/Build/source/texk/web2c/luatexdir/managed-sa.h b/Build/source/texk/web2c/luatexdir/managed-sa.h index 880a6acd9bc..3ba044ca0bb 100644 --- a/Build/source/texk/web2c/luatexdir/managed-sa.h +++ b/Build/source/texk/web2c/luatexdir/managed-sa.h @@ -71,4 +71,6 @@ extern sa_tree undump_sa_tree(void); extern void restore_sa_stack(sa_tree a, integer gl); extern void clear_sa_stack(sa_tree a); +extern void rawset_sa_item(sa_tree hed, integer n, integer v); + #endif diff --git a/Build/source/texk/web2c/luatexdir/mathcodes.c b/Build/source/texk/web2c/luatexdir/mathcodes.c index baf51aa9be6..78145e343f3 100644 --- a/Build/source/texk/web2c/luatexdir/mathcodes.c +++ b/Build/source/texk/web2c/luatexdir/mathcodes.c @@ -23,8 +23,6 @@ #include "managed-sa.h" #include "commands.h" -extern void rawset_sa_item(sa_tree head, integer n, integer v); - static const char __svn_version[] = "$Id$ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.5/source/texk/web2c/luatexdir/mathcodes.c $"; diff --git a/Build/source/texk/web2c/luatexdir/nodes.h b/Build/source/texk/web2c/luatexdir/nodes.h index dc50e90d59a..6a1c79171cf 100644 --- a/Build/source/texk/web2c/luatexdir/nodes.h +++ b/Build/source/texk/web2c/luatexdir/nodes.h @@ -771,5 +771,8 @@ typedef enum { # define end_point begin_point+glyph_node_size # define var_mem_stat_max (end_point+glyph_node_size-1) +/* from tex/texnodes.c */ + +extern halfword list_node_mem_usage(void); #endif diff --git a/Build/source/texk/web2c/luatexdir/tex/math.c b/Build/source/texk/web2c/luatexdir/tex/math.c index 7ffd789063c..a3a2a154f7a 100644 --- a/Build/source/texk/web2c/luatexdir/tex/math.c +++ b/Build/source/texk/web2c/luatexdir/tex/math.c @@ -60,8 +60,6 @@ static const char _svn_version[] = #define var_code 7 -extern void rawset_sa_item(sa_tree hed, integer n, integer v); - /* TODO: not sure if this is the right order */ #define back_error(A,B) do { \ OK_to_interrupt=false; \ diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.c b/Build/source/texk/web2c/luatexdir/tex/textoken.c index 91d5f6fc87f..a961966a1a1 100644 --- a/Build/source/texk/web2c/luatexdir/tex/textoken.c +++ b/Build/source/texk/web2c/luatexdir/tex/textoken.c @@ -60,8 +60,6 @@ static const char _svn_version[] = #define detokenized_line() (line_catcode_table==NO_CAT_TABLE) -extern void insert_vj_template(void); - #define do_get_cat_code(a) do { \ if (line_catcode_table!=DEFAULT_CAT_TABLE) \ a=get_cat_code(line_catcode_table,cur_chr); \ diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.h b/Build/source/texk/web2c/luatexdir/utils/utils.h index 138913849b2..eaa928387f0 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.h +++ b/Build/source/texk/web2c/luatexdir/utils/utils.h @@ -77,6 +77,7 @@ extern void check_pool_overflow(int wsize); extern str_number last_tex_string; extern char *cur_file_name; extern size_t last_ptr_index; +extern char *fb_array; /**********************************************************************/ /* color stack and matrix transformation support */ diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 11d1b25e872..0d39fc33a3e 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2010-01-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * psout.w: Remove charsetstr[]. + 2010-01-24 Peter Breitenlohner <peb@mppmu.mpg.de> * mp.w (mp_execute, mp_get_char_dimension): Declare string params diff --git a/Build/source/texk/web2c/mplibdir/psout.w b/Build/source/texk/web2c/mplibdir/psout.w index 1f65153f259..e044974935a 100644 --- a/Build/source/texk/web2c/mplibdir/psout.w +++ b/Build/source/texk/web2c/mplibdir/psout.w @@ -1769,7 +1769,6 @@ static const char charstringname[] = "/CharStrings"; @ @<Glob...@>= char **t1_glyph_names; char *t1_builtin_glyph_names[256]; -char charsetstr[0x4000]; boolean read_encoding_only; int t1_encoding; diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am index ba20c96af96..4cc6927671a 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.am +++ b/Build/source/texk/web2c/omegafonts/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/web2c/omegafonts/ ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am index e75e97c5f2f..f7bb2e19897 100644 --- a/Build/source/texk/web2c/omegaware/am/omegaware.am +++ b/Build/source/texk/web2c/omegaware/am/omegaware.am @@ -1,6 +1,6 @@ ## texk/web2c/omegaware/am/omegaware.am: Makefile fragment for omegaware web programs. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. omegaware_tools = odvicopy odvitype otangle |