diff options
124 files changed, 445 insertions, 389 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 4e34ea4e3ef..1306f88a12c 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2010-04-13 Taco Hoekwater <taco@luatex> + + * new import from luatex repository (HEAD of 0.60.x branch) + 2010-04-12 Peter Breitenlohner <peb@mppmu.mpg.de> * am/luatex.am: Remove libmplib.a from $($(luatex_OBJECTS)'s diff --git a/Build/source/texk/web2c/luatexdir/NEWS b/Build/source/texk/web2c/luatexdir/NEWS index d4031c5adc4..2ab5446f5c1 100644 --- a/Build/source/texk/web2c/luatexdir/NEWS +++ b/Build/source/texk/web2c/luatexdir/NEWS @@ -1483,7 +1483,7 @@ Other news: we probably introduced new problems as well). * Most (all?) files now have a corrected Copyright header, - and link in $Id$ and $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/NEWS $ into the object file. + and link in $Id$ and $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/NEWS $ into the object file. * Some unnecessary files were removed from the distribution. diff --git a/Build/source/texk/web2c/luatexdir/dvi/dvigen.w b/Build/source/texk/web2c/luatexdir/dvi/dvigen.w index 240d589fee1..48336a2919f 100644 --- a/Build/source/texk/web2c/luatexdir/dvi/dvigen.w +++ b/Build/source/texk/web2c/luatexdir/dvi/dvigen.w @@ -30,8 +30,8 @@ @ Initial identification of this file, and the needed headers. @c static const char _svn_version[] = - "$Id: dvigen.w 3535 2010-03-21 17:02:05Z oneiros $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/dvi/dvigen.w $"; + "$Id: dvigen.w 3612 2010-04-13 09:29:42Z taco $" + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/dvi/dvigen.w $"; #include "ptexlib.h" @@ -653,7 +653,7 @@ output an array of words with one system call. @^defecation@> @c -void write_dvi(dvi_index a, dvi_index b) +static void write_dvi(dvi_index a, dvi_index b) { dvi_index k; for (k = a; k <= b; k++) diff --git a/Build/source/texk/web2c/luatexdir/font/dofont.w b/Build/source/texk/web2c/luatexdir/font/dofont.w index 38278e8d1cb..3dad8b50abe 100644 --- a/Build/source/texk/web2c/luatexdir/font/dofont.w +++ b/Build/source/texk/web2c/luatexdir/font/dofont.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: dofont.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/dofont.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/dofont.w $"; @ a bit more interfacing is needed for proper error reporting diff --git a/Build/source/texk/web2c/luatexdir/font/luafont.w b/Build/source/texk/web2c/luatexdir/font/luafont.w index bde66530fb4..6ea114de45a 100644 --- a/Build/source/texk/web2c/luatexdir/font/luafont.w +++ b/Build/source/texk/web2c/luatexdir/font/luafont.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: luafont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/luafont.w $"; + "$Id: luafont.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/luafont.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -111,7 +111,7 @@ static void dump_intfield(lua_State * L, const char *n, int c) } -void dump_math_kerns(lua_State * L, charinfo * co, int l, int id) +static void dump_math_kerns(lua_State * L, charinfo * co, int l, int id) { int i; for (i = 0; i < l; i++) { @@ -136,7 +136,7 @@ void dump_math_kerns(lua_State * L, charinfo * co, int l, int id) } -void font_char_to_lua(lua_State * L, internal_font_number f, charinfo * co) +static void font_char_to_lua(lua_State * L, internal_font_number f, charinfo * co) { int i, j; liginfo *l; @@ -739,7 +739,7 @@ make_luaS_index(vert_variants); make_luaS_index(mathkern); make_luaS_index(commands); -void init_font_string_pointers(lua_State * L) +static void init_font_string_pointers(lua_State * L) { init_luaS_index(width); init_luaS_index(height); @@ -856,7 +856,7 @@ static int count_char_packet_bytes(lua_State * L) -scaled sp_to_dvi(halfword sp, halfword atsize) +static scaled sp_to_dvi(halfword sp, halfword atsize) { double result, mult; mult = (double) (atsize / 65536.0); @@ -1174,7 +1174,7 @@ static void store_math_kerns(lua_State * L, charinfo * co, int id) } @ @c -void +static void font_char_from_lua(lua_State * L, internal_font_number f, int i, int *l_fonts, boolean has_math) { diff --git a/Build/source/texk/web2c/luatexdir/font/mapfile.w b/Build/source/texk/web2c/luatexdir/font/mapfile.w index 3d129183d6f..8d06d046628 100644 --- a/Build/source/texk/web2c/luatexdir/font/mapfile.w +++ b/Build/source/texk/web2c/luatexdir/font/mapfile.w @@ -21,7 +21,7 @@ static const char _svn_version[] = "$Id: mapfile.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/mapfile.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/mapfile.w $"; #include <math.h> #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/font/pkin.w b/Build/source/texk/web2c/luatexdir/font/pkin.w index 077680eb596..a807ab39d0c 100644 --- a/Build/source/texk/web2c/luatexdir/font/pkin.w +++ b/Build/source/texk/web2c/luatexdir/font/pkin.w @@ -53,7 +53,7 @@ typedef short shalfword; static const char _svn_version[] = "$Id: pkin.w 3584 2010-04-02 17:45:55Z hhenkel $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/pkin.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/pkin.w $"; @ Now we have some routines to get stuff from the pk file. pkbyte returns diff --git a/Build/source/texk/web2c/luatexdir/font/sfnt.w b/Build/source/texk/web2c/luatexdir/font/sfnt.w index 25fb3fcd086..53044ca0fee 100644 --- a/Build/source/texk/web2c/luatexdir/font/sfnt.w +++ b/Build/source/texk/web2c/luatexdir/font/sfnt.w @@ -33,7 +33,7 @@ static const char _svn_version[] = "$Id: sfnt.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/sfnt.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/sfnt.w $"; diff --git a/Build/source/texk/web2c/luatexdir/font/subfont.w b/Build/source/texk/web2c/luatexdir/font/subfont.w index 5ae8639bb41..b7ea88064cf 100644 --- a/Build/source/texk/web2c/luatexdir/font/subfont.w +++ b/Build/source/texk/web2c/luatexdir/font/subfont.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: subfont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/subfont.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/subfont.w $"; @ @c static struct avl_table *sfd_tree = NULL; diff --git a/Build/source/texk/web2c/luatexdir/font/texfont.w b/Build/source/texk/web2c/luatexdir/font/texfont.w index 19dcb0769af..b2dd0a6cb86 100644 --- a/Build/source/texk/web2c/luatexdir/font/texfont.w +++ b/Build/source/texk/web2c/luatexdir/font/texfont.w @@ -33,8 +33,8 @@ problematic |if 0 != null|. @c static const char _svn_version[] = - "$Id: texfont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/texfont.w $"; + "$Id: texfont.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/texfont.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -189,7 +189,7 @@ charinfo *get_charinfo(internal_font_number f, int c) } @ @c -void set_charinfo(internal_font_number f, int c, charinfo * ci) +static void set_charinfo(internal_font_number f, int c, charinfo * ci) { sa_tree_item glyph; if (proper_char_index(c)) { @@ -366,7 +366,8 @@ int char_exists(internal_font_number f, int c) } @ @c -int lua_char_exists_callback(internal_font_number f, int c) +#if 0 +static int lua_char_exists_callback(internal_font_number f, int c) { int callback_id; lua_State *L = Luas; @@ -389,7 +390,7 @@ int lua_char_exists_callback(internal_font_number f, int c) } return ret; } - +#endif @ @c extinfo *new_variant(int glyph, int startconnect, int endconnect, @@ -408,7 +409,7 @@ extinfo *new_variant(int glyph, int startconnect, int endconnect, @ @c -extinfo *copy_variant(extinfo * old) +static extinfo *copy_variant(extinfo * old) { extinfo *ext; ext = xmalloc(sizeof(extinfo)); @@ -422,7 +423,7 @@ extinfo *copy_variant(extinfo * old) } @ @c -void dump_variant(extinfo * ext) +static void dump_variant(extinfo * ext) { dump_int(ext->glyph); dump_int(ext->start_overlap); @@ -434,7 +435,7 @@ void dump_variant(extinfo * ext) @ @c -extinfo *undump_variant(void) +static extinfo *undump_variant(void) { int x; extinfo *ext; @@ -502,7 +503,7 @@ extinfo *copy_variants(extinfo * o) @ @c -void dump_charinfo_variants(extinfo * o) +static void dump_charinfo_variants(extinfo * o) { while (o != NULL) { dump_variant(o); @@ -513,7 +514,7 @@ void dump_charinfo_variants(extinfo * o) } @ @c -extinfo *undump_charinfo_variants(void) +static extinfo *undump_charinfo_variants(void) { extinfo *c, *t, *h = NULL; c = undump_variant(); @@ -1440,7 +1441,7 @@ scaled get_kern(internal_font_number f, int lc, int rc) x = 0; dump_int(x); \ } -void dump_charinfo(int f, int c) +static void dump_charinfo(int f, int c) { charinfo *co; int x; @@ -1503,7 +1504,7 @@ void dump_charinfo(int f, int c) dump_math_kerns(co); } -void dump_font_entry(texfont * f) +static void dump_font_entry(texfont * f) { int x; dump_int(f->_font_size); @@ -1583,7 +1584,7 @@ void dump_font(int f) } @ @c -int undump_charinfo(int f) +static int undump_charinfo(int f) { charinfo *co; int x, i; @@ -1678,7 +1679,7 @@ int undump_charinfo(int f) a(f,s); } -void undump_font_entry(texfont * f) +static void undump_font_entry(texfont * f) { int x = 0; /* *INDENT-OFF* */ diff --git a/Build/source/texk/web2c/luatexdir/font/tfmofm.w b/Build/source/texk/web2c/luatexdir/font/tfmofm.w index 842af38b405..afe58217373 100644 --- a/Build/source/texk/web2c/luatexdir/font/tfmofm.w +++ b/Build/source/texk/web2c/luatexdir/font/tfmofm.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: tfmofm.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tfmofm.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tfmofm.w $"; @ Here are some macros that help process ligatures and kerns @c diff --git a/Build/source/texk/web2c/luatexdir/font/tounicode.w b/Build/source/texk/web2c/luatexdir/font/tounicode.w index 9ca84210606..14bf9bedad9 100644 --- a/Build/source/texk/web2c/luatexdir/font/tounicode.w +++ b/Build/source/texk/web2c/luatexdir/font/tounicode.w @@ -23,7 +23,7 @@ static const char _svn_version[] = "$Id: tounicode.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tounicode.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tounicode.w $"; @ @c #define isXdigit(c) (isdigit(c) || ('A' <= (c) && (c) <= 'F')) diff --git a/Build/source/texk/web2c/luatexdir/font/tt_glyf.w b/Build/source/texk/web2c/luatexdir/font/tt_glyf.w index b22d5748284..2a1fcf02f66 100644 --- a/Build/source/texk/web2c/luatexdir/font/tt_glyf.w +++ b/Build/source/texk/web2c/luatexdir/font/tt_glyf.w @@ -31,7 +31,7 @@ static const char _svn_version[] = "$Id: tt_glyf.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tt_glyf.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tt_glyf.w $"; @ @c #define NUM_GLYPH_LIMIT 65534 diff --git a/Build/source/texk/web2c/luatexdir/font/tt_table.w b/Build/source/texk/web2c/luatexdir/font/tt_table.w index 35da4284ee8..744baa8e6bf 100644 --- a/Build/source/texk/web2c/luatexdir/font/tt_table.w +++ b/Build/source/texk/web2c/luatexdir/font/tt_table.w @@ -28,7 +28,7 @@ static const char _svn_version[] = "$Id: tt_table.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tt_table.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tt_table.w $"; @ tables contains information refered by other tables diff --git a/Build/source/texk/web2c/luatexdir/font/vfovf.w b/Build/source/texk/web2c/luatexdir/font/vfovf.w index cc3c93ad8b5..68852e209e5 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfovf.w +++ b/Build/source/texk/web2c/luatexdir/font/vfovf.w @@ -22,8 +22,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: vfovf.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/vfovf.w $"; + "$Id: vfovf.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/vfovf.w $"; @ @c /* this is a hack! */ @@ -208,7 +208,7 @@ vf_local_font_warning(internal_font_number f, internal_font_number k, @ process a local font in \.{VF} file @c -internal_font_number +static internal_font_number vf_def_font(internal_font_number f, unsigned char *vf_buffer, int *vf_cr) { internal_font_number k; @@ -386,7 +386,7 @@ static int open_vf_file(const char *fn, unsigned char **vbuffer, int *vsize) } @ @c -int count_packet_bytes(eight_bits * vf_buf, int cur_bute, int count) +static int count_packet_bytes(eight_bits * vf_buf, int cur_bute, int count) { unsigned k = 0; int ff = 0; @@ -1595,7 +1595,8 @@ letter_space_font(halfword u, internal_font_number f, int e) @ the fontname has [+-]\d+ls at the end @c -boolean is_letterspaced_font(internal_font_number f) +#if 0 +static boolean is_letterspaced_font(internal_font_number f) { char *i, *j; if (font_type(f) != virtual_font_type) @@ -1616,6 +1617,7 @@ boolean is_letterspaced_font(internal_font_number f) return false; return true; } +#endif @ @c internal_font_number copy_font_info(internal_font_number f) diff --git a/Build/source/texk/web2c/luatexdir/font/vfpacket.w b/Build/source/texk/web2c/luatexdir/font/vfpacket.w index eb28fcdcc4c..8a222e04c04 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfpacket.w +++ b/Build/source/texk/web2c/luatexdir/font/vfpacket.w @@ -23,7 +23,7 @@ static const char _svn_version[] = "$Id: vfpacket.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/vfpacket.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/vfpacket.w $"; @ The |do_vf_packet| procedure is called in order to interpret the diff --git a/Build/source/texk/web2c/luatexdir/font/writecff.w b/Build/source/texk/web2c/luatexdir/font/writecff.w index 91d1f3c9af2..afbf9ef8ff9 100644 --- a/Build/source/texk/web2c/luatexdir/font/writecff.w +++ b/Build/source/texk/web2c/luatexdir/font/writecff.w @@ -25,7 +25,7 @@ static const char _svn_version[] = "$Id: writecff.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writecff.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writecff.w $"; @ @c #define get_offset(s,n) get_unsigned(s, (n)) diff --git a/Build/source/texk/web2c/luatexdir/font/writeenc.w b/Build/source/texk/web2c/luatexdir/font/writeenc.w index 1b98c824970..b8db3e9791b 100644 --- a/Build/source/texk/web2c/luatexdir/font/writeenc.w +++ b/Build/source/texk/web2c/luatexdir/font/writeenc.w @@ -22,8 +22,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: writeenc.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writeenc.w $"; + "$Id: writeenc.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writeenc.w $"; @ All encoding entries go into AVL tree for fast search by name. @c @@ -37,7 +37,7 @@ static int comp_fe_entry(const void *pa, const void *pb, void *p) return strcmp(((const fe_entry *) pa)->name, ((const fe_entry *) pb)->name); } -fe_entry *new_fe_entry(void) +static fe_entry *new_fe_entry(void) { fe_entry *fe; fe = xtalloc(1, fe_entry); @@ -48,7 +48,7 @@ fe_entry *new_fe_entry(void) return fe; } -fe_entry *lookup_fe_entry(char *s) +static fe_entry *lookup_fe_entry(char *s) { fe_entry fe; assert(s != NULL); @@ -60,7 +60,7 @@ fe_entry *lookup_fe_entry(char *s) return (fe_entry *) avl_find(fe_tree, &fe); } -void register_fe_entry(fe_entry * fe) +static void register_fe_entry(fe_entry * fe) { void **aa; if (fe_tree == NULL) { @@ -88,7 +88,7 @@ fe_entry *get_fe_entry(char *s) } @ @c -void write_enc(PDF pdf, char **glyph_names, struct avl_table *tx_tree, +static void write_enc(PDF pdf, char **glyph_names, struct avl_table *tx_tree, int fe_objnum) { int i_old, *p; @@ -116,7 +116,7 @@ void write_enc(PDF pdf, char **glyph_names, struct avl_table *tx_tree, pdf_end_dict(pdf); } -void write_fontencoding(PDF pdf, fe_entry * fe) +static void write_fontencoding(PDF pdf, fe_entry * fe) { assert(fe != NULL); write_enc(pdf, fe->glyph_names, fe->tx_tree, fe->fe_objnum); diff --git a/Build/source/texk/web2c/luatexdir/font/writefont.w b/Build/source/texk/web2c/luatexdir/font/writefont.w index 523cae59740..d130b976bf1 100644 --- a/Build/source/texk/web2c/luatexdir/font/writefont.w +++ b/Build/source/texk/web2c/luatexdir/font/writefont.w @@ -20,8 +20,8 @@ @ @c static const char _svn_version[] = - "$Id: writefont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writefont.w $"; + "$Id: writefont.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writefont.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -66,7 +66,7 @@ static int comp_fd_entry(const void *pa, const void *pb, void *p) @ initialize data structure for /Type /Font @c -fo_entry *new_fo_entry(void) +static fo_entry *new_fo_entry(void) { fo_entry *fo; fo = xtalloc(1, fo_entry); @@ -227,7 +227,7 @@ fd_entry *lookup_fd_entry(char *s) return (fd_entry *) avl_find(fd_tree, &fd); } -fd_entry *lookup_fontdescriptor(fo_entry * fo) +static fd_entry *lookup_fontdescriptor(fo_entry * fo) { assert(fo != NULL); assert(fo->fm != NULL); @@ -248,7 +248,7 @@ void register_fd_entry(fd_entry * fd) assert(aa != NULL); } -void create_fontdescriptor(fo_entry * fo, internal_font_number f) +static void create_fontdescriptor(fo_entry * fo, internal_font_number f) { assert(fo != NULL); assert(fo->fm != NULL); @@ -268,7 +268,7 @@ from external reencoding (.enc) file and collect these in the glyph tree |gl_tree| of font descriptor |fd| referenced by font dictionary |fo|. @c -void mark_reenc_glyphs(fo_entry * fo, internal_font_number f) +static void mark_reenc_glyphs(fo_entry * fo, internal_font_number f) { int i; char **g; @@ -294,7 +294,7 @@ Function |mark_chars| has 2 uses: \item 2. Mark encoding pairs used by \TeX\ to optimize encoding vector. @c -struct avl_table *mark_chars(fo_entry * fo, struct avl_table *tx_tree, +static struct avl_table *mark_chars(fo_entry * fo, struct avl_table *tx_tree, internal_font_number f) { int i, *j; @@ -316,7 +316,7 @@ struct avl_table *mark_chars(fo_entry * fo, struct avl_table *tx_tree, @ @c -void get_char_range(fo_entry * fo, internal_font_number f) +static void get_char_range(fo_entry * fo, internal_font_number f) { int i; assert(fo != NULL); @@ -384,7 +384,7 @@ static void write_charwidth_array(PDF pdf, fo_entry * fo, @ Remark: Font objects from embedded PDF files are never registered into |fo_tree|; they are individually written out. @c -fo_entry *lookup_fo_entry(char *s) +static fo_entry *lookup_fo_entry(char *s) { fo_entry fo; fm_entry fm; @@ -398,7 +398,7 @@ fo_entry *lookup_fo_entry(char *s) return (fo_entry *) avl_find(fo_tree, &fo); } -void register_fo_entry(fo_entry * fo) +static void register_fo_entry(fo_entry * fo) { void **aa; if (fo_tree == NULL) { @@ -561,7 +561,7 @@ static void write_fontdescriptor(PDF pdf, fd_entry * fd) pdf_end_dict(pdf); } -void write_fontdescriptors(PDF pdf) +static void write_fontdescriptors(PDF pdf) { fd_entry *fd; struct avl_traverser t; @@ -575,7 +575,7 @@ void write_fontdescriptors(PDF pdf) @ @c -void write_fontdictionary(PDF pdf, fo_entry * fo) +static void write_fontdictionary(PDF pdf, fo_entry * fo) { assert(fo != NULL); assert(fo->fm != NULL); @@ -623,7 +623,7 @@ void write_fontdictionary(PDF pdf, fo_entry * fo) pdf_end_dict(pdf); } -void write_fontdictionaries(PDF pdf) +static void write_fontdictionaries(PDF pdf) { fo_entry *fo; struct avl_traverser t; @@ -827,7 +827,7 @@ void do_pdf_font(PDF pdf, internal_font_number f) at this point in the program. @c -int comp_glw_entry(const void *pa, const void *pb, void *p +static int comp_glw_entry(const void *pa, const void *pb, void *p __attribute__ ((unused))) { unsigned short i, j; @@ -838,7 +838,7 @@ int comp_glw_entry(const void *pa, const void *pb, void *p return 0; } -void create_cid_fontdescriptor(fo_entry * fo, internal_font_number f) +static void create_cid_fontdescriptor(fo_entry * fo, internal_font_number f) { assert(fo != NULL); assert(fo->fm != NULL); diff --git a/Build/source/texk/web2c/luatexdir/font/writet1.w b/Build/source/texk/web2c/luatexdir/font/writet1.w index 69ac40bac04..ccb2196c451 100644 --- a/Build/source/texk/web2c/luatexdir/font/writet1.w +++ b/Build/source/texk/web2c/luatexdir/font/writet1.w @@ -20,8 +20,8 @@ @ @c static const char _svn_version[] = - "$Id: writet1.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writet1.w $"; + "$Id: writet1.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writet1.w $"; #include "ptexlib.h" #include <string.h> @@ -353,7 +353,8 @@ char **load_enc_file(char *enc_name) } @ @c -void free_glyph_names(char **glyph_names) +#if 0 +static void free_glyph_names(char **glyph_names) { int i; assert(glyph_names != NULL); @@ -362,7 +363,7 @@ void free_glyph_names(char **glyph_names) xfree(glyph_names[i]); xfree(glyph_names); } - +#endif static void t1_check_pfa(void) { @@ -760,7 +761,7 @@ static void copy_glyph_names(char **glyph_names, int a, int b) @ read encoding from Type1 font file, return |glyph_names| array, or |pdffail()| @c -char **t1_builtin_enc(void) +static char **t1_builtin_enc(void) { int i, a, b, c, counter = 0; char *r, *p, **glyph_names; @@ -1304,7 +1305,7 @@ static int comp_t1_glyphs(const void *pa, const void *pb, void *p return strcmp(*(const char *const *) pa, *(const char *const *) pb); } -struct avl_table *create_t1_glyph_tree(char **glyph_names) +static struct avl_table *create_t1_glyph_tree(char **glyph_names) { int i; void **aa; @@ -1322,7 +1323,7 @@ struct avl_table *create_t1_glyph_tree(char **glyph_names) return gl_tree; } -void destroy_t1_glyph_tree(struct avl_table *gl_tree) +static void destroy_t1_glyph_tree(struct avl_table *gl_tree) { assert(gl_tree != NULL); avl_destroy(gl_tree, NULL); diff --git a/Build/source/texk/web2c/luatexdir/font/writet3.w b/Build/source/texk/web2c/luatexdir/font/writet3.w index 9301ba5f4f3..b138df57c94 100644 --- a/Build/source/texk/web2c/luatexdir/font/writet3.w +++ b/Build/source/texk/web2c/luatexdir/font/writet3.w @@ -21,7 +21,7 @@ @ @c static const char _svn_version[] = "$Id: writet3.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writet3.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writet3.w $"; #include "ptexlib.h" #include <kpathsea/tex-glyph.h> diff --git a/Build/source/texk/web2c/luatexdir/font/writettf.w b/Build/source/texk/web2c/luatexdir/font/writettf.w index bbeb346c020..2a7c5c644c0 100644 --- a/Build/source/texk/web2c/luatexdir/font/writettf.w +++ b/Build/source/texk/web2c/luatexdir/font/writettf.w @@ -24,8 +24,8 @@ #include <string.h> static const char _svn_version[] = - "$Id: writettf.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writettf.w $"; + "$Id: writettf.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writettf.w $"; #define DEFAULT_NTABS 14 #define NEW_CMAP_SIZE 2 @@ -410,7 +410,7 @@ static const char *newtabnames[] = { @ Back to code. Low-level helpers first. @c -ttf_cmap_entry *new_ttf_cmap_entry(void) +static ttf_cmap_entry *new_ttf_cmap_entry(void) { ttf_cmap_entry *e; e = xtalloc(1, ttf_cmap_entry); @@ -1763,7 +1763,7 @@ void writettf(PDF pdf, fd_entry * fd) cur_file_name = NULL; } -void do_writeotf(PDF pdf, fd_entry * fd) +static void do_writeotf(PDF pdf, fd_entry * fd) { long i; dirtab_entry *tab; diff --git a/Build/source/texk/web2c/luatexdir/font/writetype0.w b/Build/source/texk/web2c/luatexdir/font/writetype0.w index f902ad89a2a..818a23b5ca1 100644 --- a/Build/source/texk/web2c/luatexdir/font/writetype0.w +++ b/Build/source/texk/web2c/luatexdir/font/writetype0.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: writetype0.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writetype0.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writetype0.w $"; @ @c void writetype0(PDF pdf, fd_entry * fd) diff --git a/Build/source/texk/web2c/luatexdir/font/writetype2.w b/Build/source/texk/web2c/luatexdir/font/writetype2.w index 5081d9f0986..66b97f7d201 100644 --- a/Build/source/texk/web2c/luatexdir/font/writetype2.w +++ b/Build/source/texk/web2c/luatexdir/font/writetype2.w @@ -27,7 +27,7 @@ #include "font/tt_glyf.h" static const char _svn_version[] = - "$Id: writetype2.w 3584 2010-04-02 17:45:55Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writetype2.w $"; + "$Id: writetype2.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writetype2.w $"; @ forward declaration @c @@ -237,7 +237,7 @@ static struct { }; -unsigned long ttc_read_offset(sfnt * sfont, int ttc_idx) +static unsigned long ttc_read_offset(sfnt * sfont, int ttc_idx) { ULONG version; unsigned long offset = 0; diff --git a/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh b/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh index a59bc81db56..519d7df8240 100755 --- a/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh +++ b/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh @@ -17,7 +17,7 @@ then DEFREV=`cat $FILE` SVNREV=`svnversion -c . | sed -ne 's/^[0-9]*:*\([0-9]*\).*/#define luatex_svn_revision \1/p'` test "$DEFREV" != "$SVNREV" && echo "$SVNREV" > $FILE -elif ( [ -f ../.git/refs/remotes/git-svn ] && git svn --version > /dev/null ) +elif ( [ -f ../.git/refs/remotes/git-svn ] || [ -d ../.git/svn ] && git svn --version > /dev/null ) then DEFREV=`cat $FILE` SVNREV=`git svn info | sed -ne 's/^Revision: \([0-9]*\).*$/#define luatex_svn_revision \1/p'` diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.w b/Build/source/texk/web2c/luatexdir/image/epdf.w index c52f148ffdf..8d536e6a60e 100644 --- a/Build/source/texk/web2c/luatexdir/image/epdf.w +++ b/Build/source/texk/web2c/luatexdir/image/epdf.w @@ -21,7 +21,7 @@ @ @c static const char _svn_version[] = "$Id: epdf.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/image/epdf.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/image/epdf.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/image/writeimg.w b/Build/source/texk/web2c/luatexdir/image/writeimg.w index a6b03ee4290..45aeacd5fe7 100644 --- a/Build/source/texk/web2c/luatexdir/image/writeimg.w +++ b/Build/source/texk/web2c/luatexdir/image/writeimg.w @@ -23,7 +23,7 @@ @ @c static const char _svn_version[] = "$Id: writeimg.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/image/writeimg.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/image/writeimg.w $"; #include <assert.h> #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/image/writejbig2.w b/Build/source/texk/web2c/luatexdir/image/writejbig2.w index 936ae29c6bd..0e578f9b457 100644 --- a/Build/source/texk/web2c/luatexdir/image/writejbig2.w +++ b/Build/source/texk/web2c/luatexdir/image/writejbig2.w @@ -81,7 +81,7 @@ object exists, reference it. Else create fresh one. @ @c static const char _svn_version[] = "$Id: writejbig2.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/image/writejbig2.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/image/writejbig2.w $"; #undef DEBUG diff --git a/Build/source/texk/web2c/luatexdir/image/writejpg.w b/Build/source/texk/web2c/luatexdir/image/writejpg.w index cb0e2fedcde..4f77303ce20 100644 --- a/Build/source/texk/web2c/luatexdir/image/writejpg.w +++ b/Build/source/texk/web2c/luatexdir/image/writejpg.w @@ -20,12 +20,13 @@ @ @c static const char _svn_version[] = - "$Id: writejpg.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/image/writejpg.w $"; + "$Id: writejpg.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/image/writejpg.w $"; #include <assert.h> #include "ptexlib.h" #include "image/image.h" +#include "image/writejpg.h" @ @c #define JPG_GRAY 1 /* Gray color space, use /DeviceGray */ diff --git a/Build/source/texk/web2c/luatexdir/image/writepng.w b/Build/source/texk/web2c/luatexdir/image/writepng.w index 1b8ecb56b49..084e9324a6d 100644 --- a/Build/source/texk/web2c/luatexdir/image/writepng.w +++ b/Build/source/texk/web2c/luatexdir/image/writepng.w @@ -20,12 +20,13 @@ @ @c static const char _svn_version[] = - "$Id: writepng.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/image/writepng.w $"; + "$Id: writepng.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/image/writepng.w $"; #include <assert.h> #include "ptexlib.h" #include "image/image.h" +#include "image/writepng.h" @ @c static int transparent_page_group = -1; diff --git a/Build/source/texk/web2c/luatexdir/lang/hnjalloc.w b/Build/source/texk/web2c/luatexdir/lang/hnjalloc.w index c7d595cdd75..da1f04a6b55 100644 --- a/Build/source/texk/web2c/luatexdir/lang/hnjalloc.w +++ b/Build/source/texk/web2c/luatexdir/lang/hnjalloc.w @@ -37,6 +37,7 @@ #include <stdlib.h> #include <stdio.h> +#include "lang/hnjalloc.h" void *hnj_malloc(int size) { diff --git a/Build/source/texk/web2c/luatexdir/lang/hyphen.w b/Build/source/texk/web2c/luatexdir/lang/hyphen.w index f7bbe6bd843..fc88ac9c571 100644 --- a/Build/source/texk/web2c/luatexdir/lang/hyphen.w +++ b/Build/source/texk/web2c/luatexdir/lang/hyphen.w @@ -56,8 +56,8 @@ @ @c static const char _svn_version[] = - "$Id: hyphen.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lang/hyphen.w $"; + "$Id: hyphen.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lang/hyphen.w $"; @ TODO: should be moved to separate library @@ -173,7 +173,7 @@ static char *combine(char *expr, const char *subexpr) @ ORIGINAL CODE @c -HashIter *new_HashIter(HashTab * h) +static HashIter *new_HashIter(HashTab * h) { HashIter *i = hnj_malloc(sizeof(HashIter)); i->e = h->entries; @@ -183,7 +183,7 @@ HashIter *new_HashIter(HashTab * h) } -int nextHashStealPattern(HashIter * i, unsigned char **word, char **pattern) +static int nextHashStealPattern(HashIter * i, unsigned char **word, char **pattern) { while (i->cur == NULL) { if (i->ndx >= HASH_SIZE - 1) @@ -198,7 +198,7 @@ int nextHashStealPattern(HashIter * i, unsigned char **word, char **pattern) } -int nextHash(HashIter * i, unsigned char **word) +static int nextHash(HashIter * i, unsigned char **word) { while (i->cur == NULL) { if (i->ndx >= HASH_SIZE - 1) @@ -211,7 +211,7 @@ int nextHash(HashIter * i, unsigned char **word) } -int eachHash(HashIter * i, unsigned char **word, char **pattern) +static int eachHash(HashIter * i, unsigned char **word, char **pattern) { while (i->cur == NULL) { if (i->ndx >= HASH_SIZE - 1) @@ -225,7 +225,7 @@ int eachHash(HashIter * i, unsigned char **word, char **pattern) } -void delete_HashIter(HashIter * i) +static void delete_HashIter(HashIter * i) { hnj_free(i); } diff --git a/Build/source/texk/web2c/luatexdir/lang/texlang.w b/Build/source/texk/web2c/luatexdir/lang/texlang.w index 6fcb7180820..95996e8d93b 100644 --- a/Build/source/texk/web2c/luatexdir/lang/texlang.w +++ b/Build/source/texk/web2c/luatexdir/lang/texlang.w @@ -26,8 +26,8 @@ static const char _svn_version[] = - "$Id: texlang.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lang/texlang.w $"; + "$Id: texlang.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lang/texlang.w $"; @ Low-level helpers @@ -514,7 +514,7 @@ void set_disc_field(halfword f, halfword t) @ @c -char *hyphenation_exception(int exceptions, char *w) +static char *hyphenation_exception(int exceptions, char *w) { char *ret = NULL; lua_State *L = Luas; @@ -572,7 +572,7 @@ char *exception_strings(struct tex_language *lang) it could be faster to modify a halfword pointer and return an integer @c -halfword find_exception_part(unsigned int *j, unsigned int *uword, int len) +static halfword find_exception_part(unsigned int *j, unsigned int *uword, int len) { halfword g = null, gg = null; register unsigned i = *j; @@ -592,7 +592,7 @@ halfword find_exception_part(unsigned int *j, unsigned int *uword, int len) return gg; } -int count_exception_part(unsigned int *j, unsigned int *uword, int len) +static int count_exception_part(unsigned int *j, unsigned int *uword, int len) { int ret = 0; register unsigned i = *j; @@ -613,7 +613,7 @@ static const char *PAT_ERROR[] = { NULL }; -void do_exception(halfword wordstart, halfword r, char *replacement) +static void do_exception(halfword wordstart, halfword r, char *replacement) { unsigned i; halfword t; @@ -749,7 +749,7 @@ can be hyphenated, but most european users seem to agree that prohibiting hyphenation there was not the best idea ever. @c -halfword find_next_wordstart(halfword r) +static halfword find_next_wordstart(halfword r) { register int l; register int start_ok = 1; @@ -790,7 +790,7 @@ halfword find_next_wordstart(halfword r) } @ @c -int valid_wordend(halfword s) +static int valid_wordend(halfword s) { register halfword r = s; register int clang = char_lang(s); @@ -959,7 +959,7 @@ void new_hyphenation(halfword head, halfword tail) } -void dump_one_language(int i) +static void dump_one_language(int i) { char *s = NULL; int x = 0; @@ -1002,7 +1002,7 @@ void dump_language_data(void) } -void undump_one_language(int i) +static void undump_one_language(int i) { char *s = NULL; int x = 0; diff --git a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c index c29f2de0e96..a3961703528 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c @@ -21,7 +21,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: lcallbacklib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lcallbacklib.c $"; + "$Id: lcallbacklib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lcallbacklib.c $"; int callback_count = 0; int saved_callback_count = 0; diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc index 551cc2d1ee3..2c1bc34fc1b 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc +++ b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc @@ -19,7 +19,7 @@ static const char _svn_version[] = "$Id: lepdflib.cc 3366 2010-01-20 14:49:31Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lepdflib.cc $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lepdflib.cc $"; #include "image/epdf.h" diff --git a/Build/source/texk/web2c/luatexdir/lua/lfontlib.c b/Build/source/texk/web2c/luatexdir/lua/lfontlib.c index 32b9e776fc1..da7a69cb571 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lfontlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lfontlib.c @@ -22,7 +22,7 @@ static const char _svn_version[] = - "$Id: lfontlib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lfontlib.c $"; + "$Id: lfontlib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lfontlib.c $"; #define TIMERS 0 diff --git a/Build/source/texk/web2c/luatexdir/lua/limglib.c b/Build/source/texk/web2c/luatexdir/lua/limglib.c index 0c2d7e4d65e..5245e31d0a3 100644 --- a/Build/source/texk/web2c/luatexdir/lua/limglib.c +++ b/Build/source/texk/web2c/luatexdir/lua/limglib.c @@ -18,8 +18,8 @@ with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ static const char _svn_version[] = - "$Id: limglib.c 3404 2010-01-28 11:17:10Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/limglib.c $"; + "$Id: limglib.c 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/limglib.c $"; #include <stdio.h> #include <string.h> @@ -424,7 +424,7 @@ static void lua_to_image(lua_State * L, image * a) /**********************************************************************/ -void copy_image(lua_State * L, lua_Number scale) +static void copy_image(lua_State * L, lua_Number scale) { image *a, **aa, *b, **bb; if (lua_gettop(L) != 1) diff --git a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c index 16c6a4ba23a..35191538f0b 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c @@ -28,7 +28,7 @@ #include <kpathsea/tex-file.h> static const char _svn_version[] = - "$Id: lkpselib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lkpselib.c $"; + "$Id: lkpselib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lkpselib.c $"; static const unsigned filetypes[] = { kpse_gf_format, diff --git a/Build/source/texk/web2c/luatexdir/lua/llanglib.c b/Build/source/texk/web2c/luatexdir/lua/llanglib.c index 093593d1301..7b880b4293e 100644 --- a/Build/source/texk/web2c/luatexdir/lua/llanglib.c +++ b/Build/source/texk/web2c/luatexdir/lua/llanglib.c @@ -23,7 +23,7 @@ static const char _svn_version[] = - "$Id: llanglib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/llanglib.c $"; + "$Id: llanglib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/llanglib.c $"; #define LANG_METATABLE "luatex.lang" diff --git a/Build/source/texk/web2c/luatexdir/lua/llualib.c b/Build/source/texk/web2c/luatexdir/lua/llualib.c index eded8dd8f25..ec247e88010 100644 --- a/Build/source/texk/web2c/luatexdir/lua/llualib.c +++ b/Build/source/texk/web2c/luatexdir/lua/llualib.c @@ -21,7 +21,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: llualib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/llualib.c $"; + "$Id: llualib.c 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/llualib.c $"; #define LOAD_BUF_SIZE 256 #define UINT_MAX32 0xFFFFFFFF @@ -157,7 +157,7 @@ static int bytecode_register_shadow_get(lua_State * L, int k) } -int writer(lua_State * L, const void *b, size_t size, void *B) +static int writer(lua_State * L, const void *b, size_t size, void *B) { bytecode *buf = (bytecode *) B; (void) L; /* for -Wunused */ @@ -173,7 +173,7 @@ int writer(lua_State * L, const void *b, size_t size, void *B) return 0; } -const char *reader(lua_State * L, void *ud, size_t * size) +static const char *reader(lua_State * L, void *ud, size_t * size) { bytecode *buf = (bytecode *) ud; (void) L; /* for -Wunused */ @@ -187,7 +187,7 @@ const char *reader(lua_State * L, void *ud, size_t * size) return (const char *) buf->buf; } -int get_bytecode(lua_State * L) +static int get_bytecode(lua_State * L) { int k; k = (int) luaL_checkinteger(L, -1); @@ -210,7 +210,7 @@ int get_bytecode(lua_State * L) return 1; } -int set_bytecode(lua_State * L) +static int set_bytecode(lua_State * L) { int k, ltype; unsigned int i; @@ -263,7 +263,7 @@ int set_bytecode(lua_State * L) } -int set_luaname(lua_State * L) +static int set_luaname(lua_State * L) { int k; const char *s; @@ -286,7 +286,7 @@ int set_luaname(lua_State * L) return 0; } -int get_luaname(lua_State * L) +static int get_luaname(lua_State * L) { int k; k = (int) luaL_checkinteger(L, 2); diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c index 3b626826e58..1da8d985181 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c @@ -18,8 +18,8 @@ with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ static const char _svn_version[] = - "$Id: lnodelib.c 3560 2010-03-29 09:27:08Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lnodelib.c $"; + "$Id: lnodelib.c 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lnodelib.c $"; #include "lua/luatex-api.h" #include "ptexlib.h" @@ -685,7 +685,7 @@ make_luaS_index(depth); make_luaS_index(expansion_factor); -void initialize_luaS_indexes(lua_State * L) +static void initialize_luaS_indexes(lua_State * L) { init_luaS_index(id); init_luaS_index(next); @@ -3308,7 +3308,7 @@ static int lua_nodelib_first_character(lua_State * L) /* this is too simplistic, but it helps Hans to get going */ -halfword do_ligature_n(halfword prev, halfword stop, halfword lig) +static halfword do_ligature_n(halfword prev, halfword stop, halfword lig) { vlink(lig) = vlink(stop); vlink(stop) = null; @@ -3395,6 +3395,7 @@ static const struct luaL_reg nodelib_f[] = { {"protect_glyphs", lua_nodelib_protect_glyphs}, {"unprotect_glyphs", lua_nodelib_unprotect_glyphs}, {"protrusion_skipable", lua_nodelib_cp_skipable}, + {"protrusion_skippable", lua_nodelib_cp_skipable}, {NULL, NULL} /* sentinel */ }; diff --git a/Build/source/texk/web2c/luatexdir/lua/loslibext.c b/Build/source/texk/web2c/luatexdir/lua/loslibext.c index 9130f488d59..8ddc2d2a7e4 100644 --- a/Build/source/texk/web2c/luatexdir/lua/loslibext.c +++ b/Build/source/texk/web2c/luatexdir/lua/loslibext.c @@ -25,7 +25,7 @@ #include <time.h> static const char _svn_version[] = - "$Id: loslibext.c 3518 2010-03-17 09:57:13Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/loslibext.c $"; + "$Id: loslibext.c 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/loslibext.c $"; #if defined(_WIN32) || defined(__NT__) # define MKDIR(a,b) mkdir(a) @@ -603,7 +603,7 @@ static int os_setenv(lua_State * L) } -void find_env(lua_State * L) +static void find_env(lua_State * L) { char *envitem, *envitem_orig; char *envkey; @@ -872,11 +872,12 @@ static int os_gettimeofday(lua_State * L) static const char repl[] = "0123456789abcdefghijklmnopqrstuvwxyz"; -static int dirs_made = 0; - #define MAXTRIES 36*36*36 -char *do_mkdtemp(char *tmpl) +#ifndef HAVE_MKDTEMP +static int dirs_made = 0; + +static char *do_mkdtemp(char *tmpl) { int count; int value; @@ -908,6 +909,7 @@ char *do_mkdtemp(char *tmpl) } return NULL; } +#endif static int os_tmpdir(lua_State * L) { diff --git a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c index b715f02b24b..ff31b6c1dae 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c @@ -18,8 +18,8 @@ with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ static const char _svn_version[] = - "$Id: lpdflib.c 3582 2010-04-02 16:37:08Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lpdflib.c $"; + "$Id: lpdflib.c 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lpdflib.c $"; #include "lua/luatex-api.h" #include "ptexlib.h" @@ -31,7 +31,7 @@ for (i = 0; i < (l); i++) { \ pdf_quick_out(p, ((const unsigned char *) (s))[i]); \ } -int luapdfprint(lua_State * L) +static int luapdfprint(lua_State * L) { int n; unsigned i; @@ -83,7 +83,7 @@ int luapdfprint(lua_State * L) return 0; } -unsigned char *fread_to_buf(lua_State * L, const char *filename, size_t * len) +static unsigned char *fread_to_buf(lua_State * L, const char *filename, size_t * len) { int i = 0; int ilen = 0; diff --git a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c index 4d233c43e4a..020fe6d616a 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c @@ -19,7 +19,7 @@ static const char _svn_version[] = "$Id: lstatslib.c 3477 2010-03-12 13:59:34Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lstatslib.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lstatslib.c $"; #include "lua/luatex-api.h" #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c b/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c index 79f92f83d53..63ab77d9f65 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c @@ -21,7 +21,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: ltexiolib.c 3550 2010-03-26 14:37:09Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/ltexiolib.c $"; + "$Id: ltexiolib.c 3550 2010-03-26 14:37:09Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/ltexiolib.c $"; typedef void (*texio_printer) (const char *); diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c index fa0544a1853..317dbbd9afd 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c @@ -23,7 +23,7 @@ static const char _svn_version[] = - "$Id: ltexlib.c 3550 2010-03-26 14:37:09Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/ltexlib.c $"; + "$Id: ltexlib.c 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/ltexlib.c $"; #define attribute(A) eqtb[attribute_base+(A)].hh.rh #define dimen(A) eqtb[scaled_base+(A)].hh.rh @@ -120,22 +120,22 @@ static int do_luacprint(lua_State * L, int partial, int deftable) return 0; } -int luacwrite(lua_State * L) +static int luacwrite(lua_State * L) { return do_luacprint(L, FULL_LINE, NO_CAT_TABLE); } -int luacprint(lua_State * L) +static int luacprint(lua_State * L) { return do_luacprint(L, FULL_LINE, DEFAULT_CAT_TABLE); } -int luacsprint(lua_State * L) +static int luacsprint(lua_State * L) { return do_luacprint(L, PARTIAL_LINE, DEFAULT_CAT_TABLE); } -int luactprint(lua_State * L) +static int luactprint(lua_State * L) { int i, j, n; int cattable, startstrings; @@ -575,7 +575,7 @@ static int tex_scaledimen(lua_State * L) } -int get_item_index(lua_State * L, int i, int base) +static int get_item_index(lua_State * L, int i, int base) { size_t kk; int k; @@ -680,7 +680,7 @@ static int setskip(lua_State * L) return vsetskip(L, isglobal); } -int getskip(lua_State * L) +static int getskip(lua_State * L) { halfword j; int k; @@ -778,7 +778,7 @@ static int getattribute(lua_State * L) return 1; } -int vsettoks(lua_State * L, int is_global) +static int vsettoks(lua_State * L, int is_global) { int i, err; int k; @@ -925,17 +925,17 @@ static int getboxdim(lua_State * L, int whichdim) return 1; } -int getboxwd(lua_State * L) +static int getboxwd(lua_State * L) { return getboxdim(L, width_offset); } -int getboxht(lua_State * L) +static int getboxht(lua_State * L) { return getboxdim(L, height_offset); } -int getboxdp(lua_State * L) +static int getboxdp(lua_State * L) { return getboxdim(L, depth_offset); } @@ -1011,7 +1011,7 @@ static int setboxdp(lua_State * L) return vsetboxdim(L, depth_offset, isglobal); } -int settex(lua_State * L) +static int settex(lua_State * L) { const char *st; int i, j, texstr; @@ -1075,7 +1075,7 @@ int settex(lua_State * L) return 0; } -int do_convert(lua_State * L, int cur_code) +static int do_convert(lua_State * L, int cur_code) { int texstr; int i = -1; @@ -1126,7 +1126,7 @@ int do_convert(lua_State * L, int cur_code) } -int do_scan_internal(lua_State * L, int cur_cmd, int cur_code) +static int do_scan_internal(lua_State * L, int cur_cmd, int cur_code) { int texstr; char *str = NULL; @@ -1156,7 +1156,7 @@ int do_scan_internal(lua_State * L, int cur_cmd, int cur_code) return 1; } -int do_lastitem(lua_State * L, int cur_code) +static int do_lastitem(lua_State * L, int cur_code) { int retval = 1; switch (cur_code) { @@ -1319,7 +1319,7 @@ static int getpdfxformname(lua_State * L) } -int get_parshape(lua_State * L) +static int get_parshape(lua_State * L) { int n; halfword par_shape_ptr = equiv(par_shape_loc); @@ -1343,7 +1343,7 @@ int get_parshape(lua_State * L) } -int gettex(lua_State * L) +static int gettex(lua_State * L) { int cur_cs = -1; int retval = 1; /* default is to return nil */ @@ -1397,7 +1397,7 @@ int gettex(lua_State * L) } -int getlist(lua_State * L) +static int getlist(lua_State * L) { const char *str; if (lua_isstring(L, 2)) { @@ -1445,7 +1445,7 @@ int getlist(lua_State * L) return 1; } -int setlist(lua_State * L) +static int setlist(lua_State * L) { halfword *n_ptr; const char *str; diff --git a/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c b/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c index 02e6d84dff6..0f1c5332466 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c @@ -21,7 +21,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: ltokenlib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/ltokenlib.c $"; + "$Id: ltokenlib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/ltokenlib.c $"; #define is_valid_token(L,i) (lua_istable(L,i) && lua_objlen(L,i)==3) #define get_token_cmd(L,i) lua_rawgeti(L,i,1) diff --git a/Build/source/texk/web2c/luatexdir/lua/luagen.w b/Build/source/texk/web2c/luatexdir/lua/luagen.w index 292176575c0..69589ba04e0 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luagen.w +++ b/Build/source/texk/web2c/luatexdir/lua/luagen.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: luagen.w 3583 2010-04-02 17:40:44Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luagen.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luagen.w $"; #include "ptexlib.h" #include "pdf/pdfpage.h" diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w index cd8c8872a7f..3393716b36a 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luainit.w +++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w @@ -28,7 +28,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: luainit.w 3583 2010-04-02 17:40:44Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luainit.w $"; + "$Id: luainit.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luainit.w $"; @ TH: TODO @@ -110,20 +110,20 @@ const_string LUATEX_IHELP[] = { NULL }; -@ @c -char *ex_selfdir(char *argv0) +@ The return value will be the directory of the executable, e.g.: \.{c:/TeX/bin} +@c +static char *ex_selfdir(char *argv0) { #if defined(WIN32) - char short_path[PATH_MAX], path[PATH_MAX], *fp; + char path[PATH_MAX], *fp; /* SearchPath() always gives back an absolute directory */ - if (SearchPath(NULL, argv0, ".exe", PATH_MAX, short_path, &fp) == 0) + if (SearchPath(NULL, argv0, ".exe", PATH_MAX, path, NULL) == 0) FATAL1("Can't determine where the executable %s is.\n", argv0); /* slashify the dirname */ for (fp = path; fp && *fp; fp++) if (IS_DIR_SEP(*fp)) *fp = DIR_SEP; - /* sdir will be the directory of the executable, ie: c:/TeX/bin */ return xdirname(path); #else return kpse_selfdir(argv0); @@ -437,7 +437,7 @@ static char *find_filename(char *name, const char *envkey) @ @c -char *cleaned_invocation_name(char *arg) +static char *cleaned_invocation_name(char *arg) { char *ret, *dot; const char *start = xbasename(arg); @@ -450,7 +450,7 @@ char *cleaned_invocation_name(char *arg) } @ @c -void init_kpse(void) +static void init_kpse(void) { if (!user_progname) { @@ -480,7 +480,7 @@ void init_kpse(void) } @ @c -void fix_dumpname(void) +static void fix_dumpname(void) { int dist; if (dump_name) { diff --git a/Build/source/texk/web2c/luatexdir/lua/luanode.w b/Build/source/texk/web2c/luatexdir/lua/luanode.w index 81e6b4fa74e..ce157f0767a 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luanode.w +++ b/Build/source/texk/web2c/luatexdir/lua/luanode.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: luanode.w 3583 2010-04-02 17:40:44Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luanode.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luanode.w $"; @ @c static const char *group_code_names[] = { diff --git a/Build/source/texk/web2c/luatexdir/lua/luastuff.w b/Build/source/texk/web2c/luatexdir/lua/luastuff.w index 06547bc4de9..e8a3c5b9321 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luastuff.w +++ b/Build/source/texk/web2c/luatexdir/lua/luastuff.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: luastuff.w 3583 2010-04-02 17:40:44Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luastuff.w $"; + "$Id: luastuff.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luastuff.w $"; #include "lua/luatex-api.h" #include "ptexlib.h" @@ -71,7 +71,7 @@ const char *getS(lua_State * L, void *ud, size_t * size) } @ @c -void *my_luaalloc(void *ud, void *ptr, size_t osize, size_t nsize) +static void *my_luaalloc(void *ud, void *ptr, size_t osize, size_t nsize) { void *ret = NULL; (void) ud; /* for -Wunused */ diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h index 155fb6a3cb6..e754a498d8d 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h +++ b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ -/* $Id: luatex-api.h 3558 2010-03-29 07:21:45Z taco $ */ +/* $Id: luatex-api.h 3612 2010-04-13 09:29:42Z taco $ */ #ifndef LUATEX_API_H # define LUATEX_API_H 1 @@ -198,5 +198,6 @@ extern char charsetstr[]; /* from mpdir/psout.w */ extern char **environ; +extern int luac_main(int argc, char *argv[]); /* texluac.w */ #endif diff --git a/Build/source/texk/web2c/luatexdir/lua/luatoken.w b/Build/source/texk/web2c/luatexdir/lua/luatoken.w index 7a96fcd1a11..7647eec5f9b 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatoken.w +++ b/Build/source/texk/web2c/luatexdir/lua/luatoken.w @@ -23,7 +23,7 @@ static const char _svn_version[] = "$Id: luatoken.w 3583 2010-04-02 17:40:44Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luatoken.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luatoken.w $"; @ @c command_item command_names[] = { diff --git a/Build/source/texk/web2c/luatexdir/lua/texluac.w b/Build/source/texk/web2c/luatexdir/lua/texluac.w index 108e27864dc..772d7941d15 100644 --- a/Build/source/texk/web2c/luatexdir/lua/texluac.w +++ b/Build/source/texk/web2c/luatexdir/lua/texluac.w @@ -44,9 +44,11 @@ #include "lua51/lstring.h" #include "lua51/lundump.h" +#include "lua/luatex-api.h" + @ @c static const char _svn_version[] = - "$Id: texluac.w 3583 2010-04-02 17:40:44Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/texluac.w $"; + "$Id: texluac.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/texluac.w $"; @ @c #define PROGNAME "texluac" /* default program name */ diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/macbinary.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/macbinary.c index 63212410578..03d49e22936 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/macbinary.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/macbinary.c @@ -1291,9 +1291,11 @@ static char *createtmpfile(char *filename) strcpy(tempname+strlen(tempname)-5,"XXXXXX"); /* dfont -> XXXXXX */ #ifdef HAVE_MKSTEMP - int i = mkstemp(tempname); - if (i) { + { + int i = mkstemp(tempname); + if (i) { close(i); + } } #else mktemp(tempname); diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index 1183b7d9de4..d3bc2fb1b25 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -14,8 +14,8 @@ #include "luatex_svnversion.h" static const char _svn_version[] = - "$Id: luatex.c 3588 2010-04-04 06:41:44Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/luatex.c $"; + "$Id: luatex.c 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/luatex.c $"; #define TeX @@ -26,8 +26,6 @@ int luatex_date_info = -extra_version_info; /* the compile date is negated * const char *luatex_version_string = "beta-0.60.0"; const char *engine_name = "luatex"; /* the name of this engine */ - - #include <kpathsea/c-ctype.h> #include <kpathsea/line.h> #include <kpathsea/readable.h> @@ -782,7 +780,7 @@ void get_seconds_and_micros(int *seconds, int *micros) /* Generating a better seed numbers */ -int getrandomseed() +int getrandomseed(void) { #if defined (HAVE_GETTIMEOFDAY) struct timeval tv; @@ -847,13 +845,16 @@ boolean input_line(FILE * f) /* This string specifies what the `e' option does in response to an error message. */ +#if 0 static const_string edit_value = EDITOR; +#endif /* This procedure originally due to sjc@s1-c. TeX & Metafont call it when the user types `e' in response to an error, invoking a text editor on the erroneous source file. FNSTART is how far into FILENAME the actual filename starts; FNLENGTH is how long the filename is. */ +#if 0 void calledit(packedASCIIcode * filename, poolpointer fnstart, int fnlength, int linenumber) @@ -934,6 +935,7 @@ calledit(packedASCIIcode * filename, /* Quit, since we found an error. */ uexit(1); } +#endif /* Read and write dump files. As distributed, these files are architecture dependent; specifically, BigEndian and LittleEndian @@ -954,10 +956,12 @@ calledit(packedASCIIcode * filename, /* Make the NITEMS items pointed at by P, each of size SIZE, be the opposite-endianness of whatever they are now. */ -static void swap_items(char *p, int nitems, int size) +void swap_items(char *pp, int nitems, int size) { char temp; - + char *q = xmalloc(nitems*size); + char *p = q; + memcpy(p,pp,nitems*size); /* Since `size' does not change, we can write a while loop for each case, and avoid testing `size' for each time. */ switch (size) { @@ -977,6 +981,18 @@ static void swap_items(char *p, int nitems, int size) } break; + case 12: + while (nitems--) { + SWAP(p[0], p[11]); + SWAP(p[1], p[10]); + SWAP(p[2], p[9]); + SWAP(p[3], p[8]); + SWAP(p[4], p[7]); + SWAP(p[5], p[6]); + p += size; + } + break; + case 8: while (nitems--) { SWAP(p[0], p[7]); @@ -1009,10 +1025,12 @@ static void swap_items(char *p, int nitems, int size) default: FATAL1("Can't swap a %d-byte item for (un)dumping", size); } + xfree(q); } #endif /* not WORDS_BIGENDIAN and not NO_DUMP_SHARE */ +#if 0 /* Here we write NITEMS items, each item being ITEM_SIZE bytes long. The pointer to the stuff to write is P, and we write to the file OUT_FILE. */ @@ -1036,10 +1054,12 @@ void do_dump(char *p, int item_size, int nitems, FILE * out_file) swap_items(p, nitems, item_size); #endif } +#endif -/* Here is the dual of the writing routine. */ +/* Here is the dual of the writing routine. */ +#if 0 void do_undump(char *p, int item_size, int nitems, FILE * in_file) { if (fread(p, (size_t) item_size, (size_t) nitems, in_file) != @@ -1050,6 +1070,7 @@ void do_undump(char *p, int item_size, int nitems, FILE * in_file) swap_items(p, nitems, item_size); #endif } +#endif /* Get the job name to be used, which may have been set from the diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index 0a3d66ca9d5..9325bee7d82 100644 --- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 3588 +#define luatex_svn_revision 3612 diff --git a/Build/source/texk/web2c/luatexdir/ocp/ocp.w b/Build/source/texk/web2c/luatexdir/ocp/ocp.w index 60afca0f4c6..d7aed8e1116 100644 --- a/Build/source/texk/web2c/luatexdir/ocp/ocp.w +++ b/Build/source/texk/web2c/luatexdir/ocp/ocp.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: ocp.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/ocp/ocp.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/ocp/ocp.w $"; @ @c int **ocp_tables; diff --git a/Build/source/texk/web2c/luatexdir/ocp/ocplist.w b/Build/source/texk/web2c/luatexdir/ocp/ocplist.w index 533678fd699..2a03d636664 100644 --- a/Build/source/texk/web2c/luatexdir/ocp/ocplist.w +++ b/Build/source/texk/web2c/luatexdir/ocp/ocplist.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: ocplist.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/ocp/ocplist.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/ocp/ocplist.w $"; @ @c memory_word *ocp_list_info; /* the big collection of ocp list data */ diff --git a/Build/source/texk/web2c/luatexdir/ocp/readocp.w b/Build/source/texk/web2c/luatexdir/ocp/readocp.w index 7beee600347..ee49729756b 100644 --- a/Build/source/texk/web2c/luatexdir/ocp/readocp.w +++ b/Build/source/texk/web2c/luatexdir/ocp/readocp.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: readocp.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/ocp/readocp.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/ocp/readocp.w $"; @ @c static char *b_test_in(char *nam) diff --git a/Build/source/texk/web2c/luatexdir/ocp/runocp.w b/Build/source/texk/web2c/luatexdir/ocp/runocp.w index 51d28c6ebc8..31c54a0573b 100644 --- a/Build/source/texk/web2c/luatexdir/ocp/runocp.w +++ b/Build/source/texk/web2c/luatexdir/ocp/runocp.w @@ -22,8 +22,8 @@ static const char _svn_version[] = - "$Id: runocp.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/ocp/runocp.w $"; + "$Id: runocp.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/ocp/runocp.w $"; memory_word active_info[(active_mem_size + 1)]; active_index active_min_ptr = 0; /* first unused word of |active_info| */ @@ -182,12 +182,12 @@ int otp_ext_i; @ @c -void overflow_ocp_buf_size(void) +static void overflow_ocp_buf_size(void) { overflow("ocp_buf_size", (unsigned) ocp_buf_size); } -void overflow_ocp_stack_size(void) +static void overflow_ocp_stack_size(void) { overflow("ocp_stack_size", (unsigned) ocp_stack_size); } @@ -567,7 +567,7 @@ void run_otp(void) @ @c #define FPUTC(a,b) fputc((int)(a),b) -void run_external_ocp(char *external_ocp_name) +static void run_external_ocp(char *external_ocp_name) { char *in_file_name; char *out_file_name; diff --git a/Build/source/texk/web2c/luatexdir/pdf/pagetree.w b/Build/source/texk/web2c/luatexdir/pdf/pagetree.w index 0a24b56ec97..8063d6a103b 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pagetree.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pagetree.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: pagetree.w 3573 2010-04-02 14:10:54Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pagetree.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pagetree.w $"; @* Page diversions. diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfaction.w b/Build/source/texk/web2c/luatexdir/pdf/pdfaction.w index b6d06ebea9b..46992866f21 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfaction.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfaction.w @@ -21,12 +21,12 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: pdfaction.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfaction.w $"; + "$Id: pdfaction.w 3612 2010-04-13 09:29:42Z taco $" + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfaction.w $"; @ @c -halfword new_action_node(void) +static halfword new_action_node(void) { return new_node(action_node, 0); } diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfannot.w b/Build/source/texk/web2c/luatexdir/pdf/pdfannot.w index 25830556762..a33de9e1905 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfannot.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfannot.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfannot.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfannot.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfannot.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w b/Build/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w index 1e472c7f713..4d31e99e76a 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w @@ -21,8 +21,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: pdfcolorstack.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w $"; + "$Id: pdfcolorstack.w 3612 2010-04-13 09:29:42Z taco $" + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w $"; @* Color Stack and Matrix Transformation Support. @@ -81,7 +81,7 @@ static int colstacks_used = 0; @c #define init_colorstacks() if (colstacks_size == 0) colstacks_first_init(); -void colstacks_first_init(void) +static void colstacks_first_init(void) { colstacks_size = STACK_INCREMENT; colstacks = xtalloc((unsigned) colstacks_size, colstack_type); @@ -172,7 +172,7 @@ static void put_cstring_on_str_pool(char *str) } @ @c -int colorstackset(int colstack_no, str_number s) +static int colorstackset(int colstack_no, str_number s) { colstack_type *colstack = get_colstack(colstack_no); diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfdest.w b/Build/source/texk/web2c/luatexdir/pdf/pdfdest.w index 2f53f77dca5..f97ea95e2ac 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfdest.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfdest.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfdest.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfdest.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfdest.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdffont.w b/Build/source/texk/web2c/luatexdir/pdf/pdffont.w index 77b817bb61a..14693850c0b 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdffont.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdffont.w @@ -22,7 +22,7 @@ @ @c static const char _svn_version[] = "$Id: pdffont.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdffont.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdffont.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w index cbb7ccf8b89..d10ff01d99b 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: pdfgen.w 3573 2010-04-02 14:10:54Z hhenkel $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfgen.w $"; + "$Id: pdfgen.w 3612 2010-04-13 09:29:42Z taco $" + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfgen.w $"; #include "ptexlib.h" @@ -2110,7 +2110,7 @@ static boolean substr_of_str(const char *s, const char *t) return true; } -void pdf_print_info(PDF pdf, int luatex_version, str_number luatex_revision) +static void pdf_print_info(PDF pdf, int luatex_version, str_number luatex_revision) { /* print info object */ boolean creator_given, producer_given, creationdate_given, moddate_given, trapped_given; @@ -2165,7 +2165,7 @@ void pdf_print_info(PDF pdf, int luatex_version, str_number luatex_revision) pdf_end_dict(pdf); } -void build_free_object_list(PDF pdf) +static void build_free_object_list(PDF pdf) { int k, l; l = 0; diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfglyph.w b/Build/source/texk/web2c/luatexdir/pdf/pdfglyph.w index ba4911a3698..ea2077f68b6 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfglyph.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfglyph.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfglyph.w 3584 2010-04-02 17:45:55Z hhenkel $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfglyph.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfglyph.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w b/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w index be343b37676..5fbdc037912 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfimage.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfimage.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfimage.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdflink.w b/Build/source/texk/web2c/luatexdir/pdf/pdflink.w index 66b369d12bd..517f0079a01 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdflink.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdflink.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdflink.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdflink.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdflink.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w b/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w index 2698c47fa32..374ee173721 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w @@ -22,7 +22,7 @@ @ @c static const char _svn_version[] = "$Id: pdflistout.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdflistout.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdflistout.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfliteral.w b/Build/source/texk/web2c/luatexdir/pdf/pdfliteral.w index fbbd9b9cb37..36b90dfca1f 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfliteral.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfliteral.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: pdfliteral.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfliteral.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfliteral.w $"; @ @c void pdf_special(PDF pdf, halfword p) diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfobj.w b/Build/source/texk/web2c/luatexdir/pdf/pdfobj.w index ab3d1314024..8ad6319274f 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfobj.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfobj.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfobj.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfobj.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfobj.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfoutline.w b/Build/source/texk/web2c/luatexdir/pdf/pdfoutline.w index 90c9675ac5b..7efaa479bf6 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfoutline.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfoutline.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: pdfoutline.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfoutline.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfoutline.w $"; @ Data structure of outlines; it's not able to write out outline entries before all outline entries are defined, so memory allocated for outline diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w index 6b810a5cef6..c6cb80c19c6 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfpage.w 3571 2010-04-02 13:50:45Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfpage.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfpage.w $"; #include <stdlib.h> #include <stdio.h> diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfrule.w b/Build/source/texk/web2c/luatexdir/pdf/pdfrule.w index fc13da2c32e..80385154163 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfrule.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfrule.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfrule.w 3584 2010-04-02 17:45:55Z hhenkel $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfrule.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfrule.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w b/Build/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w index c953b8242a5..3f44429c059 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfsaverestore.w 3571 2010-04-02 13:50:45Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w b/Build/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w index 765ac0fb1e2..c597c51ee5d 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: pdfsetmatrix.w 3571 2010-04-02 13:50:45Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w $"; + "$Id: pdfsetmatrix.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w $"; #include "ptexlib.h" @@ -37,7 +37,7 @@ boolean matrixused(void) return matrix_stack_used > 0; } -void matrix_stack_room(void) +static void matrix_stack_room(void) { matrix_entry *new_stack; @@ -169,7 +169,7 @@ static int last_ury; #define DO_MIN(a, b) ((a < b) ? a : b) #define DO_MAX(a, b) ((a > b) ? a : b) -void do_matrixtransform(scaled x, scaled y, scaled * retx, scaled * rety) +static void do_matrixtransform(scaled x, scaled y, scaled * retx, scaled * rety) { matrix_entry *m = &matrix_stack[matrix_stack_used - 1]; double x_old = x; diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w b/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w index 70809ef1b0f..cb0a36ae256 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfshipout.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfshipout.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfshipout.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdftables.w b/Build/source/texk/web2c/luatexdir/pdf/pdftables.w index ef4787fb3b6..5db049c758e 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdftables.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdftables.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdftables.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdftables.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdftables.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfthread.w b/Build/source/texk/web2c/luatexdir/pdf/pdfthread.w index e788a3cdf4f..f5baf228d25 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfthread.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfthread.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfthread.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfthread.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfthread.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfxform.w b/Build/source/texk/web2c/luatexdir/pdf/pdfxform.w index 5f3b5802708..ab62fc465a1 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfxform.w +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfxform.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: pdfxform.w 3571 2010-04-02 13:50:45Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/pdf/pdfxform.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfxform.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/tex/align.w b/Build/source/texk/web2c/luatexdir/tex/align.w index fd2d46b8f38..8e21f7ed86a 100644 --- a/Build/source/texk/web2c/luatexdir/tex/align.w +++ b/Build/source/texk/web2c/luatexdir/tex/align.w @@ -23,8 +23,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: align.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/align.w $"; + "$Id: align.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/align.w $"; @ @c void fin_align(void); @@ -223,7 +223,7 @@ pointer cur_pre_head = null, cur_pre_tail = null; /* pre-adjustment list p called |push_alignment| and |pop_alignment|. @c -void push_alignment(void) +static void push_alignment(void) { pointer p; /* the new alignment stack node */ p = new_node(align_stack_node, 0); @@ -241,7 +241,7 @@ void push_alignment(void) cur_head = new_node(temp_node, 0); } -void pop_alignment(void) +static void pop_alignment(void) { pointer p; /* the top alignment stack node */ flush_node(cur_head); @@ -282,7 +282,7 @@ token survives in the preamble and the `\.{\\tabskip}' defines new tabskip glue (locally). @c -void get_preamble_token(void) +static void get_preamble_token(void) { RESTART: get_token(); @@ -488,7 +488,7 @@ next column or group of columns will begin. A new semantic level is entered, so that the columns will generate a list for subsequent packaging. @c -void init_span(pointer p) +static void init_span(pointer p) { push_nest(); if (cur_list.mode_field == -hmode) { diff --git a/Build/source/texk/web2c/luatexdir/tex/arithmetic.w b/Build/source/texk/web2c/luatexdir/tex/arithmetic.w index eec0b309b7e..76ccbbf419e 100644 --- a/Build/source/texk/web2c/luatexdir/tex/arithmetic.w +++ b/Build/source/texk/web2c/luatexdir/tex/arithmetic.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: arithmetic.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/arithmetic.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/arithmetic.w $"; @ The principal computations performed by \TeX\ are done entirely in terms of diff --git a/Build/source/texk/web2c/luatexdir/tex/buildpage.w b/Build/source/texk/web2c/luatexdir/tex/buildpage.w index de39703c8ae..2c2c8460464 100644 --- a/Build/source/texk/web2c/luatexdir/tex/buildpage.w +++ b/Build/source/texk/web2c/luatexdir/tex/buildpage.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: buildpage.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/buildpage.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/buildpage.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/tex/commands.w b/Build/source/texk/web2c/luatexdir/tex/commands.w index 343c04fe6b8..83e81602840 100644 --- a/Build/source/texk/web2c/luatexdir/tex/commands.w +++ b/Build/source/texk/web2c/luatexdir/tex/commands.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: commands.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/commands.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/commands.w $"; @ The symbolic names for glue parameters are put into \TeX's hash table by using the routine called |primitive|, defined below. Let us enter them diff --git a/Build/source/texk/web2c/luatexdir/tex/conditional.w b/Build/source/texk/web2c/luatexdir/tex/conditional.w index dd9349ab5ef..a0df81779d7 100644 --- a/Build/source/texk/web2c/luatexdir/tex/conditional.w +++ b/Build/source/texk/web2c/luatexdir/tex/conditional.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: conditional.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/conditional.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/conditional.w $"; @ @c #define box(A) eqtb[box_base+(A)].hh.rh diff --git a/Build/source/texk/web2c/luatexdir/tex/directions.w b/Build/source/texk/web2c/luatexdir/tex/directions.w index 4f896b60dbe..d89c407c7a9 100644 --- a/Build/source/texk/web2c/luatexdir/tex/directions.w +++ b/Build/source/texk/web2c/luatexdir/tex/directions.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: directions.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/directions.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/directions.w $"; @ @c void scan_direction(void) diff --git a/Build/source/texk/web2c/luatexdir/tex/dumpdata.h b/Build/source/texk/web2c/luatexdir/tex/dumpdata.h index 810424b6a40..44f7fabe96d 100644 --- a/Build/source/texk/web2c/luatexdir/tex/dumpdata.h +++ b/Build/source/texk/web2c/luatexdir/tex/dumpdata.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ -/* $Id: dumpdata.h 3388 2010-01-26 10:59:04Z taco $ */ +/* $Id: dumpdata.h 3612 2010-04-13 09:29:42Z taco $ */ #ifndef DUMPDATA_H # define DUMPDATA_H @@ -38,6 +38,10 @@ extern boolean load_fmt_file(const char *); extern void do_zdump(char *, int, int, FILE *); extern void do_zundump(char *, int, int, FILE *); +#if !defined (WORDS_BIGENDIAN) && !defined (NO_DUMP_SHARE) /* this fn */ +extern void swap_items(char *p, int nitems, int size); /* in luatex.c */ +#endif + /* Like do_undump, but check each value against LOW and HIGH. The slowdown isn't significant, and this improves the chances of detecting incompatible format files. In fact, Knuth himself noted diff --git a/Build/source/texk/web2c/luatexdir/tex/dumpdata.w b/Build/source/texk/web2c/luatexdir/tex/dumpdata.w index 8b36e504182..975fbb24c5f 100644 --- a/Build/source/texk/web2c/luatexdir/tex/dumpdata.w +++ b/Build/source/texk/web2c/luatexdir/tex/dumpdata.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: dumpdata.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/dumpdata.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/dumpdata.w $"; #define font_id_text(A) cs_text(font_id_base+(A)) #define prev_depth cur_list.prev_depth_field diff --git a/Build/source/texk/web2c/luatexdir/tex/equivalents.w b/Build/source/texk/web2c/luatexdir/tex/equivalents.w index 02fa1f48578..a7a425376c4 100644 --- a/Build/source/texk/web2c/luatexdir/tex/equivalents.w +++ b/Build/source/texk/web2c/luatexdir/tex/equivalents.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: equivalents.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/equivalents.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/equivalents.w $"; @ @c #define par_shape_ptr equiv(par_shape_loc) diff --git a/Build/source/texk/web2c/luatexdir/tex/errors.w b/Build/source/texk/web2c/luatexdir/tex/errors.w index 5565605e6a2..1a6ec9a46e0 100644 --- a/Build/source/texk/web2c/luatexdir/tex/errors.w +++ b/Build/source/texk/web2c/luatexdir/tex/errors.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: errors.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/errors.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/errors.w $"; @ @c #define new_line_char int_par(new_line_char_code) diff --git a/Build/source/texk/web2c/luatexdir/tex/expand.w b/Build/source/texk/web2c/luatexdir/tex/expand.w index 79072f7021e..4f92a2fdd95 100644 --- a/Build/source/texk/web2c/luatexdir/tex/expand.w +++ b/Build/source/texk/web2c/luatexdir/tex/expand.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: expand.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/expand.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/expand.w $"; @ Only a dozen or so command codes |>max_command| can possibly be returned by diff --git a/Build/source/texk/web2c/luatexdir/tex/extensions.w b/Build/source/texk/web2c/luatexdir/tex/extensions.w index b8b89512ba2..62c9e65fa8a 100644 --- a/Build/source/texk/web2c/luatexdir/tex/extensions.w +++ b/Build/source/texk/web2c/luatexdir/tex/extensions.w @@ -23,7 +23,7 @@ @ @c static const char _svn_version[] = "$Id: extensions.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/extensions.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/extensions.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/tex/filename.w b/Build/source/texk/web2c/luatexdir/tex/filename.w index 239127c5852..4757bfc19cd 100644 --- a/Build/source/texk/web2c/luatexdir/tex/filename.w +++ b/Build/source/texk/web2c/luatexdir/tex/filename.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: filename.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/filename.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/filename.w $"; @ In order to isolate the system-dependent aspects of file names, the diff --git a/Build/source/texk/web2c/luatexdir/tex/inputstack.w b/Build/source/texk/web2c/luatexdir/tex/inputstack.w index ecb620fb185..3e1c33bd9b8 100644 --- a/Build/source/texk/web2c/luatexdir/tex/inputstack.w +++ b/Build/source/texk/web2c/luatexdir/tex/inputstack.w @@ -21,8 +21,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: inputstack.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/inputstack.w $"; + "$Id: inputstack.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/inputstack.w $"; @ @c #define end_line_char int_par(end_line_char_code) @@ -129,7 +129,7 @@ at most |error_line|. Non-current input levels whose |token_type| is `|backed_up|' are shown only if they have not been fully read. @c -void print_token_list_type(int t) +static void print_token_list_type(int t) { switch (t) { case parameter: diff --git a/Build/source/texk/web2c/luatexdir/tex/linebreak.w b/Build/source/texk/web2c/luatexdir/tex/linebreak.w index 7c285f94430..f5b958eb9bd 100644 --- a/Build/source/texk/web2c/luatexdir/tex/linebreak.w +++ b/Build/source/texk/web2c/luatexdir/tex/linebreak.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: linebreak.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/linebreak.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/linebreak.w $"; @ We come now to what is probably the most interesting algorithm of \TeX: the mechanism for choosing the ``best possible'' breakpoints that yield diff --git a/Build/source/texk/web2c/luatexdir/tex/mainbody.h b/Build/source/texk/web2c/luatexdir/tex/mainbody.h index 0b108ad896f..93794932cc9 100644 --- a/Build/source/texk/web2c/luatexdir/tex/mainbody.h +++ b/Build/source/texk/web2c/luatexdir/tex/mainbody.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ -/* $Id: mainbody.h 3436 2010-02-21 15:34:00Z taco $ */ +/* $Id: mainbody.h 3612 2010-04-13 09:29:42Z taco $ */ #ifndef MAINBODY_H # define MAINBODY_H @@ -244,6 +244,8 @@ extern void close_files_and_terminate(void); extern void final_cleanup(void); extern void debug_help(void); /* routine to display various things */ +extern int main_initialize(void); + /* lazy me */ # define get_cur_font() equiv(cur_font_loc) # define zset_cur_font set_cur_font diff --git a/Build/source/texk/web2c/luatexdir/tex/mainbody.w b/Build/source/texk/web2c/luatexdir/tex/mainbody.w index abdf1af920b..fea85fa31be 100644 --- a/Build/source/texk/web2c/luatexdir/tex/mainbody.w +++ b/Build/source/texk/web2c/luatexdir/tex/mainbody.w @@ -26,7 +26,7 @@ static const char _svn_version[] = "$Id: mainbody.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/mainbody.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/mainbody.w $"; @ pdfTeX is copyright (C) 1996-2006 Han The Thanh, <thanh@@pdftex.org>. diff --git a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w index 4e49ea88578..f4b3ddddcaa 100644 --- a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w +++ b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w @@ -20,7 +20,7 @@ @ @c static const char _svn_version[] = "$Id: maincontrol.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/maincontrol.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/maincontrol.w $"; #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/tex/mathcodes.w b/Build/source/texk/web2c/luatexdir/tex/mathcodes.w index ef5772b6b33..0850cbe2776 100644 --- a/Build/source/texk/web2c/luatexdir/tex/mathcodes.w +++ b/Build/source/texk/web2c/luatexdir/tex/mathcodes.w @@ -21,8 +21,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: mathcodes.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/mathcodes.w $"; + "$Id: mathcodes.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/mathcodes.w $"; @ math codes @c @@ -104,7 +104,7 @@ void show_mathcode_value(mathcodeval c) } @ @c -void show_mathcode(int n) +static void show_mathcode(int n) { mathcodeval c = get_math_code(n); if (c.origin_value == aleph_mathcode) { @@ -122,7 +122,7 @@ void show_mathcode(int n) } @ @c -void unsavemathcode(quarterword gl) +static void unsavemathcode(quarterword gl) { sa_stack_item st; if (mathcode_head->stack == NULL) @@ -217,14 +217,14 @@ int get_math_code_num(int n) } @ @c -void initializemathcode(void) +static void initializemathcode(void) { mathcode_head = new_sa_tree(MATHCODESTACK, MATHCODEDEFAULT); mathcode_heap = Mxmalloc_array(mathcodeval, MATHCODEHEAP); } @ @c -void dumpmathcode(void) +static void dumpmathcode(void) { int k; mathcodeval d; @@ -240,7 +240,7 @@ void dumpmathcode(void) } } -void undumpmathcode(void) +static void undumpmathcode(void) { int k, x; mathcodeval d; @@ -269,7 +269,7 @@ void undumpmathcode(void) } @ @c -void show_delcode(int n) +static void show_delcode(int n) { delcodeval c; c = get_del_code(n); @@ -317,7 +317,7 @@ void show_delcode(int n) @ TODO: clean up the heap @c -void unsavedelcode(quarterword gl) +static void unsavedelcode(quarterword gl) { sa_stack_item st; if (delcode_head->stack == NULL) @@ -418,14 +418,14 @@ int get_del_code_num(int n) } @ @c -void initializedelcode(void) +static void initializedelcode(void) { delcode_head = new_sa_tree(DELCODESTACK, DELCODEDEFAULT); delcode_heap = Mxmalloc_array(delcodeval, DELCODEHEAP); } @ @c -void dumpdelcode(void) +static void dumpdelcode(void) { int k; delcodeval d; @@ -443,7 +443,7 @@ void dumpdelcode(void) } } -void undumpdelcode(void) +static void undumpdelcode(void) { int k; delcodeval d; diff --git a/Build/source/texk/web2c/luatexdir/tex/memoryword.w b/Build/source/texk/web2c/luatexdir/tex/memoryword.w index a1ede056dc5..5c86ea12e6b 100644 --- a/Build/source/texk/web2c/luatexdir/tex/memoryword.w +++ b/Build/source/texk/web2c/luatexdir/tex/memoryword.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: memoryword.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/memoryword.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/memoryword.w $"; @ When debugging, we may want to print a |memory_word| without knowing diff --git a/Build/source/texk/web2c/luatexdir/tex/mlist.w b/Build/source/texk/web2c/luatexdir/tex/mlist.w index 0b9e80802b1..c41c17392ea 100644 --- a/Build/source/texk/web2c/luatexdir/tex/mlist.w +++ b/Build/source/texk/web2c/luatexdir/tex/mlist.w @@ -25,8 +25,8 @@ #include "lua/luatex-api.h" static const char _svn_version[] = - "$Id: mlist.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/mlist.w $"; + "$Id: mlist.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/mlist.w $"; @ @c #define delimiter_factor int_par(delimiter_factor_code) @@ -831,7 +831,7 @@ void fixup_math_parameters(int fam_id, int size_id, int f, int lvl) backward compatibility with \.{\\scriptspace}. @c -void finalize_math_parameters(void) +static void finalize_math_parameters(void) { int saved_trace = int_par(tracing_assigns_code); int_par(tracing_assigns_code) = 0; @@ -869,7 +869,7 @@ for each combination of family and size. (Be alert: Size codes get larger as the type gets smaller.) @c -const char *math_size_string(int s) +static const char *math_size_string(int s) { if (s == text_size) return "textfont"; @@ -896,7 +896,7 @@ information: @ a simple routine that creates a flat copy of a nucleus @c -pointer math_clone(pointer q) +static pointer math_clone(pointer q) { pointer x; if (q == null) @@ -920,7 +920,7 @@ pointer math_clone(pointer q) that eventually contains it. @c -pointer do_fraction_rule(scaled t, pointer att) +static pointer do_fraction_rule(scaled t, pointer att) { pointer p; /* the new node */ p = new_rule(); @@ -937,7 +937,7 @@ pointer do_fraction_rule(scaled t, pointer att) fraction rule of thickness |t| under additional space of height |ht|. @c -pointer overbar(pointer b, scaled k, scaled t, scaled ht, pointer att) +static pointer overbar(pointer b, scaled k, scaled t, scaled ht, pointer att) { pointer p, q; /* nodes being constructed */ p = new_kern(k); @@ -978,7 +978,7 @@ static pointer char_box(internal_font_number f, int c, pointer bb) a given character: @c -scaled height_plus_depth(internal_font_number f, int c) +static scaled height_plus_depth(internal_font_number f, int c) { return (char_height(f, c) + char_depth(f, c)); } @@ -989,7 +989,7 @@ scaled height_plus_depth(internal_font_number f, int c) of the characters already in box |b|: @c -scaled stack_into_box(pointer b, internal_font_number f, int c) +static scaled stack_into_box(pointer b, internal_font_number f, int c) { pointer p; /* new node placed into |b| */ p = char_box(f, c, node_attr(b)); @@ -1000,7 +1000,7 @@ scaled stack_into_box(pointer b, internal_font_number f, int c) } -scaled stack_into_hbox(pointer b, internal_font_number f, int c) +static scaled stack_into_hbox(pointer b, internal_font_number f, int c) { pointer p, q; /* new node placed into |b| */ p = char_box(f, c, node_attr(b)); @@ -1021,7 +1021,7 @@ scaled stack_into_hbox(pointer b, internal_font_number f, int c) @ @c -void add_delim_kern(pointer b, scaled s) +static void add_delim_kern(pointer b, scaled s) { pointer p; /* new node placed into |b| */ p = new_kern(s); @@ -1030,7 +1030,7 @@ void add_delim_kern(pointer b, scaled s) list_ptr(b) = p; } -void add_delim_hkern(pointer b, scaled s) +static void add_delim_hkern(pointer b, scaled s) { pointer p, q; /* new node placed into |b| */ p = new_kern(s); diff --git a/Build/source/texk/web2c/luatexdir/tex/nesting.w b/Build/source/texk/web2c/luatexdir/tex/nesting.w index 28ae086d461..332058a9451 100644 --- a/Build/source/texk/web2c/luatexdir/tex/nesting.w +++ b/Build/source/texk/web2c/luatexdir/tex/nesting.w @@ -21,8 +21,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: nesting.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/nesting.w $"; + "$Id: nesting.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/nesting.w $"; @ these are for |show_activities| @@ -66,7 +66,7 @@ do by computing the value |abs(mode)+cur_cmd|, where |mode| is the current mode and |cur_cmd| is the current command code. @c -const char *string_mode(int m) +static const char *string_mode(int m) { /* prints the mode represented by |m| */ if (m > 0) { switch (m / (max_command_cmd + 1)) { diff --git a/Build/source/texk/web2c/luatexdir/tex/packaging.w b/Build/source/texk/web2c/luatexdir/tex/packaging.w index 16c030a5944..6813d61e85f 100644 --- a/Build/source/texk/web2c/luatexdir/tex/packaging.w +++ b/Build/source/texk/web2c/luatexdir/tex/packaging.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: packaging.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/packaging.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/packaging.w $"; @ @c #define scan_normal_dimen() scan_dimen(false,false,false) diff --git a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w index 908224f0b47..e9a80961457 100644 --- a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w +++ b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: postlinebreak.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/postlinebreak.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/postlinebreak.w $"; @ So far we have gotten a little way into the |line_break| routine, having covered its important |try_break| subroutine. Now let's consider the diff --git a/Build/source/texk/web2c/luatexdir/tex/primitive.w b/Build/source/texk/web2c/luatexdir/tex/primitive.w index 89db63fbeaa..e40090dada0 100644 --- a/Build/source/texk/web2c/luatexdir/tex/primitive.w +++ b/Build/source/texk/web2c/luatexdir/tex/primitive.w @@ -22,8 +22,8 @@ static const char _svn_version[] = - "$Id: primitive.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/primitive.w $"; + "$Id: primitive.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/primitive.w $"; @ Control sequences are stored and retrieved by means of a fairly standard hash @@ -301,7 +301,7 @@ void primitive_def(const char *s, size_t l, quarterword c, halfword o) needed, but it helps catch errors of this kind. @c -void +static void store_primitive_name(str_number s, quarterword c, halfword o, halfword offset) { int idx; @@ -485,7 +485,7 @@ pointer string_lookup(const char *s, size_t l) @c #define chr_cmd(A) do { tprint(A); print(chr_code); } while (0) -void prim_cmd_chr(quarterword cmd, halfword chr_code) +static void prim_cmd_chr(quarterword cmd, halfword chr_code) { int idx = chr_code - prim_data[cmd].offset; if (cmd <= last_cmd && diff --git a/Build/source/texk/web2c/luatexdir/tex/printing.w b/Build/source/texk/web2c/luatexdir/tex/printing.w index cb4199841e8..fee354eebec 100644 --- a/Build/source/texk/web2c/luatexdir/tex/printing.w +++ b/Build/source/texk/web2c/luatexdir/tex/printing.w @@ -23,7 +23,7 @@ static const char _svn_version[] = "$Id: printing.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/printing.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/printing.w $"; @ @c #define font_id_text(A) cs_text(font_id_base+(A)) diff --git a/Build/source/texk/web2c/luatexdir/tex/scanning.w b/Build/source/texk/web2c/luatexdir/tex/scanning.w index 43466f400d8..a968dae4a4b 100644 --- a/Build/source/texk/web2c/luatexdir/tex/scanning.w +++ b/Build/source/texk/web2c/luatexdir/tex/scanning.w @@ -21,8 +21,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: scanning.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/scanning.w $"; + "$Id: scanning.w 3596 2010-04-05 10:12:46Z taco $" + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/scanning.w $"; @ @c @@ -1788,7 +1788,7 @@ void set_font_dimen(void) font_param_error(f); } else { if (n > font_params(f)) { - if (font_touched(f)) { + if (font_used(f)) { font_param_error(f); } else { /* Increase the number of parameters in the font */ @@ -1817,7 +1817,7 @@ void get_font_dimen(void) goto EXIT; } else { if (n > font_params(f)) { - if (font_touched(f)) { + if (font_used(f)) { font_param_error(f); goto EXIT; } else { diff --git a/Build/source/texk/web2c/luatexdir/tex/stringpool.w b/Build/source/texk/web2c/luatexdir/tex/stringpool.w index dbea33554ac..d41276c819d 100644 --- a/Build/source/texk/web2c/luatexdir/tex/stringpool.w +++ b/Build/source/texk/web2c/luatexdir/tex/stringpool.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: stringpool.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/stringpool.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/stringpool.w $"; @ Control sequence names and diagnostic messages are variable-length strings of eight-bit characters. Since PASCAL did not have a well-developed string diff --git a/Build/source/texk/web2c/luatexdir/tex/texdeffont.w b/Build/source/texk/web2c/luatexdir/tex/texdeffont.w index ecb4f9fe29f..993280def9c 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texdeffont.w +++ b/Build/source/texk/web2c/luatexdir/tex/texdeffont.w @@ -21,7 +21,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: texdeffont.w 3587 2010-04-03 14:32:25Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texdeffont.w $"; + "$Id: texdeffont.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texdeffont.w $"; @@ -40,7 +40,7 @@ void set_cur_font(internal_font_number f) } @ @c -char *scaled_to_string(scaled s) +static char *scaled_to_string(scaled s) { /* prints scaled real, rounded to five digits */ static char result[16]; int n, k; diff --git a/Build/source/texk/web2c/luatexdir/tex/texfileio.w b/Build/source/texk/web2c/luatexdir/tex/texfileio.w index c577dbad17a..f19f7873339 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texfileio.w +++ b/Build/source/texk/web2c/luatexdir/tex/texfileio.w @@ -23,8 +23,8 @@ #include <kpathsea/absolute.h> static const char _svn_version[] = - "$Id: texfileio.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texfileio.w $"; + "$Id: texfileio.w 3612 2010-04-13 09:29:42Z taco $" + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texfileio.w $"; @ @c #define end_line_char int_par(end_line_char_code) @@ -920,6 +920,9 @@ void do_zdump(char *p, int item_size, int nitems, FILE * out_file) (void) out_file; if (nitems == 0) return; +#if !defined (WORDS_BIGENDIAN) && !defined (NO_DUMP_SHARE) + swap_items(p, nitems, item_size); +#endif if (gzwrite(gz_fmtfile, (void *) p, (unsigned) (item_size * nitems)) != item_size * nitems) { fprintf(stderr, "! Could not write %d %d-byte item(s): %s.\n", nitems, @@ -940,6 +943,9 @@ void do_zundump(char *p, int item_size, int nitems, FILE * in_file) nitems, item_size, gzerror(gz_fmtfile, &err)); uexit(1); } +#if !defined (WORDS_BIGENDIAN) && !defined (NO_DUMP_SHARE) + swap_items(p, nitems, item_size); +#endif } @ @c diff --git a/Build/source/texk/web2c/luatexdir/tex/texmath.w b/Build/source/texk/web2c/luatexdir/tex/texmath.w index 2e76aec61dc..f435ddb312f 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texmath.w +++ b/Build/source/texk/web2c/luatexdir/tex/texmath.w @@ -21,8 +21,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: texmath.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texmath.w $"; + "$Id: texmath.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texmath.w $"; @ @c #define mode cur_list.mode_field @@ -143,7 +143,7 @@ and `\.{\$P\$}' produce different results (the former will not have the will be added). @c -void unsave_math(void) +static void unsave_math(void) { unsave(); decr(save_ptr); @@ -200,7 +200,7 @@ void def_fam_fnt(int fam_id, int size_id, int f, int lvl) } @ @c -void unsave_math_fam_data(int gl) +static void unsave_math_fam_data(int gl) { sa_stack_item st; if (math_fam_head->stack == NULL) @@ -266,7 +266,7 @@ scaled get_math_param(int param_id, int style_id) @ @c -void unsave_math_param_data(int gl) +static void unsave_math_param_data(int gl) { sa_stack_item st; if (math_param_head->stack == NULL) @@ -503,7 +503,7 @@ has special subfields |display_mlist|, |text_mlist|, |script_mlist|, and |script_script_mlist| pointing to the mlists for each style. @c -pointer new_choice(void) +static pointer new_choice(void) { /* create a choice node */ return new_node(choice_node, 0); /* the |subtype| is not used */ } @@ -571,7 +571,7 @@ void show_math_node(pointer p) @ Here are some simple routines used in the display of noads. @c -void print_fam_and_char(pointer p) +static void print_fam_and_char(pointer p) { /* prints family and character */ tprint_esc("fam"); print_int(math_fam(p)); @@ -580,7 +580,7 @@ void print_fam_and_char(pointer p) } @ @c -void print_delimiter(pointer p) +static void print_delimiter(pointer p) { int a; if (small_fam(p) < 0) { @@ -614,7 +614,7 @@ distinguished from a missing field, because these are not equivalent @^recursion@> @c -void print_subsidiary_data(pointer p, ASCII_code c) +static void print_subsidiary_data(pointer p, ASCII_code c) { /* display a noad field */ if ((int) cur_length >= depth_threshold) { if (p != null) @@ -786,7 +786,7 @@ Here is a little routine that needs to be done whenever a subformula is about to be processed. The parameter is a code like |math_group|. @c -void new_save_level_math(group_code c) +static void new_save_level_math(group_code c) { set_saved_record(0, saved_textdir, 0, text_dir_ptr); text_dir_ptr = new_dir(math_direction); @@ -798,7 +798,7 @@ void new_save_level_math(group_code c) } @ @c -void push_math(group_code c, int mstyle) +static void push_math(group_code c, int mstyle) { if (math_direction != text_direction) dir_math_save = true; @@ -810,7 +810,7 @@ void push_math(group_code c, int mstyle) } @ @c -void enter_ordinary_math(void) +static void enter_ordinary_math(void) { push_math(math_shift_group, text_style); eq_word_define(int_base + cur_fam_code, -1); @@ -889,6 +889,37 @@ void math_left_brace(void) (void) scan_math(nucleus(tail), m_style); } +@ If the inline directions of \.{\\pardir} and \.{\\mathdir} are +opposite, then this function will return true. Discovering that fact +is somewhat odd because it needs traversal of the |save_stack|. +The occurance of displayed equations is weird enough that this is +probably still better than having yet another field in the |input_stack| +structures. + +None of this makes much sense if the inline direction of either one of +\.{\\pardir} or \.{\\mathdir} is vertical, but in that case the current +math machinery is ill suited anyway so I do not bother to test that. + +@c +static boolean math_and_text_reversed_p(void) +{ + int i = save_ptr - 1; + while (save_type(i) != level_boundary) + i--; + while (i < save_ptr) { + if (save_type(i) == restore_old_value && + save_value(i) == int_base + par_direction_code) { + if (textdir_opposite(math_direction, save_value(i - 1))) + return true; + } + i++; + } + return false; +} + + + + @ When we enter display math mode, we need to call |line_break| to process the partial paragraph that has just been interrupted by the @@ -951,6 +982,7 @@ void enter_display_math(void) eq_word_define(dimen_base + pre_display_size_code, w); eq_word_define(dimen_base + display_width_code, l); eq_word_define(dimen_base + display_indent_code, s); + eq_word_define(int_base + pre_display_direction_code, (math_and_text_reversed_p() ? -1 : 0)); if (every_display != null) begin_token_list(every_display, every_display_text); if (nest_ptr == 1) { @@ -968,7 +1000,7 @@ void enter_display_math(void) @c #define fam_in_range ((cur_fam>=0)&&(cur_fam<256)) -delcodeval do_scan_extdef_del_code(int extcode, boolean doclass) +static delcodeval do_scan_extdef_del_code(int extcode, boolean doclass) { const char *hlp[] = { "I'm going to use 0 instead of that illegal code value.", @@ -1399,7 +1431,7 @@ delimiter is to be placed; the second tells if this delimiter follows \.{\\radical} or not. @c -void scan_delimiter(pointer p, int r) +static void scan_delimiter(pointer p, int r) { delcodeval dval = { 0, 0, 0, 0, 0, 0 }; if (r == tex_mathcode) { /* \.{\\radical} */ @@ -1923,7 +1955,7 @@ static void check_inline_math_end(void) } @ @c -void resume_after_display(void) +static void resume_after_display(void) { if (cur_group != math_shift_group) confusion("display"); @@ -1944,36 +1976,6 @@ void resume_after_display(void) } -@ If the inline directions of \.{\\pardir} and \.{\\mathdir} are -opposite, then this function will return true. Discovering that fact -is somewhat odd because it needs traversal of the |save_stack|. -The occurance of displayed equations is weird enough that this is -probably still better than having yet another field in the |input_stack| -structures. - -None of this makes much sense if the inline direction of either one of -\.{\\pardir} or \.{\\mathdir} is vertical, but in that case the current -math machinery is ill suited anyway so I do not bother to test that. - -@c -static boolean math_and_text_reversed_p(void) -{ - int i = save_ptr - 1; - while (save_type(i) != level_boundary) - i--; - while (i < save_ptr) { - if (save_type(i) == restore_old_value && - save_value(i) == int_base + par_direction_code) { - if (textdir_opposite(math_direction, save_value(i - 1))) - return true; - } - i++; - } - return false; -} - - - @ The fussiest part of math mode processing occurs when a displayed formula is being centered and placed with an optional equation number. @@ -2000,7 +2002,9 @@ static void finish_displayed_math(boolean l, pointer a, pointer p) pointer t; /* tail of adjustment list */ pointer pre_t; /* tail of pre-adjustment list */ boolean swap_dir; /* true if the math and surrounding text dirs are opposed */ - swap_dir = math_and_text_reversed_p(); + swap_dir = (int_par(pre_display_direction_code) < 0 ? true : false ); + if (a != null && swap_dir) + l = !l; adjust_tail = adjust_head; pre_adjust_tail = pre_adjust_head; @@ -2058,12 +2062,6 @@ static void finish_displayed_math(boolean l, pointer a, pointer p) d = 0; } - /* If the equation number is set on a line by itself, either before or - after the formula, we append an infinite penalty so that no page break will - separate the display from its number; and we use the same size and - displacement for all three potential lines of the display, even though - `\.{\\parshape}' may specify them differently. - */ tail_append(new_penalty(int_par(pre_display_penalty_code))); if ((d + line_s <= pre_display_size) || l) { /* not enough clearance */ g1 = above_display_skip_code; @@ -2073,13 +2071,15 @@ static void finish_displayed_math(boolean l, pointer a, pointer p) g2 = below_display_short_skip_code; } - if (l && (eqno_w == 0)) { /* \.{\\leqno} on a forced single line due to |width=0| */ + /* If the equation number is set on a line by itself, either before or + after the formula, we append an infinite penalty so that no page break will + separate the display from its number; and we use the same size and + displacement for all three potential lines of the display, even though + `\.{\\parshape}' may specify them differently. + */ + if (a && l && (eqno_w == 0)) { /* \.{\\leqno} on a forced single line due to |width=0| */ /* it follows that |type(a)=hlist_node| */ - if (swap_dir) { - shift_amount(a) = line_w + line_s; - } else { - shift_amount(a) = line_s; - } + shift_amount(a) = line_s; append_to_vlist(a); tail_append(new_penalty(inf_penalty)); } else { @@ -2099,27 +2099,21 @@ static void finish_displayed_math(boolean l, pointer a, pointer p) } eq_box = hpack(eq_box, 0, additional, -1); } - if (swap_dir) { - /* |d = line_w - d;| */ - if (eqno_w != 0) { - if (l) - d = line_w - width(eq_box); - else - d = 0; - } else { - d = line_w - eq_w - eqno_w - d; - } - } - shift_amount(eq_box) = line_s + d; + if (a && math_direction == dir_TRT) + if (l) { + r = new_kern(line_w - width(eq_box)); + vlink(eq_box) = r; + eq_box = hpack(eq_box, 0, additional, -1); + shift_amount(eq_box) = 0; + } else + shift_amount(eq_box) = 0; + else + shift_amount(eq_box) = line_s + d; append_to_vlist(eq_box); if ((a != null) && (eqno_w == 0) && !l) { tail_append(new_penalty(inf_penalty)); - if (!swap_dir) { - shift_amount(a) = line_s + line_w - width(a); - } else { - shift_amount(a) = line_s; - } + shift_amount(a) = line_s; append_to_vlist(a); g2 = 0; } diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.w b/Build/source/texk/web2c/luatexdir/tex/texnodes.w index 45241b0ac29..74ee9c9bc59 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.w +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: texnodes.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texnodes.w $"; + "$Id: texnodes.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texnodes.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -828,7 +828,7 @@ static void do_free_error(halfword p) #endif } -int free_error(halfword p) +static int free_error(halfword p) { assert(p > my_prealloc); assert(p < var_mem_max); @@ -1332,7 +1332,7 @@ void check_node(halfword p) } @ @c -void check_static_node_mem(void) +static void check_static_node_mem(void) { dotest(zero_glue, width(zero_glue), 0); dotest(zero_glue, type(zero_glue), glue_spec_node); @@ -1437,7 +1437,8 @@ halfword get_node(int s) } @ @c -void print_free_chain(int c) +#ifdef DEBUG +static void print_free_chain(int c) { halfword p = free_chain[c]; fprintf(stdout, "\nfree chain[%d] =\n ", c); @@ -1447,6 +1448,7 @@ void print_free_chain(int c) } fprintf(stdout, "null;\n"); } +#endif @ @c void free_node(halfword p, int s) @@ -1476,7 +1478,7 @@ void free_node(halfword p, int s) } @ @c -void free_node_chain(halfword q, int s) +static void free_node_chain(halfword q, int s) { register halfword p = q; while (vlink(p) != null) { @@ -2196,7 +2198,7 @@ void print_short_node_contents(halfword p) @ @c -void show_pdftex_whatsit_rule_spec(int p) +static void show_pdftex_whatsit_rule_spec(int p) { tprint("("); print_rule_dimen(height(p)); @@ -2227,7 +2229,7 @@ static void print_write_whatsit(const char *s, pointer p) @ @c -void show_whatsit_node(int p) +static void show_whatsit_node(int p) { switch (subtype(p)) { case open_node: diff --git a/Build/source/texk/web2c/luatexdir/tex/textcodes.w b/Build/source/texk/web2c/luatexdir/tex/textcodes.w index ea2f1f73698..5f237c58481 100644 --- a/Build/source/texk/web2c/luatexdir/tex/textcodes.w +++ b/Build/source/texk/web2c/luatexdir/tex/textcodes.w @@ -21,8 +21,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: textcodes.w 3587 2010-04-03 14:32:25Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/textcodes.w $"; + "$Id: textcodes.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/textcodes.w $"; @ @c #define LCCODESTACK 8 @@ -175,10 +175,12 @@ void unsave_cat_codes(int h, quarterword gl) } } -void clearcatcodestack(int h) +#if 0 +static void clearcatcodestack(int h) { clear_sa_stack(catcode_heads[h]); } +#endif static void initializecatcodes(void) { diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.w b/Build/source/texk/web2c/luatexdir/tex/textoken.w index ac9ad1e1013..501371bc3e1 100644 --- a/Build/source/texk/web2c/luatexdir/tex/textoken.w +++ b/Build/source/texk/web2c/luatexdir/tex/textoken.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: textoken.w 3587 2010-04-03 14:32:25Z taco $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/textoken.w $"; + "$Id: textoken.w 3612 2010-04-13 09:29:42Z taco $" + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/textoken.w $"; #include "ptexlib.h" @@ -554,7 +554,7 @@ halfword active_to_cs(int curchr, int force) @ TODO this function should listen to \.{\\escapechar} @c -char *cs_to_string(halfword p) +static char *cs_to_string(halfword p) { /* prints a control sequence */ const char *s; char *sh; @@ -598,7 +598,7 @@ char *cs_to_string(halfword p) @ TODO this is a quick hack, will be solved differently soon @c -char *cmd_chr_to_string(int cmd, int chr) +static char *cmd_chr_to_string(int cmd, int chr) { char *s; str_number str; diff --git a/Build/source/texk/web2c/luatexdir/utils/avlstuff.w b/Build/source/texk/web2c/luatexdir/utils/avlstuff.w index b122d187d45..d46c5cabe77 100644 --- a/Build/source/texk/web2c/luatexdir/utils/avlstuff.w +++ b/Build/source/texk/web2c/luatexdir/utils/avlstuff.w @@ -26,7 +26,7 @@ static const char _svn_version[] = "$Id: avlstuff.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/utils/avlstuff.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/utils/avlstuff.w $"; @ memory management functions for AVL @c diff --git a/Build/source/texk/web2c/luatexdir/utils/managed-sa.w b/Build/source/texk/web2c/luatexdir/utils/managed-sa.w index c451a23c0c8..5c02f13d76d 100644 --- a/Build/source/texk/web2c/luatexdir/utils/managed-sa.w +++ b/Build/source/texk/web2c/luatexdir/utils/managed-sa.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: managed-sa.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/utils/managed-sa.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/utils/managed-sa.w $"; @ @c static void store_sa_stack(sa_tree a, int n, sa_tree_item v, int gl) diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.w b/Build/source/texk/web2c/luatexdir/utils/utils.w index 777f153ddf4..05eca81cbc6 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.w +++ b/Build/source/texk/web2c/luatexdir/utils/utils.w @@ -21,7 +21,7 @@ @ @c static const char _svn_version[] = "$Id: utils.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/utils/utils.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/utils/utils.w $"; @ @c #include "openbsd-compat.h" diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index b4df789b05d..bd380296d63 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2010-04-13 Taco Hoekwater <taco@luatex> + + * new import from luatex repository (HEAD of 0.60.x branch) + 2010-04-05 Karl Berry <karl@tug.org> * mptrap.test: use --mem, not --memname (which does not exist). diff --git a/Build/source/texk/web2c/mplibdir/avl.c b/Build/source/texk/web2c/mplibdir/avl.c index 4d05baacb4e..1062de9d568 100644 --- a/Build/source/texk/web2c/mplibdir/avl.c +++ b/Build/source/texk/web2c/mplibdir/avl.c @@ -11,10 +11,10 @@ #define AVL_SHOW_ERROR(fmt,arg) (void) (fmt), (void) (arg) #endif -void * +const void * avl_default_item_copy (const void *item) { - return (void *) item; + return item; } void * @@ -767,7 +767,7 @@ rebalance_del (avl_node * p, avl_tree t, void **backup) { avl_node **r, *a, *c; int dir, bal; - + dir = 0; /* for -W */ a = p->up; if (a == NULL) r = &t->root; @@ -1256,7 +1256,7 @@ avl_ins (void *item, avl_tree t, avl_bool_t allow_duplicates) avl_compare_func cmp = t->compare; avl_node **r, *a; int dir; - + dir = 0; /* for -W */ for (r = &t->root, a = NULL; *r != NULL; r = &a->sub[dir = dir > 0]) { a = *r; diff --git a/Build/source/texk/web2c/mplibdir/avl.h b/Build/source/texk/web2c/mplibdir/avl.h index d5d2ada72d3..9771c095220 100644 --- a/Build/source/texk/web2c/mplibdir/avl.h +++ b/Build/source/texk/web2c/mplibdir/avl.h @@ -62,7 +62,7 @@ extern avl_code_t avl_errcmp_occurred(void *); /* At minimum, shallow copy */ -void *avl_default_item_copy(const void *); +const void *avl_default_item_copy(const void *); void *avl_default_item_dispose(void *); #define AVL_STACK_CAPACITY 32 /* for avl_split() function */ diff --git a/Build/source/texk/web2c/mplibdir/lmplib.c b/Build/source/texk/web2c/mplibdir/lmplib.c index 5d7fd8c6478..41b59a4e87f 100644 --- a/Build/source/texk/web2c/mplibdir/lmplib.c +++ b/Build/source/texk/web2c/mplibdir/lmplib.c @@ -40,6 +40,8 @@ /*@unused@*/ static const char _svn_version[] = "$Id: lmplib.c 1364 2008-07-04 16:09:46Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/lua/lmplib.c $"; +int luaopen_mplib(lua_State * L); /* forward */ + /* metatable identifiers and tests */ #define MPLIB_METATABLE "MPlib" |