diff options
| author | Taco Hoekwater <taco@elvenkind.com> | 2009-06-08 08:58:07 +0000 |
|---|---|---|
| committer | Taco Hoekwater <taco@elvenkind.com> | 2009-06-08 08:58:07 +0000 |
| commit | 5adefaa278f30813af94c423bed99d1628b23a2c (patch) | |
| tree | 76b0edd887559dcea0be9d28a569d8191f3e8307 | |
| parent | be2021a8a7f377786a2fba684fd950975c892533 (diff) | |
source code for luatex 0.40.3
git-svn-id: svn://tug.org/texlive/trunk@13669 c570f23f-e606-0410-a88d-b1316a301751
78 files changed, 748 insertions, 656 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 42f428fe805..ecc8c178184 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2009-06-08 Taco Hoekwater <taco@luatex.org> + + * luatexdir: import of luatex release 0.40.3. + This affects many files in subdirectories. + 2009-06-04 Taco Hoekwater <taco@luatex.org> * luatexdir: "avoid variable declaration after statement" patch diff --git a/Build/source/texk/web2c/luatexdir/NEWS b/Build/source/texk/web2c/luatexdir/NEWS index b01acd176e8..5878d46bf5b 100644 --- a/Build/source/texk/web2c/luatexdir/NEWS +++ b/Build/source/texk/web2c/luatexdir/NEWS @@ -1,4 +1,27 @@ ============================================================== +Luatex beta-0.40.3 was released 20090608 +============================================================== + +* A set of portability fixes for the AIX compiler from Vladimir + Volovich. + +* A set of fixes to the synctex support. + +* A patch to the build script to prevent installed X11 headers + from being required. + +* Some weave (web syntax) fixes from Manuel Pégourié-Gonnard. + +* A simplification in luatex.ch (it is now less verbose + about the web2c-specific extensions) from Karl Berry. + +* A fix in the handling of UTF-8 (input) file names. + +* Hyphenation exceptions were case sensitive in 0.40.2. + +* libpng is now 1.2.37. + +============================================================== Luatex beta-0.40.2 was released 20090603 ============================================================== @@ -781,7 +804,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.40.2/source/texk/web2c/luatexdir/NEWS $ into the object file. + and link in $Id$ and $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/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/commands.h b/Build/source/texk/web2c/luatexdir/commands.h index 567ded7b46e..33b8500f8a1 100644 --- a/Build/source/texk/web2c/luatexdir/commands.h +++ b/Build/source/texk/web2c/luatexdir/commands.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: commands.h 2280 2009-04-14 09:49:01Z taco $ */ +/* $Id: commands.h 2448 2009-06-08 07:43:50Z taco $ */ typedef enum { @@ -235,7 +235,7 @@ typedef enum { convert_pdf_colorstack_init_code, /* command code for \.{\\pdfcolorstackinit} */ convert_luatex_revision_code, /* command code for \.{\\luatexrevision} */ convert_luatex_date_code, /* command code for \.{\\luatexdate} */ - convert_math_style_code, /* command code for \.{\\mathstyle} */ + convert_math_style_code, /* command code for \.{\\mathstyle} */ convert_expanded_code, /* command code for \.{\\expanded} */ convert_job_name_code, /* command code for \.{\\jobname} */ #define convert_pdftex_convert_codes convert_job_name_code /* end of \pdfTeX's command codes */ diff --git a/Build/source/texk/web2c/luatexdir/font/dofont.c b/Build/source/texk/web2c/luatexdir/font/dofont.c index 6c8411ec4eb..0570f420dfd 100644 --- a/Build/source/texk/web2c/luatexdir/font/dofont.c +++ b/Build/source/texk/web2c/luatexdir/font/dofont.c @@ -22,7 +22,7 @@ #include "luatex-api.h" static const char _svn_version[] = - "$Id: dofont.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/dofont.c $"; + "$Id: dofont.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/dofont.c $"; #define TIMERS 0 @@ -50,8 +50,7 @@ static char *font_error_message(pointer u, char *nom, scaled s) return str; } -static int -do_define_font(integer f, char *cnom, scaled s, integer natural_dir) +static int do_define_font(integer f, char *cnom, scaled s, integer natural_dir) { boolean res; /* was the callback successful? */ @@ -115,7 +114,7 @@ do_define_font(integer f, char *cnom, scaled s, integer natural_dir) return 0; } } - } else if (callback_id==0) { + } else if (callback_id == 0) { res = read_tfm_info(f, cnom, s); if (res) { set_hyphen_char(f, get_default_hyphen_char()); diff --git a/Build/source/texk/web2c/luatexdir/font/luafont.c b/Build/source/texk/web2c/luatexdir/font/luafont.c index bbbda9f9c8b..2c170639f2e 100644 --- a/Build/source/texk/web2c/luatexdir/font/luafont.c +++ b/Build/source/texk/web2c/luatexdir/font/luafont.c @@ -1,6 +1,6 @@ /* luafont.c - Copyright 2006-2008 Taco Hoekwater <taco@luatex.org> + Copyright 2006-2009 Taco Hoekwater <taco@luatex.org> This file is part of LuaTeX. @@ -23,7 +23,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: luafont.c 2312 2009-04-17 15:43:13Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/luafont.c $"; + "$Id: luafont.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/luafont.c $"; #define noVERBOSE @@ -107,10 +107,12 @@ static void dump_intfield(lua_State * L, char *n, int c) } -void dump_math_kerns (lua_State *L, charinfo *co, int l, int id) { - int i; - for (i=0; i<l;i++) { - lua_newtable(L); +void dump_math_kerns(lua_State * L, charinfo * co, int l, int id) +{ + int i; + for (i = 0; i < l; i++) { + lua_newtable(L); + /* *INDENT-OFF* */ if (id==top_left_kern) { dump_intfield(L, "height", co->top_left_math_kern_array[(2*i)]); dump_intfield(L, "kern", co->top_left_math_kern_array[(2*i)+1]); @@ -124,8 +126,9 @@ void dump_math_kerns (lua_State *L, charinfo *co, int l, int id) { dump_intfield(L, "height", co->bottom_left_math_kern_array[(2*i)]); dump_intfield(L, "kern", co->bottom_left_math_kern_array[(2*i)+1]); } - lua_rawseti(L,-2, (i+1)); - } + /* *INDENT-ON* */ + lua_rawseti(L, -2, (i + 1)); + } } @@ -287,37 +290,37 @@ void font_char_to_lua(lua_State * L, internalfontnumber f, charinfo * co) i = get_charinfo_math_kerns(co, top_right_kern); j = 0; - if (i>0) { + if (i > 0) { j++; lua_newtable(L); dump_math_kerns(L, co, i, top_right_kern); lua_setfield(L, -2, "top_right"); } i = get_charinfo_math_kerns(co, top_left_kern); - if (i>0) { + if (i > 0) { j++; lua_newtable(L); dump_math_kerns(L, co, i, top_left_kern); lua_setfield(L, -2, "top_left"); } i = get_charinfo_math_kerns(co, bottom_right_kern); - if (i>0) { + if (i > 0) { j++; lua_newtable(L); dump_math_kerns(L, co, i, bottom_right_kern); lua_setfield(L, -2, "bottom_right"); } i = get_charinfo_math_kerns(co, bottom_left_kern); - if (i>0) { + if (i > 0) { j++; lua_newtable(L); dump_math_kerns(L, co, i, bottom_left_kern); lua_setfield(L, -2, "bottom_left"); } - if (j>0) + if (j > 0) lua_setfield(L, -2, "mathkern"); else - lua_pop(L,1); + lua_pop(L, 1); } @@ -378,7 +381,7 @@ int font_to_lua(lua_State * L, int f) { int k; charinfo *co; - if (font_cache_id(f)>0) { + if (font_cache_id(f) > 0) { /* fetch the table from the registry if it was saved there by font_from_lua() */ lua_rawgeti(L, LUA_REGISTRYINDEX, font_cache_id(f)); @@ -509,9 +512,9 @@ int font_to_lua(lua_State * L, int f) } lua_setfield(L, -2, "characters"); - if (font_cache_id(f)==0) { /* renew */ + if (font_cache_id(f) == 0) { /* renew */ integer r; - lua_pushvalue(L,-1); + lua_pushvalue(L, -1); r = luaL_ref(Luas, LUA_REGISTRYINDEX); /* pops the table */ set_font_cache_id(f, r); } @@ -1124,37 +1127,36 @@ static void read_lua_math_parameters(lua_State * L, int f) #define MIN_INF -0x7FFFFFFF -static void -store_math_kerns (lua_State * L, charinfo *co, int id ) +static void store_math_kerns(lua_State * L, charinfo * co, int id) { int l, k; scaled ht, krn; - if (lua_istable(L, -1) && ((k=lua_objlen(L,-1))>0)) { - for (l=0;l<k;l++) { - lua_rawgeti(L,-1,(l+1)); + if (lua_istable(L, -1) && ((k = lua_objlen(L, -1)) > 0)) { + for (l = 0; l < k; l++) { + lua_rawgeti(L, -1, (l + 1)); if (lua_istable(L, -1)) { lua_getfield(L, -1, "height"); - if (lua_isnumber(L,-1)) { - ht = (scaled)lua_tonumber(L,-1); + if (lua_isnumber(L, -1)) { + ht = (scaled) lua_tonumber(L, -1); } else { ht = MIN_INF; } - lua_pop(L,1); + lua_pop(L, 1); lua_getfield(L, -1, "kern"); - if (lua_isnumber(L,-1)) { - krn = (scaled)lua_tonumber(L,-1); + if (lua_isnumber(L, -1)) { + krn = (scaled) lua_tonumber(L, -1); } else { krn = MIN_INF; } - lua_pop(L,1); - if (krn>MIN_INF && ht>MIN_INF) - add_charinfo_math_kern(co,id,ht,krn); + lua_pop(L, 1); + if (krn > MIN_INF && ht > MIN_INF) + add_charinfo_math_kern(co, id, ht, krn); } - lua_pop(L,1); + lua_pop(L, 1); } } } - + void font_char_from_lua(lua_State * L, internal_font_number f, integer i, integer * l_fonts) @@ -1284,22 +1286,22 @@ font_char_from_lua(lua_State * L, internal_font_number f, integer i, ["top_left"] ={ { ["height"]=620, ["kern"]=0 }, { ["height"]=720, ["kern"]=-80 } }, ["top_right"] ={ { ["height"]=676, ["kern"]=115 }, { ["height"]=776, ["kern"]=45 } }, } - */ + */ lua_rawgeti(L, LUA_REGISTRYINDEX, luaS_mathkern_index); lua_rawget(L, -2); if (lua_istable(L, -1)) { lua_getfield(L, -1, "top_left"); store_math_kerns(L, co, top_left_kern); - lua_pop(L,1); + lua_pop(L, 1); lua_getfield(L, -1, "top_right"); store_math_kerns(L, co, top_right_kern); - lua_pop(L,1); + lua_pop(L, 1); lua_getfield(L, -1, "bottom_right"); store_math_kerns(L, co, bottom_right_kern); - lua_pop(L,1); + lua_pop(L, 1); lua_getfield(L, -1, "bottom_left"); store_math_kerns(L, co, bottom_left_kern); - lua_pop(L,1); + lua_pop(L, 1); } lua_pop(L, 1); @@ -1433,18 +1435,18 @@ int font_from_lua(lua_State * L, int f) int ec; /* last char index */ char *s; integer *l_fonts = NULL; - integer save_ref = 1; /* unneeded, really */ + integer save_ref = 1; /* unneeded, really */ /* will we save a cache of the luat table? */ s = string_field(L, "cache", "yes"); - if (strcmp(s,"yes")==0) - save_ref=1; - else if (strcmp(s,"no")==0) - save_ref=-1; - else if (strcmp(s,"renew")==0) - save_ref=0; + if (strcmp(s, "yes") == 0) + save_ref = 1; + else if (strcmp(s, "no") == 0) + save_ref = -1; + else if (strcmp(s, "renew") == 0) + save_ref = 0; free(s); - + /* the table is at stack index -1 */ if (luaS_width_index == 0) @@ -1664,8 +1666,8 @@ int font_from_lua(lua_State * L, int f) font_name(f)); } - if (save_ref>0) { - r = luaL_ref(Luas, LUA_REGISTRYINDEX); /* pops the table */ + if (save_ref > 0) { + r = luaL_ref(Luas, LUA_REGISTRYINDEX); /* pops the table */ set_font_cache_id(f, r); } else { lua_pop(Luas, 1); @@ -1747,7 +1749,7 @@ static void nesting_prepend_list(halfword nest, halfword newn) } else { halfword tail = tail_of_list(newn); assert(alink(head) == nest); - assert(tail_of_list(head) == tlink(nest)); + assert(tail_of_list(head) == tlink(nest)); couple_nodes(tail, head); } } @@ -1995,36 +1997,37 @@ static halfword handle_lig_word(halfword cur) if (vlink_no_break(cur) != null || vlink_post_break(cur) != null) { halfword fwd; liginfo lig; - if (vlink_post_break(cur)!=null) - handle_lig_nest(post_break(cur),vlink_post_break(cur)); - if (vlink_no_break(cur)!=null) - handle_lig_nest(no_break(cur),vlink_no_break(cur)); - while ((fwd = vlink(cur)) != null ) { - halfword nob, pst, next; - if (type(fwd) != glyph_node) break; + if (vlink_post_break(cur) != null) + handle_lig_nest(post_break(cur), vlink_post_break(cur)); + if (vlink_no_break(cur) != null) + handle_lig_nest(no_break(cur), vlink_no_break(cur)); + while ((fwd = vlink(cur)) != null) { + halfword nob, pst, next; + if (type(fwd) != glyph_node) + break; nob = tlink_no_break(cur); pst = tlink_post_break(cur); if ((nob == null || !test_ligature(&lig, nob, fwd)) && - (pst == null || !test_ligature(&lig, pst, fwd)) ) + (pst == null || !test_ligature(&lig, pst, fwd))) break; - nesting_append(no_break(cur),copy_node(fwd)); - handle_lig_nest(no_break(cur),nob); + nesting_append(no_break(cur), copy_node(fwd)); + handle_lig_nest(no_break(cur), nob); next = vlink(fwd); uncouple_node(fwd); try_couple_nodes(cur, next); - nesting_append(post_break(cur),fwd); - handle_lig_nest(post_break(cur),pst); + nesting_append(post_break(cur), fwd); + handle_lig_nest(post_break(cur), pst); } if (fwd != null && type(fwd) == disc_node) { halfword next = vlink(fwd); - if (vlink_no_break(fwd)==null && - vlink_post_break(fwd)==null && + if (vlink_no_break(fwd) == null && + vlink_post_break(fwd) == null && next != null && type(next) == glyph_node && - ((tlink_post_break(cur)!= null && - test_ligature(&lig,tlink_post_break(cur),next)) || - (tlink_no_break(cur)!= null && - test_ligature(&lig,tlink_no_break(cur),next)))) { + ((tlink_post_break(cur) != null && + test_ligature(&lig, tlink_post_break(cur), next)) || + (tlink_no_break(cur) != null && + test_ligature(&lig, tlink_no_break(cur), next)))) { /* Building an init_disc followed by a select_disc * {a-}{b}{AB} {-}{}{} 'c' */ @@ -2032,26 +2035,31 @@ static halfword handle_lig_word(halfword cur) uncouple_node(next); try_couple_nodes(fwd, last); /* {a-}{b}{AB} {-}{c}{} */ - nesting_append(post_break(fwd),copy_node(next)); + nesting_append(post_break(fwd), copy_node(next)); /* {a-}{b}{AB} {-}{c}{-} */ - if (vlink_no_break(cur)!=null) { - nesting_prepend(no_break(fwd),copy_node(vlink_pre_break(fwd))); + if (vlink_no_break(cur) != null) { + nesting_prepend(no_break(fwd), + copy_node(vlink_pre_break(fwd))); } /* {a-}{b}{AB} {b-}{c}{-} */ - if (vlink_post_break(cur)!=null) - nesting_prepend_list(pre_break(fwd),copy_node_list(vlink_post_break(cur))); + if (vlink_post_break(cur) != null) + nesting_prepend_list(pre_break(fwd), + copy_node_list(vlink_post_break + (cur))); /* {a-}{b}{AB} {b-}{c}{AB-} */ - if (vlink_no_break(cur)!=null) { - nesting_prepend_list(no_break(fwd),copy_node_list(vlink_no_break(cur))); + if (vlink_no_break(cur) != null) { + nesting_prepend_list(no_break(fwd), + copy_node_list(vlink_no_break + (cur))); } /* {a-}{b}{ABC} {b-}{c}{AB-} */ tail = tlink_no_break(cur); - nesting_append(no_break(cur),copy_node(next)); - handle_lig_nest(no_break(cur),tail); + nesting_append(no_break(cur), copy_node(next)); + handle_lig_nest(no_break(cur), tail); /* {a-}{BC}{ABC} {b-}{c}{AB-} */ tail = tlink_post_break(cur); - nesting_append(post_break(cur),next); - handle_lig_nest(post_break(cur),tail); + nesting_append(post_break(cur), next); + handle_lig_nest(post_break(cur), tail); /* and set the subtypes */ subtype(cur) = init_disc; subtype(fwd) = select_disc; diff --git a/Build/source/texk/web2c/luatexdir/font/macnames.c b/Build/source/texk/web2c/luatexdir/font/macnames.c index 5d7d1ae5039..3301cec2011 100644 --- a/Build/source/texk/web2c/luatexdir/font/macnames.c +++ b/Build/source/texk/web2c/luatexdir/font/macnames.c @@ -19,7 +19,7 @@ with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */ static const char __svn_version[] = - "$Id: macnames.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/macnames.c $"; + "$Id: macnames.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/macnames.c $"; const char notdef[] = ".notdef"; diff --git a/Build/source/texk/web2c/luatexdir/font/mapfile.c b/Build/source/texk/web2c/luatexdir/font/mapfile.c index 4519e1632c3..b9112517521 100644 --- a/Build/source/texk/web2c/luatexdir/font/mapfile.c +++ b/Build/source/texk/web2c/luatexdir/font/mapfile.c @@ -27,7 +27,7 @@ static const char _svn_version[] = "$Id: mapfile.c 2331 2009-04-18 16:39:50Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/mapfile.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/mapfile.c $"; #define FM_BUF_SIZE 1024 diff --git a/Build/source/texk/web2c/luatexdir/font/pkin.c b/Build/source/texk/web2c/luatexdir/font/pkin.c index ed2ad493fcd..3b8512f8c76 100644 --- a/Build/source/texk/web2c/luatexdir/font/pkin.c +++ b/Build/source/texk/web2c/luatexdir/font/pkin.c @@ -45,7 +45,7 @@ #include "luatexfont.h" static const char _svn_version[] = - "$Id: pkin.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/pkin.c $"; + "$Id: pkin.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/pkin.c $"; /* * Now we have some routines to get stuff from the pk file. pkbyte returns diff --git a/Build/source/texk/web2c/luatexdir/font/sfnt.c b/Build/source/texk/web2c/luatexdir/font/sfnt.c index 7c2930e298b..9ec25099995 100644 --- a/Build/source/texk/web2c/luatexdir/font/sfnt.c +++ b/Build/source/texk/web2c/luatexdir/font/sfnt.c @@ -40,7 +40,7 @@ #include "sfnt.h" static const char _svn_version[] = - "$Id: sfnt.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/sfnt.c $"; + "$Id: sfnt.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/sfnt.c $"; #ifdef XETEX UNSIGNED_BYTE ft_unsigned_byte(sfnt * f) diff --git a/Build/source/texk/web2c/luatexdir/font/subfont.c b/Build/source/texk/web2c/luatexdir/font/subfont.c index fcbbc749257..92d4b70f3e8 100644 --- a/Build/source/texk/web2c/luatexdir/font/subfont.c +++ b/Build/source/texk/web2c/luatexdir/font/subfont.c @@ -22,7 +22,7 @@ #include <string.h> static const char _svn_version[] = - "$Id: subfont.c 2306 2009-04-16 15:01:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/subfont.c $"; + "$Id: subfont.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/subfont.c $"; static struct avl_table *sfd_tree = NULL; @@ -69,7 +69,7 @@ static void destroy_sfd_entry(void *pa, void *pb) subfont_entry *p, *q; sfd_entry *sfd; sfd = (sfd_entry *) pa; - (void)pb; + (void) pb; p = sfd->subfont; while (p != NULL) { q = p->next; @@ -82,7 +82,7 @@ static void destroy_sfd_entry(void *pa, void *pb) static int comp_sfd_entry(const void *pa, const void *pb, void *p) { - (void)p; + (void) p; return strcmp(((const sfd_entry *) pa)->name, ((const sfd_entry *) pb)->name); } diff --git a/Build/source/texk/web2c/luatexdir/font/texfont.c b/Build/source/texk/web2c/luatexdir/font/texfont.c index c75d5ecaa2a..0a6563b3404 100644 --- a/Build/source/texk/web2c/luatexdir/font/texfont.c +++ b/Build/source/texk/web2c/luatexdir/font/texfont.c @@ -34,8 +34,10 @@ #include "ptexlib.h" #include "luatex-api.h" +#define noDEBUG + static const char _svn_version[] = - "$Id: texfont.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/texfont.c $"; + "$Id: texfont.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/texfont.c $"; #define proper_char_index(c) (c<=font_ec(f) && c>=font_bc(f)) #define dxfree(a,b) { xfree(a); a = b ; } @@ -146,11 +148,12 @@ charinfo *get_charinfo(internal_font_number f, integer c) if (!glyph) { glyph = ++font_tables[f]->charinfo_count; - if (glyph>=(unsigned)font_tables[f]->charinfo_size) { - font_bytes += (16*sizeof(charinfo)); + if (glyph >= (unsigned) font_tables[f]->charinfo_size) { + font_bytes += (16 * sizeof(charinfo)); do_realloc(font_tables[f]->charinfo, (glyph + 16), charinfo); - memset(&(font_tables[f]->charinfo[glyph]), 0, (16*sizeof(charinfo))); - font_tables[f]->charinfo_size += 16; + memset(&(font_tables[f]->charinfo[glyph]), 0, + (16 * sizeof(charinfo))); + font_tables[f]->charinfo_size += 16; } font_tables[f]->charinfo[glyph].ef = 1000; /* init */ set_sa_item(font_tables[f]->characters, c, glyph, 1); /* 1= global */ @@ -178,7 +181,7 @@ void set_charinfo(internal_font_number f, integer c, charinfo * ci) { sa_tree_item glyph; if (proper_char_index(c)) { - glyph = get_sa_item(font_tables[f]->characters, c); + glyph = get_sa_item(font_tables[f]->characters, c); if (glyph) { font_tables[f]->charinfo[glyph] = *ci; } else { @@ -1225,6 +1228,11 @@ boolean font_shareable(internal_font_number f, internal_font_number k) &&same_font_name(k, pdf_font_blink(f)))) { ret = 1; } +#ifdef DEBUG + printf("font_shareable(%d:%s:%s,%d:%s:%s): => %d\n", + f, font_filename(f), font_fullname(f), + k, font_filename(k), font_fullname(k), ret); +#endif } return ret; } diff --git a/Build/source/texk/web2c/luatexdir/font/texfont.h b/Build/source/texk/web2c/luatexdir/font/texfont.h index 8810f58ae46..35e6dde9963 100644 --- a/Build/source/texk/web2c/luatexdir/font/texfont.h +++ b/Build/source/texk/web2c/luatexdir/font/texfont.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: texfont.h 2414 2009-06-03 12:57:01Z taco $ */ +/* $Id: texfont.h 2448 2009-06-08 07:43:50Z taco $ */ /* Here we have the interface to LuaTeX's font system, as seen from the main pascal program. There is a companion list in luatex.defines to @@ -397,9 +397,9 @@ typedef enum { # define space_stretch(f) font_param(f,space_stretch_code) # define space_shrink(f) font_param(f,space_shrink_code) # define x_height(f) font_param(f,x_height_code) -#ifdef quad -# undef quad -#endif +# ifdef quad +# undef quad +# endif # define quad(f) font_param(f,quad_code) # define extra_space(f) font_param(f,extra_space_code) diff --git a/Build/source/texk/web2c/luatexdir/font/tfmofm.c b/Build/source/texk/web2c/luatexdir/font/tfmofm.c index 164676afa97..f55289e16f8 100644 --- a/Build/source/texk/web2c/luatexdir/font/tfmofm.c +++ b/Build/source/texk/web2c/luatexdir/font/tfmofm.c @@ -1,6 +1,6 @@ /* tfmofm.c - Copyright 2006-2008 Taco Hoekwater <taco@luatex.org> + Copyright 2006-2009 Taco Hoekwater <taco@luatex.org> This file is part of LuaTeX. @@ -22,7 +22,7 @@ #include "luatexfont.h" static const char _svn_version[] = - "$Id: tfmofm.c 2414 2009-06-03 12:57:01Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/tfmofm.c $"; + "$Id: tfmofm.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/tfmofm.c $"; /* Here are some macros that help process ligatures and kerns */ @@ -375,8 +375,7 @@ additional parameter information, which is explained later. xfree(xligs); xfree(xkerns); return 1; } -int -open_tfm_file(char *nom, unsigned char **tfm_buf, integer * tfm_siz) +int open_tfm_file(char *nom, unsigned char **tfm_buf, integer * tfm_siz) { boolean res; /* was the callback successful? */ boolean opened; /* was |tfm_file| successfully opened? */ @@ -557,6 +556,7 @@ scaled store_scaled_f(scaled sq, scaled z_in) return (sw - alpha); else pdf_error(maketexstring("vf"), maketexstring("vf scaling")); + return sw; /* not reached, just to make the compiler happy */ } #define check_existence(z) \ diff --git a/Build/source/texk/web2c/luatexdir/font/tounicode.c b/Build/source/texk/web2c/luatexdir/font/tounicode.c index b4c3dea81c4..ecac8112e5c 100644 --- a/Build/source/texk/web2c/luatexdir/font/tounicode.c +++ b/Build/source/texk/web2c/luatexdir/font/tounicode.c @@ -20,7 +20,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: tounicode.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/tounicode.c $"; + "$Id: tounicode.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/tounicode.c $"; #define isXdigit(c) (isdigit(c) || ('A' <= (c) && (c) <= 'F')) #define UNI_UNDEF -1 @@ -31,7 +31,7 @@ static struct avl_table *glyph_unicode_tree = NULL; static int comp_glyph_unicode_entry(const void *pa, const void *pb, void *p) { - (void)p; + (void) p; return strcmp(((const glyph_unicode_entry *) pa)->name, ((const glyph_unicode_entry *) pb)->name); } @@ -49,7 +49,7 @@ static glyph_unicode_entry *new_glyph_unicode_entry(void) static void destroy_glyph_unicode_entry(void *pa, void *pb) { glyph_unicode_entry *e = (glyph_unicode_entry *) pa; - (void)pb; + (void) pb; xfree(e->name); if (e->code == UNI_STRING) { assert(e->unicode_seq != NULL); diff --git a/Build/source/texk/web2c/luatexdir/font/tt_glyf.c b/Build/source/texk/web2c/luatexdir/font/tt_glyf.c index 159b988d968..bd22db655ae 100644 --- a/Build/source/texk/web2c/luatexdir/font/tt_glyf.c +++ b/Build/source/texk/web2c/luatexdir/font/tt_glyf.c @@ -32,7 +32,7 @@ #include "writettf.h" static const char _svn_version[] = - "$Id: tt_glyf.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/tt_glyf.c $"; + "$Id: tt_glyf.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/tt_glyf.c $"; #define NUM_GLYPH_LIMIT 65534 #define TABLE_DATA_ALLOC_SIZE 40960 diff --git a/Build/source/texk/web2c/luatexdir/font/tt_table.c b/Build/source/texk/web2c/luatexdir/font/tt_table.c index b10bc365b82..5956303e47f 100644 --- a/Build/source/texk/web2c/luatexdir/font/tt_table.c +++ b/Build/source/texk/web2c/luatexdir/font/tt_table.c @@ -34,7 +34,7 @@ #include "tt_table.h" static const char _svn_version[] = - "$Id: tt_table.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/tt_table.c $"; + "$Id: tt_table.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/tt_table.c $"; /* tables contains information refered by other tables diff --git a/Build/source/texk/web2c/luatexdir/font/vfovf.c b/Build/source/texk/web2c/luatexdir/font/vfovf.c index 2c84ce0554b..d1299ae12f2 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfovf.c +++ b/Build/source/texk/web2c/luatexdir/font/vfovf.c @@ -23,8 +23,8 @@ #include "luatexfont.h" static const char _svn_version[] = - "$Id: vfovf.c 2414 2009-06-03 12:57:01Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/vfovf.c $"; + "$Id: vfovf.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/vfovf.c $"; /* this is a hack! */ #define font_max 5000 @@ -1235,16 +1235,16 @@ int make_vf_table(lua_State * L, char *cnom, scaled atsize) case set_rule: vf_read(4, h); vf_read(4, v); - make_command2("rule", store_scaled_f(h, atsize), store_scaled_f(v, atsize), - k); + make_command2("rule", store_scaled_f(h, atsize), + store_scaled_f(v, atsize), k); packet_length -= 8; break; case put_rule: vf_read(4, h); vf_read(4, v); make_command0("push", k); - make_command2("rule", store_scaled_f(h, atsize), store_scaled_f(v, atsize), - k); + make_command2("rule", store_scaled_f(h, atsize), + store_scaled_f(v, atsize), k); make_command0("pop", k); packet_length -= 8; break; diff --git a/Build/source/texk/web2c/luatexdir/font/vfpacket.c b/Build/source/texk/web2c/luatexdir/font/vfpacket.c index 6f2edb1bdf9..77881da1271 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfpacket.c +++ b/Build/source/texk/web2c/luatexdir/font/vfpacket.c @@ -21,7 +21,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: vfpacket.c 2414 2009-06-03 12:57:01Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/vfpacket.c $"; + "$Id: vfpacket.c 2414 2009-06-03 12:57:01Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/vfpacket.c $"; /* The |do_vf_packet| procedure is called in order to interpret the diff --git a/Build/source/texk/web2c/luatexdir/font/writecff.c b/Build/source/texk/web2c/luatexdir/font/writecff.c index 18f7febad5f..ed08e8d4143 100644 --- a/Build/source/texk/web2c/luatexdir/font/writecff.c +++ b/Build/source/texk/web2c/luatexdir/font/writecff.c @@ -22,8 +22,8 @@ #include "writecff.h" static const char _svn_version[] = - "$Id: writecff.c 2414 2009-06-03 12:57:01Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writecff.c $"; + "$Id: writecff.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writecff.c $"; #define get_offset(s,n) get_unsigned(s, (n)) #define get_card8(a) a->stream[a->offset++] @@ -760,28 +760,28 @@ static void add_dict(cff_dict * dict, argtype == CFF_TYPE_SID || argtype == CFF_TYPE_OFFSET) { /* check for underflow here, as exactly one operand is expected */ if (stack_top < 1) { - *status = CFF_CFF_ERROR_STACK_UNDERFLOW; - return; - } + *status = CFF_CFF_ERROR_STACK_UNDERFLOW; + return; + } stack_top--; (dict->entries)[dict->count].count = 1; (dict->entries)[dict->count].values = xcalloc(1, sizeof(double)); (dict->entries)[dict->count].values[0] = arg_stack[stack_top]; - dict->count += 1; + dict->count += 1; } else { /* just ignore operator if there were no operands provided; - don't treat this as underflow (e.g. StemSnapV in TemporaLGCUni-Italic.otf) */ + don't treat this as underflow (e.g. StemSnapV in TemporaLGCUni-Italic.otf) */ if (stack_top > 0) { - (dict->entries)[dict->count].count = stack_top; - (dict->entries)[dict->count].values = - xcalloc(stack_top, sizeof(double)); - while (stack_top > 0) { + (dict->entries)[dict->count].count = stack_top; + (dict->entries)[dict->count].values = + xcalloc(stack_top, sizeof(double)); + while (stack_top > 0) { stack_top--; - (dict->entries)[dict->count].values[stack_top] = + (dict->entries)[dict->count].values[stack_top] = arg_stack[stack_top]; - } - dict->count += 1; - } + } + dict->count += 1; + } } *data += 1; diff --git a/Build/source/texk/web2c/luatexdir/font/writeenc.c b/Build/source/texk/web2c/luatexdir/font/writeenc.c index 6e7013f0e6b..76613f80eb5 100644 --- a/Build/source/texk/web2c/luatexdir/font/writeenc.c +++ b/Build/source/texk/web2c/luatexdir/font/writeenc.c @@ -21,7 +21,7 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: writeenc.c 2306 2009-04-16 15:01:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writeenc.c $"; + "$Id: writeenc.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writeenc.c $"; /**********************************************************************/ /* All encoding entries go into AVL tree for fast search by name. */ @@ -32,7 +32,7 @@ struct avl_table *fe_tree = NULL; static int comp_fe_entry(const void *pa, const void *pb, void *p) { - (void)p; + (void) p; return strcmp(((const fe_entry *) pa)->name, ((const fe_entry *) pb)->name); } @@ -165,7 +165,7 @@ static void destroy_fe_entry(void *pa, void *pb) { fe_entry *p; int i; - (void)pb; + (void) pb; p = (fe_entry *) pa; xfree(p->name); if (p->glyph_names != NULL) diff --git a/Build/source/texk/web2c/luatexdir/font/writefont.c b/Build/source/texk/web2c/luatexdir/font/writefont.c index 5dd953ace40..5036092b0ed 100644 --- a/Build/source/texk/web2c/luatexdir/font/writefont.c +++ b/Build/source/texk/web2c/luatexdir/font/writefont.c @@ -23,7 +23,7 @@ static const char _svn_version[] = "$Id: writefont.c 2331 2009-04-18 16:39:50Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writefont.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writefont.c $"; void write_cid_fontdictionary(fo_entry * fo, internalfontnumber f); void create_cid_fontdictionary(fm_entry * fm, integer font_objnum, diff --git a/Build/source/texk/web2c/luatexdir/font/writet1.c b/Build/source/texk/web2c/luatexdir/font/writet1.c index 9bf71a97b8a..18d1e858530 100644 --- a/Build/source/texk/web2c/luatexdir/font/writet1.c +++ b/Build/source/texk/web2c/luatexdir/font/writet1.c @@ -25,7 +25,7 @@ #include "luatex-api.h" static const char _svn_version[] = - "$Id: writet1.c 2306 2009-04-16 15:01:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writet1.c $"; + "$Id: writet1.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writet1.c $"; #define t1_log(str) if(tracefilenames) tex_printf("%s", str) #define get_length1() t1_length1 = t1_offset() - t1_save_offset @@ -1407,7 +1407,7 @@ static void cs_mark(const char *cs_name, int subr) static int comp_t1_glyphs(const void *pa, const void *pb, void *p) { - (void)p; + (void) p; return strcmp(*((const char **) pa), *((const char **) pb)); } diff --git a/Build/source/texk/web2c/luatexdir/font/writet3.c b/Build/source/texk/web2c/luatexdir/font/writet3.c index 84cecbc0404..69dbf1039d0 100644 --- a/Build/source/texk/web2c/luatexdir/font/writet3.c +++ b/Build/source/texk/web2c/luatexdir/font/writet3.c @@ -25,7 +25,7 @@ #include "luatexfont.h" static const char _svn_version[] = - "$Id: writet3.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writet3.c $"; + "$Id: writet3.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writet3.c $"; #define T3_BUF_SIZE 1024 diff --git a/Build/source/texk/web2c/luatexdir/font/writettf.c b/Build/source/texk/web2c/luatexdir/font/writettf.c index 38e65b298fa..5561b8e3d80 100644 --- a/Build/source/texk/web2c/luatexdir/font/writettf.c +++ b/Build/source/texk/web2c/luatexdir/font/writettf.c @@ -23,7 +23,7 @@ #include <string.h> static const char _svn_version[] = - "$Id: writettf.c 2306 2009-04-16 15:01:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writettf.c $"; + "$Id: writettf.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writettf.c $"; #define DEFAULT_NTABS 14 #define NEW_CMAP_SIZE 2 @@ -130,7 +130,7 @@ ttf_cmap_entry *new_ttf_cmap_entry(void) static void destroy_ttf_cmap_entry(void *pa, void *pb) { ttf_cmap_entry *p; - (void)pb; + (void) pb; p = (ttf_cmap_entry *) pa; xfree(p->ttf_name); xfree(p->table); @@ -148,7 +148,7 @@ static int comp_ttf_cmap_entry(const void *pa, const void *pb, void *p) const ttf_cmap_entry *p1 = (const ttf_cmap_entry *) pa, *p2 = (const ttf_cmap_entry *) pb; int i; - (void)p; + (void) p; assert(p1->ttf_name != NULL && p2->ttf_name != NULL); if ((i = strcmp(p1->ttf_name, p2->ttf_name)) != 0) return i; @@ -1423,7 +1423,7 @@ void do_writeotf(fd_entry * fd) { long i; dirtab_entry *tab; - (void)fd; + (void) fd; dir_tab = NULL; glyph_tab = NULL; if (tracefilenames) diff --git a/Build/source/texk/web2c/luatexdir/font/writetype0.c b/Build/source/texk/web2c/luatexdir/font/writetype0.c index 14af9aba1a9..3ae248c02b7 100644 --- a/Build/source/texk/web2c/luatexdir/font/writetype0.c +++ b/Build/source/texk/web2c/luatexdir/font/writetype0.c @@ -22,7 +22,7 @@ #include "writecff.h" static const char _svn_version[] = - "$Id: writetype0.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writetype0.c $"; + "$Id: writetype0.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writetype0.c $"; void writetype0(fd_entry * fd) { diff --git a/Build/source/texk/web2c/luatexdir/font/writetype2.c b/Build/source/texk/web2c/luatexdir/font/writetype2.c index 15dcc01af8a..ee901cdf27e 100644 --- a/Build/source/texk/web2c/luatexdir/font/writetype2.c +++ b/Build/source/texk/web2c/luatexdir/font/writetype2.c @@ -25,7 +25,7 @@ #include "tt_glyf.h" static const char _svn_version[] = - "$Id: writetype2.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/font/writetype2.c $"; + "$Id: writetype2.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/font/writetype2.c $"; /* forward*/ void make_tt_subset(fd_entry * fd, unsigned char *buffer, integer buflen); diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.c b/Build/source/texk/web2c/luatexdir/image/epdf.c index dfa182f74c2..d7443e699b7 100644 --- a/Build/source/texk/web2c/luatexdir/image/epdf.c +++ b/Build/source/texk/web2c/luatexdir/image/epdf.c @@ -26,7 +26,7 @@ static const char _svn_version[] = "$Id: epdf.c 2331 2009-04-18 16:39:50Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/image/epdf.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/image/epdf.c $"; fd_entry *epdf_create_fontdescriptor(fm_entry * fm, int stemV) { diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc index cd1dc6e10d9..4f1600031b3 100644 --- a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc +++ b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc @@ -25,18 +25,18 @@ #include <string.h> #include <ctype.h> #ifdef POPPLER_VERSION -#define GString GooString -#include <dirent.h> -#include <poppler-config.h> -#include <goo/GooString.h> -#include <goo/gmem.h> -#include <goo/gfile.h> +# define GString GooString +# include <dirent.h> +# include <poppler-config.h> +# include <goo/GooString.h> +# include <goo/gmem.h> +# include <goo/gfile.h> #else -#include <aconf.h> -#include <GString.h> -#include <gmem.h> -#include <gfile.h> -#include <assert.h> +# include <aconf.h> +# include <GString.h> +# include <gmem.h> +# include <gfile.h> +# include <assert.h> #endif #include "Object.h" #include "Stream.h" @@ -54,8 +54,8 @@ #include "epdf.h" static const char _svn_version[] = - "$Id: pdftoepdf.cc 2376 2009-05-08 08:40:13Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/image/pdftoepdf.cc $"; + "$Id: pdftoepdf.cc 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/image/pdftoepdf.cc $"; #define one_hundred_bp 6578176 /* 7227 * 65536 / 72 */ diff --git a/Build/source/texk/web2c/luatexdir/image/writeimg.c b/Build/source/texk/web2c/luatexdir/image/writeimg.c index 1e9831159ab..bf9d3c4e8a7 100644 --- a/Build/source/texk/web2c/luatexdir/image/writeimg.c +++ b/Build/source/texk/web2c/luatexdir/image/writeimg.c @@ -33,8 +33,8 @@ #include <../lua51/lauxlib.h> static const char _svn_version[] = - "$Id: writeimg.c 2336 2009-04-19 08:38:24Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/image/writeimg.c $"; + "$Id: writeimg.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/image/writeimg.c $"; /**********************************************************************/ /* diff --git a/Build/source/texk/web2c/luatexdir/image/writeimg.h b/Build/source/texk/web2c/luatexdir/image/writeimg.h index a2d0c48da48..3f3937658b9 100644 --- a/Build/source/texk/web2c/luatexdir/image/writeimg.h +++ b/Build/source/texk/web2c/luatexdir/image/writeimg.h @@ -18,7 +18,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: writeimg.h 2327 2009-04-18 12:47:21Z hhenkel $ */ +/* $Id: writeimg.h 2448 2009-06-08 07:43:50Z taco $ */ #ifndef WRITEIMG_H # define WRITEIMG_H @@ -44,8 +44,8 @@ integer image_objnum(integer); integer image_pages(integer); integer image_width(integer); integer img_to_array(image *); -integer read_image(integer, integer, str_number, integer, str_number, str_number, - integer, integer, integer, integer); +integer read_image(integer, integer, str_number, integer, str_number, + str_number, integer, integer, integer, integer); void check_pdfstream_dict(image_dict *); void dumpimagemeta(void); void free_image_dict(image_dict * p); diff --git a/Build/source/texk/web2c/luatexdir/image/writejbig2.c b/Build/source/texk/web2c/luatexdir/image/writejbig2.c index 83a66676d54..c275c71e718 100644 --- a/Build/source/texk/web2c/luatexdir/image/writejbig2.c +++ b/Build/source/texk/web2c/luatexdir/image/writejbig2.c @@ -82,7 +82,7 @@ object exists, reference it. Else create fresh one. static const char _svn_version[] = "$Id: writejbig2.c 2315 2009-04-17 23:34:42Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/image/writejbig2.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/image/writejbig2.c $"; #undef DEBUG diff --git a/Build/source/texk/web2c/luatexdir/image/writejpg.c b/Build/source/texk/web2c/luatexdir/image/writejpg.c index 13197ace07f..32d8cc73397 100644 --- a/Build/source/texk/web2c/luatexdir/image/writejpg.c +++ b/Build/source/texk/web2c/luatexdir/image/writejpg.c @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: writejpg.c 2320 2009-04-18 08:52:30Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/image/writejpg.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/image/writejpg.c $"; #define JPG_GRAY 1 /* Gray color space, use /DeviceGray */ #define JPG_RGB 3 /* RGB color space, use /DeviceRGB */ diff --git a/Build/source/texk/web2c/luatexdir/image/writepng.c b/Build/source/texk/web2c/luatexdir/image/writepng.c index 33bd1c1e780..c3ecf9fa57d 100644 --- a/Build/source/texk/web2c/luatexdir/image/writepng.c +++ b/Build/source/texk/web2c/luatexdir/image/writepng.c @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: writepng.c 2317 2009-04-18 00:12:18Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/image/writepng.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/image/writepng.c $"; static int transparent_page_group = -1; diff --git a/Build/source/texk/web2c/luatexdir/lang/texlang.c b/Build/source/texk/web2c/luatexdir/lang/texlang.c index 8678a2615a0..573106e830d 100644 --- a/Build/source/texk/web2c/luatexdir/lang/texlang.c +++ b/Build/source/texk/web2c/luatexdir/lang/texlang.c @@ -27,7 +27,7 @@ #include "hyphen.h" static const char _svn_version[] = - "$Id: texlang.c 2338 2009-04-20 06:37:43Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/lang/texlang.c $"; + "$Id: texlang.c 2450 2009-06-08 08:30:52Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/lang/texlang.c $"; /* functions from the fontforge unicode library */ @@ -223,7 +223,7 @@ integer get_post_exhyphen_char(integer n) void load_patterns(struct tex_language *lang, unsigned char *buffer) { - if (lang == NULL || buffer == NULL || strlen((char *)buffer) == 0) + if (lang == NULL || buffer == NULL || strlen((char *) buffer) == 0) return; if (lang->patterns == NULL) { lang->patterns = hnj_hyphen_new(); @@ -247,7 +247,12 @@ void load_tex_patterns(int curlang, halfword head) } -#define STORE_CHAR(x) { word[w] = x ; if (w<MAX_WORD_LEN) w++; } +#define STORE_CHAR(x) do { \ + int xx = get_lc_code(x); \ + if (xx==0) xx = 0xFFFE; \ + word[w] = xx; \ + if (w<MAX_WORD_LEN) w++; \ + } while (0) /* todo change this! */ @@ -852,7 +857,7 @@ void hnj_hyphenation(halfword head, halfword tail) clang == char_lang(r) && (lchar = get_lc_code(character(r))) > 0) { wordlen++; - hy = utf8_idpb(hy, character(r)); + hy = utf8_idpb(hy, lchar); /* this should not be needed any more */ /*if (vlink(r)!=null) alink(vlink(r))=r; */ end_word = r; diff --git a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c index a5809a72bd9..5f7a656e598 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 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/lcallbacklib.c $"; + "$Id: lcallbacklib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/lcallbacklib.c $"; extern int do_run_callback(int special, char *values, va_list vl); extern int lua_traceback(lua_State * L); @@ -430,10 +430,10 @@ static int callback_register(lua_State * L) { int cb; char *s; - if (!lua_isstring(L, 1) || - ((!lua_isfunction(L, 2)) && - (!lua_isnil(L, 2)) && - (!(lua_isboolean(L, 2) && lua_toboolean(L,2)==0)))) { + if (!lua_isstring(L, 1) || + ((!lua_isfunction(L, 2)) && + (!lua_isnil(L, 2)) && + (!(lua_isboolean(L, 2) && lua_toboolean(L, 2) == 0)))) { lua_pushnil(L); lua_pushstring(L, "Invalid arguments to callback.register."); return 2; diff --git a/Build/source/texk/web2c/luatexdir/lua/lfontlib.c b/Build/source/texk/web2c/luatexdir/lua/lfontlib.c index a2555c3079f..6debdc768f0 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lfontlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lfontlib.c @@ -22,7 +22,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: lfontlib.c 2349 2009-04-22 12:13:26Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/lfontlib.c $"; + "$Id: lfontlib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/lfontlib.c $"; #define TIMERS 0 @@ -34,12 +34,12 @@ static const char _svn_version[] = /* this function is in vfovf.c for the moment */ extern int make_vf_table(lua_State * L, char *name, scaled s); -static int get_fontid (void) +static int get_fontid(void) { - if (font_tables==NULL || font_tables[0]==NULL) { - create_null_font(); - } - return new_font(); + if (font_tables == NULL || font_tables[0] == NULL) { + create_null_font(); + } + return new_font(); } static int font_read_tfm(lua_State * L) @@ -222,7 +222,7 @@ static int deffont(lua_State * L) tvdiff -= (double) tva.tv_usec; tvdiff /= 1000000; fprintf(stdout, "font.define(%s,%i): %f seconds\n", - font_fullname(i),i, tvdiff); + font_fullname(i), i, tvdiff); #endif lua_pushnumber(L, i); return 1; diff --git a/Build/source/texk/web2c/luatexdir/lua/limglib.c b/Build/source/texk/web2c/luatexdir/lua/limglib.c index 68504b87cb4..dfbf4cd5393 100644 --- a/Build/source/texk/web2c/luatexdir/lua/limglib.c +++ b/Build/source/texk/web2c/luatexdir/lua/limglib.c @@ -27,7 +27,7 @@ static const char _svn_version[] = "$Id: limglib.c 2329 2009-04-18 14:25:30Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/limglib.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/limglib.c $"; /**********************************************************************/ diff --git a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c index abe01205b61..b10266cb630 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c @@ -25,7 +25,7 @@ #include <kpathsea/readable.h> static const char _svn_version[] = - "$Id: lkpselib.c 2414 2009-06-03 12:57:01Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/lkpselib.c $"; + "$Id: lkpselib.c 2414 2009-06-03 12:57:01Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/lkpselib.c $"; static const int 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 91259aba4e2..181bd925547 100644 --- a/Build/source/texk/web2c/luatexdir/lua/llanglib.c +++ b/Build/source/texk/web2c/luatexdir/lua/llanglib.c @@ -23,7 +23,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: llanglib.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/llanglib.c $"; + "$Id: llanglib.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/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 f8ddef81d23..8eac56331e7 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 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/llualib.c $"; + "$Id: llualib.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/llualib.c $"; #define LOAD_BUF_SIZE 256 #define UINT_MAX32 0xFFFFFFFF diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c index 18a593978a5..7caa296ab44 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c @@ -25,7 +25,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: lnodelib.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/lnodelib.c $"; + "$Id: lnodelib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/lnodelib.c $"; #define init_luaS_index(a) do { \ lua_pushliteral(L,#a); \ @@ -1093,11 +1093,11 @@ static void lua_nodelib_getfield_whatsit(lua_State * L, int n, int field) lua_pushnumber(L, pdf_literal_mode(n)); break; case 5: - if (pdf_literal_type(n)==lua_refid_literal) { - lua_rawgeti(Luas, LUA_REGISTRYINDEX, pdf_literal_data(n)); - } else { - tokenlist_to_luastring(L, pdf_literal_data(n)); - } + if (pdf_literal_type(n) == lua_refid_literal) { + lua_rawgeti(Luas, LUA_REGISTRYINDEX, pdf_literal_data(n)); + } else { + tokenlist_to_luastring(L, pdf_literal_data(n)); + } break; default: lua_pushnil(L); @@ -2166,11 +2166,11 @@ static int lua_nodelib_setfield_whatsit(lua_State * L, int n, int field) if (ini_version) { pdf_literal_data(n) = nodelib_gettoks(L, 3); } else { - lua_pushvalue(L,3); - pdf_literal_data(n) = luaL_ref(L,LUA_REGISTRYINDEX); - pdf_literal_type(n) = lua_refid_literal; + lua_pushvalue(L, 3); + pdf_literal_data(n) = luaL_ref(L, LUA_REGISTRYINDEX); + pdf_literal_type(n) = lua_refid_literal; } - break; + break; default: return nodelib_cantset(L, field, n); } diff --git a/Build/source/texk/web2c/luatexdir/lua/loslibext.c b/Build/source/texk/web2c/luatexdir/lua/loslibext.c index 847b9a56f56..d06d1c9fb22 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 2376 2009-05-08 08:40:13Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/loslibext.c $"; + "$Id: loslibext.c 2376 2009-05-08 08:40:13Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/loslibext.c $"; #if defined(_WIN32) || defined(WIN32) || defined(__NT__) # define MKDIR(a,b) mkdir(a) diff --git a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c index 35261fdc5a0..77b25b8d752 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: lpdflib.c 2329 2009-04-18 14:25:30Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/lpdflib.c $"; + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/lpdflib.c $"; static int findcurv(lua_State * L) { diff --git a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c index 56494874f76..376523484f8 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c @@ -22,7 +22,7 @@ static const char _svn_version[] = - "$Id: lstatslib.c 2306 2009-04-16 15:01:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/lstatslib.c $"; + "$Id: lstatslib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/lstatslib.c $"; typedef struct statistic { const char *name; @@ -189,10 +189,10 @@ static int do_getstat(lua_State * L, int i) lua_pushboolean(L, g()); break; case 'n': - if (*(halfword *) (stats[i].value)!=0) - lua_nodelib_push_fast(L, *(halfword *) (stats[i].value)); + if (*(halfword *) (stats[i].value) != 0) + lua_nodelib_push_fast(L, *(halfword *) (stats[i].value)); else - lua_pushnil(L); + lua_pushnil(L); break; case 'b': lua_pushboolean(L, *(integer *) (stats[i].value)); @@ -219,7 +219,7 @@ static int getstats(lua_State * L) static int setstats(lua_State * L) { - (void)L; + (void) L; return 0; } diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c b/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c index 74f7ddb6795..670e26f90a8 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 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/ltexiolib.c $"; + "$Id: ltexiolib.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/ltexiolib.c $"; typedef void (*texio_printer) (str_number s); diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c index 785bf67f4e4..2813caee2bc 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c @@ -24,7 +24,7 @@ #include "tokens.h" static const char _svn_version[] = - "$Id: ltexlib.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/ltexlib.c $"; + "$Id: ltexlib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/ltexlib.c $"; extern halfword *check_isnode(lua_State * L, int ud); extern void lua_nodelib_push_fast(lua_State * L, halfword n); @@ -270,24 +270,23 @@ int dimen_to_number(lua_State * L, char *s) } -integer -get_item_index (lua_State *L, int i, integer base) +integer get_item_index(lua_State * L, int i, integer base) { size_t kk; integer k; int cur_cs; char *s; - if (lua_type(L, i) == LUA_TSTRING) { - s = (char *) lua_tolstring(L, i , &kk); + if (lua_type(L, i) == LUA_TSTRING) { + s = (char *) lua_tolstring(L, i, &kk); cur_cs = string_lookup(s, kk); - if (cur_cs==static_undefined_control_sequence || - is_undefined_cs(cur_cs)) { - k = -1; /* guarandeed invalid */ - } else { - k = (zget_equiv(cur_cs) - base); - } + if (cur_cs == static_undefined_control_sequence || + is_undefined_cs(cur_cs)) { + k = -1; /* guarandeed invalid */ + } else { + k = (zget_equiv(cur_cs) - base); + } } else { - k = (integer) luaL_checkinteger(L, i ); + k = (integer) luaL_checkinteger(L, i); } return k; } @@ -297,9 +296,9 @@ static int vsetdimen(lua_State * L, int is_global) { int i, j, err; integer k; - integer save_global_defs = int_par(param_global_defs_code); + integer save_global_defs = int_par(param_global_defs_code); if (is_global) - int_par(param_global_defs_code) = 1; + int_par(param_global_defs_code) = 1; i = lua_gettop(L); j = 0; /* find the value */ @@ -311,7 +310,7 @@ static int vsetdimen(lua_State * L, int is_global) lua_error(L); } else j = (int) lua_tonumber(L, i); - k = get_item_index(L, (i-1), get_scaled_base()); + k = get_item_index(L, (i - 1), get_scaled_base()); check_index_range(k, "setdimen"); err = set_tex_dimen_register(k, j); int_par(param_global_defs_code) = save_global_defs; @@ -324,14 +323,14 @@ static int vsetdimen(lua_State * L, int is_global) static int setdimen(lua_State * L) { - int isglobal = 0; - int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; - } - return vsetdimen (L, isglobal); + int isglobal = 0; + int n = lua_gettop(L); + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; + } + return vsetdimen(L, isglobal); } static int getdimen(lua_State * L) @@ -350,13 +349,13 @@ static int vsetskip(lua_State * L, int is_global) int i, err; halfword *j; integer k; - integer save_global_defs = int_par(param_global_defs_code); + integer save_global_defs = int_par(param_global_defs_code); if (is_global) - int_par(param_global_defs_code) = 1; + int_par(param_global_defs_code) = 1; i = lua_gettop(L); j = check_isnode(L, i); /* the value */ - k = get_item_index(L, (i-1), get_skip_base()); - check_index_range(k, "setskip"); /* the index */ + k = get_item_index(L, (i - 1), get_skip_base()); + check_index_range(k, "setskip"); /* the index */ err = set_tex_skip_register(k, *j); int_par(param_global_defs_code) = save_global_defs; if (err) { @@ -368,14 +367,14 @@ static int vsetskip(lua_State * L, int is_global) static int setskip(lua_State * L) { - int isglobal = 0; - int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; - } - return vsetskip (L, isglobal); + int isglobal = 0; + int n = lua_gettop(L); + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; + } + return vsetskip(L, isglobal); } int getskip(lua_State * L) @@ -395,12 +394,12 @@ static int vsetcount(lua_State * L, int is_global) { int i, j, err; integer k; - integer save_global_defs = int_par(param_global_defs_code); + integer save_global_defs = int_par(param_global_defs_code); if (is_global) - int_par(param_global_defs_code) = 1; + int_par(param_global_defs_code) = 1; i = lua_gettop(L); j = (int) luaL_checkinteger(L, i); - k = get_item_index(L, (i-1), get_count_base()); + k = get_item_index(L, (i - 1), get_count_base()); check_index_range(k, "setcount"); err = set_tex_count_register(k, j); int_par(param_global_defs_code) = save_global_defs; @@ -415,12 +414,12 @@ static int setcount(lua_State * L) { int isglobal = 0; int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; } - return vsetcount (L, isglobal); + return vsetcount(L, isglobal); } static int getcount(lua_State * L) @@ -428,7 +427,7 @@ static int getcount(lua_State * L) int j; integer k; k = get_item_index(L, lua_gettop(L), get_count_base()); - check_index_range(k,"getcount"); + check_index_range(k, "getcount"); j = get_tex_count_register(k); lua_pushnumber(L, j); return 1; @@ -439,13 +438,13 @@ static int vsetattribute(lua_State * L, int is_global) { int i, j, err; integer k; - integer save_global_defs = int_par(param_global_defs_code); + integer save_global_defs = int_par(param_global_defs_code); if (is_global) int_par(param_global_defs_code) = 1; i = lua_gettop(L); j = (int) luaL_checkinteger(L, i); - k = get_item_index(L, (i-1), get_attribute_base()); - check_index_range(k,"setattribute"); + k = get_item_index(L, (i - 1), get_attribute_base()); + check_index_range(k, "setattribute"); err = set_tex_attribute_register(k, j); int_par(param_global_defs_code) = save_global_defs; if (err) { @@ -459,12 +458,12 @@ static int setattribute(lua_State * L) { int isglobal = 0; int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; } - return vsetattribute (L, isglobal); + return vsetattribute(L, isglobal); } static int getattribute(lua_State * L) @@ -472,7 +471,7 @@ static int getattribute(lua_State * L) int j; integer k; k = get_item_index(L, lua_gettop(L), get_attribute_base()); - check_index_range(k,"getattribute"); + check_index_range(k, "getattribute"); j = get_tex_attribute_register(k); lua_pushnumber(L, j); return 1; @@ -484,17 +483,17 @@ int vsettoks(lua_State * L, int is_global) size_t len; integer k; char *st; - integer save_global_defs = int_par(param_global_defs_code); + integer save_global_defs = int_par(param_global_defs_code); if (is_global) - int_par(param_global_defs_code) = 1; + int_par(param_global_defs_code) = 1; i = lua_gettop(L); if (!lua_isstring(L, i)) { lua_pushstring(L, "unsupported value type"); lua_error(L); } st = (char *) lua_tolstring(L, i, &len); - k = get_item_index (L, (i-1), get_toks_base()); - check_index_range(k,"settoks"); + k = get_item_index(L, (i - 1), get_toks_base()); + check_index_range(k, "settoks"); j = maketexlstring(st, len); err = zset_tex_toks_register(k, j); int_par(param_global_defs_code) = save_global_defs; @@ -506,24 +505,24 @@ int vsettoks(lua_State * L, int is_global) return 0; } -static int settoks (lua_State * L) +static int settoks(lua_State * L) { int isglobal = 0; int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; } - return vsettoks (L, isglobal); + return vsettoks(L, isglobal); } static int gettoks(lua_State * L) { integer k; str_number t; - k = get_item_index (L, lua_gettop(L), get_toks_base()); - check_index_range(k,"gettoks"); + k = get_item_index(L, lua_gettop(L), get_toks_base()); + check_index_range(k, "gettoks"); t = get_tex_toks_register(k); lua_pushstring(L, makecstring(t)); flush_str(t); @@ -554,7 +553,7 @@ static int getbox(lua_State * L) { int k, t; k = get_box_id(L, -1); - check_index_range(k,"getbox"); + check_index_range(k, "getbox"); t = get_tex_box_register(k); nodelist_to_lua(L, t); return 1; @@ -563,11 +562,11 @@ static int getbox(lua_State * L) static int vsetbox(lua_State * L, int is_global) { int i, j, k, err; - integer save_global_defs = int_par(param_global_defs_code); + integer save_global_defs = int_par(param_global_defs_code); if (is_global) - int_par(param_global_defs_code) = 1; + int_par(param_global_defs_code) = 1; k = get_box_id(L, -2); - check_index_range(k,"setbox"); + check_index_range(k, "setbox"); i = get_tex_box_register(k); if (lua_isboolean(L, -1)) { j = lua_toboolean(L, -1); @@ -591,12 +590,12 @@ static int setbox(lua_State * L) { int isglobal = 0; int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; } - return vsetbox (L, isglobal); + return vsetbox(L, isglobal); } static int getboxdim(lua_State * L, int whichdim) @@ -640,9 +639,9 @@ int getboxdp(lua_State * L) static int vsetboxdim(lua_State * L, int whichdim, int is_global) { int i, j, k, err; - integer save_global_defs = int_par(param_global_defs_code); + integer save_global_defs = int_par(param_global_defs_code); if (is_global) - int_par(param_global_defs_code) = 1; + int_par(param_global_defs_code) = 1; i = lua_gettop(L); if (!lua_isnumber(L, i)) { j = dimen_to_number(L, (char *) lua_tostring(L, i)); @@ -678,10 +677,10 @@ static int setboxwd(lua_State * L) { int isglobal = 0; int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; } return vsetboxdim(L, width_offset, isglobal); } @@ -690,10 +689,10 @@ static int setboxht(lua_State * L) { int isglobal = 0; int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; } return vsetboxdim(L, height_offset, isglobal); } @@ -702,10 +701,10 @@ static int setboxdp(lua_State * L) { int isglobal = 0; int n = lua_gettop(L); - if (n==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) - isglobal = 1; + if (n == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) + isglobal = 1; } return vsetboxdim(L, depth_offset, isglobal); } @@ -723,9 +722,9 @@ int settex(lua_State * L) st = (char *) lua_tolstring(L, (i - 1), &k); texstr = maketexlstring(st, k); if (is_primitive(texstr)) { - if (i==3 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) + if (i == 3 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) isglobal = 1; } cur_cs = string_lookup(st, k); @@ -733,8 +732,9 @@ int settex(lua_State * L) cur_cmd = zget_eq_type(cur_cs); if (is_int_assign(cur_cmd)) { if (lua_isnumber(L, i)) { - assign_internal_value((isglobal?4:0), zget_equiv(cur_cs), - lua_tonumber(L, i)); + assign_internal_value((isglobal ? 4 : 0), + zget_equiv(cur_cs), lua_tonumber(L, + i)); } else { lua_pushstring(L, "unsupported value type"); lua_error(L); @@ -748,9 +748,10 @@ int settex(lua_State * L) lua_error(L); } } else { - j = (int) lua_tonumber(L, i); + j = (int) lua_tonumber(L, i); } - assign_internal_value((isglobal?4:0), zget_equiv(cur_cs), j); + assign_internal_value((isglobal ? 4 : 0), zget_equiv(cur_cs), + j); } else { lua_pushstring(L, "unsupported tex internal assignment"); lua_error(L); @@ -934,37 +935,37 @@ int do_lastitem(lua_State * L, int cur_code) return retval; } -static int tex_setmathparm (lua_State *L) +static int tex_setmathparm(lua_State * L) { int i, j; scaled k; int n; int l = cur_level; n = lua_gettop(L); - - if ((n == 3) || (n == 4)) { - if (n==4 && lua_isstring(L,1)) { - char *s = (char *)lua_tostring(L,1); - if (strcmp(s,"global")==0) + + if ((n == 3) || (n == 4)) { + if (n == 4 && lua_isstring(L, 1)) { + char *s = (char *) lua_tostring(L, 1); + if (strcmp(s, "global") == 0) l = 1; - } - i = luaL_checkoption(L, (n-2), NULL, math_param_names); - j = luaL_checkoption(L, (n-1), NULL, math_style_names); - k = (scaled)lua_tonumber(L, n); - def_math_param (i,j,k, l); + } + i = luaL_checkoption(L, (n - 2), NULL, math_param_names); + j = luaL_checkoption(L, (n - 1), NULL, math_style_names); + k = (scaled) lua_tonumber(L, n); + def_math_param(i, j, k, l); } return 0; } -static int tex_getmathparm (lua_State *L) +static int tex_getmathparm(lua_State * L) { int i, j; scaled k; if ((lua_gettop(L) == 2)) { i = luaL_checkoption(L, 1, NULL, math_param_names); j = luaL_checkoption(L, 2, NULL, math_style_names); - k = get_math_param (i,j); - lua_pushnumber(L, k); + k = get_math_param(i, j); + lua_pushnumber(L, k); } return 1; } diff --git a/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c b/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c index 76a7aaa8faa..673286e4666 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c @@ -22,7 +22,7 @@ #include "tokens.h" static const char _svn_version[] = - "$Id: ltokenlib.c 2306 2009-04-16 15:01:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/ltokenlib.c $"; + "$Id: ltokenlib.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/ltokenlib.c $"; extern int get_command_id(char *); @@ -204,7 +204,7 @@ static int run_get_next(lua_State * L) static int run_expand(lua_State * L) { - (void)L; + (void) L; expand(); return 0; } diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.c b/Build/source/texk/web2c/luatexdir/lua/luainit.c index 11b0d8d1900..eb4a492f7b1 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luainit.c +++ b/Build/source/texk/web2c/luatexdir/lua/luainit.c @@ -25,7 +25,7 @@ #include <luatexdir/luatexextra.h> static const char _svn_version[] = - "$Id: luainit.c 2376 2009-05-08 08:40:13Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/luainit.c $"; + "$Id: luainit.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/luainit.c $"; /* TH: TODO * @@ -626,9 +626,9 @@ void lua_initialize(int ac, char **av) } } -void -check_texconfig_init (void) { - if (Luas!=NULL) { +void check_texconfig_init(void) +{ + if (Luas != NULL) { lua_getglobal(Luas, "texconfig"); if (lua_istable(Luas, -1)) { lua_getfield(Luas, -1, "init"); @@ -636,7 +636,8 @@ check_texconfig_init (void) { int i = lua_pcall(Luas, 0, 0, 0); if (i != 0) { /* Can't be more precise here, called before TeX initialization */ - fprintf(stderr, "This went wrong: %s\n", lua_tostring(Luas, -1)); + fprintf(stderr, "This went wrong: %s\n", + lua_tostring(Luas, -1)); error(); } } @@ -644,20 +645,20 @@ check_texconfig_init (void) { } } -void write_svnversion(char *v) -{ +void write_svnversion(char *v) +{ char *a_head, *n; char *a = strdup(v); size_t l = strlen("$Id: luatex.web "); if (a != NULL) { a_head = a; - if (strlen(a)>l) - a+=l; + if (strlen(a) > l) + a += l; n = a; - while (*n!='\0' && *n!=' ') + while (*n != '\0' && *n != ' ') n++; *n = '\0'; - fprintf(stdout, " luatex.web >= v%s", a); - free (a_head); + fprintf(stdout, " luatex.web >= v%s", a); + free(a_head); } } diff --git a/Build/source/texk/web2c/luatexdir/lua/luanode.c b/Build/source/texk/web2c/luatexdir/lua/luanode.c index 4ea14bbfda5..6a27fcf9f36 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luanode.c +++ b/Build/source/texk/web2c/luatexdir/lua/luanode.c @@ -22,7 +22,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: luanode.c 2284 2009-04-14 12:58:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/luanode.c $"; + "$Id: luanode.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/luanode.c $"; #undef link /* defined by cpascal.h */ #define info(a) fixmem[(a)].hhlh @@ -62,8 +62,8 @@ void lua_node_filter_s(int filterid, char *extrainfo) lua_State *L = Luas; int s_top = lua_gettop(L); int callback_id = callback_defined(filterid); - if (callback_id<=0) - return; + if (callback_id <= 0) + return; if (!get_callback(L, callback_id)) { lua_settop(L, s_top); return; @@ -267,48 +267,44 @@ int visible_last_node_type(int n) return last_known_node + 1; } -void -lua_pdf_literal (int i) +void lua_pdf_literal(int i) { - char *s = NULL; - size_t l = 0; - lua_rawgeti(Luas, LUA_REGISTRYINDEX, i); - s = (char *)lua_tolstring(Luas,-1,&l); - while (l--) { - pdf_room(1); - pdf_buf[pdf_ptr++] = *s++; - } - pdf_buf[pdf_ptr++] = 10; /* pdf_print_nl */ - lua_pop(Luas,1); + char *s = NULL; + size_t l = 0; + lua_rawgeti(Luas, LUA_REGISTRYINDEX, i); + s = (char *) lua_tolstring(Luas, -1, &l); + while (l--) { + pdf_room(1); + pdf_buf[pdf_ptr++] = *s++; + } + pdf_buf[pdf_ptr++] = 10; /* pdf_print_nl */ + lua_pop(Luas, 1); } -void -copy_pdf_literal (pointer r, pointer p) +void copy_pdf_literal(pointer r, pointer p) { - pdf_literal_type(r) = pdf_literal_type(p); - pdf_literal_mode(r) = pdf_literal_mode(p); - if (pdf_literal_type(p)==normal) { - pdf_literal_data(r) = pdf_literal_data(p); - add_token_ref(pdf_literal_data(p)); - } else { - lua_rawgeti(Luas, LUA_REGISTRYINDEX, pdf_literal_data(p)); - pdf_literal_data(r) = luaL_ref(Luas, LUA_REGISTRYINDEX); - } + pdf_literal_type(r) = pdf_literal_type(p); + pdf_literal_mode(r) = pdf_literal_mode(p); + if (pdf_literal_type(p) == normal) { + pdf_literal_data(r) = pdf_literal_data(p); + add_token_ref(pdf_literal_data(p)); + } else { + lua_rawgeti(Luas, LUA_REGISTRYINDEX, pdf_literal_data(p)); + pdf_literal_data(r) = luaL_ref(Luas, LUA_REGISTRYINDEX); + } } -void -free_pdf_literal (pointer p) +void free_pdf_literal(pointer p) { - if (pdf_literal_type(p)==normal) { - delete_token_ref(pdf_literal_data(p)); - } else { - luaL_unref(Luas, LUA_REGISTRYINDEX, pdf_literal_data(p)); - } + if (pdf_literal_type(p) == normal) { + delete_token_ref(pdf_literal_data(p)); + } else { + luaL_unref(Luas, LUA_REGISTRYINDEX, pdf_literal_data(p)); + } } -void -show_pdf_literal (pointer p) +void show_pdf_literal(pointer p) { tprint_esc("pdfliteral"); switch (pdf_literal_mode(p)) { @@ -316,19 +312,19 @@ show_pdf_literal (pointer p) break; case direct_page: tprint(" page"); - break; + break; case direct_always: tprint(" direct"); - break; + break; default: tconfusion("literal2"); - break; + break; } - if (pdf_literal_type(p)==normal) { + if (pdf_literal_type(p) == normal) { print_mark(pdf_literal_data(p)); } else { lua_rawgeti(Luas, LUA_REGISTRYINDEX, pdf_literal_data(p)); - tprint((char *)lua_tostring(Luas,-1)); - lua_pop(Luas,1); + tprint((char *) lua_tostring(Luas, -1)); + lua_pop(Luas, 1); } -} +} diff --git a/Build/source/texk/web2c/luatexdir/lua/luastuff.c b/Build/source/texk/web2c/luatexdir/lua/luastuff.c index ed38e5e510f..7cc81a1799f 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luastuff.c +++ b/Build/source/texk/web2c/luatexdir/lua/luastuff.c @@ -21,7 +21,7 @@ #include <ptexlib.h> static const char _svn_version[] = - "$Id: luastuff.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/luastuff.c $"; + "$Id: luastuff.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/luastuff.c $"; lua_State *Luas = NULL; diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex.c b/Build/source/texk/web2c/luatexdir/lua/luatex.c index 0c29ebfb059..11b6836cacb 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatex.c +++ b/Build/source/texk/web2c/luatexdir/lua/luatex.c @@ -22,7 +22,7 @@ #include <zlib.h> static const char _svn_version[] = - "$Id: luatex.c 2306 2009-04-16 15:01:45Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/luatex.c $"; + "$Id: luatex.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/luatex.c $"; /* do this aleph stuff here, for now */ @@ -251,7 +251,7 @@ static gzFile gz_fmtfile = NULL; void do_zdump(char *p, int item_size, int nitems, FILE * out_file) { int err; - (void)out_file; + (void) out_file; if (nitems == 0) return; if (gzwrite(gz_fmtfile, (void *) p, item_size * nitems) != @@ -265,7 +265,7 @@ void do_zdump(char *p, int item_size, int nitems, FILE * out_file) void do_zundump(char *p, int item_size, int nitems, FILE * in_file) { int err; - (void)in_file; + (void) in_file; if (nitems == 0) return; if (gzread(gz_fmtfile, (void *) p, item_size * nitems) <= 0) { @@ -325,7 +325,7 @@ boolean zopen_w_output(FILE ** f, const_string fopen_mode) void zwclose(FILE * f) { - (void)f; + (void) f; gzclose(gz_fmtfile); } diff --git a/Build/source/texk/web2c/luatexdir/lua/luatoken.c b/Build/source/texk/web2c/luatexdir/lua/luatoken.c index c6a33ee85f0..3bd703ac515 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatoken.c +++ b/Build/source/texk/web2c/luatexdir/lua/luatoken.c @@ -24,7 +24,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: luatoken.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/luatoken.c $"; + "$Id: luatoken.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/luatoken.c $"; command_item command_names[] = { {"relax", relax_cmd, NULL}, diff --git a/Build/source/texk/web2c/luatexdir/lua/texluac.c b/Build/source/texk/web2c/luatexdir/lua/texluac.c index 8d62a3a885b..ea05bb270f7 100644 --- a/Build/source/texk/web2c/luatexdir/lua/texluac.c +++ b/Build/source/texk/web2c/luatexdir/lua/texluac.c @@ -46,7 +46,7 @@ #include <../lua51/lundump.h> static const char _svn_version[] = - "$Id: texluac.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/lua/texluac.c $"; + "$Id: texluac.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/lua/texluac.c $"; #define PROGNAME "texluac" /* default program name */ #define OUTPUT PROGNAME ".out" /* default output file */ diff --git a/Build/source/texk/web2c/luatexdir/luatex-api.h b/Build/source/texk/web2c/luatexdir/luatex-api.h index 9e7ba2a16b0..8cb7363e216 100644 --- a/Build/source/texk/web2c/luatexdir/luatex-api.h +++ b/Build/source/texk/web2c/luatexdir/luatex-api.h @@ -126,4 +126,3 @@ extern command_item command_names[]; extern int callback_callbacks_id; extern void luainterpreter(void); - diff --git a/Build/source/texk/web2c/luatexdir/luatex.web b/Build/source/texk/web2c/luatexdir/luatex.web index 9186d5a0e92..b7e8e0f8949 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.web +++ b/Build/source/texk/web2c/luatexdir/luatex.web @@ -250,8 +250,8 @@ known as `\eTeX'. @d pdftex_version_string=='-2.00.0' {current \pdfTeX\ version} @# @d luatex_version==40 { \.{\\luatexversion} } -@d luatex_revision=="2" { \.{\\luatexrevision} } -@d luatex_version_string=='beta-0.40.2' {current \LuaTeX\ version} +@d luatex_revision=="3" { \.{\\luatexrevision} } +@d luatex_version_string=='beta-0.40.3' {current \LuaTeX\ version} @d luatex_date_info==-extra_version_info { the compile date is negated } @d luatex_svnversion=='$Id$' {for long --version information, as proposed by Peter M\"unster} @@ -11839,7 +11839,7 @@ if callback_defined(start_run_callback)=0 then begin @.**@> l:=input_stack[0].limit_field; {last position of first line} if buffer[l]=end_line_char then decr(l); { TODO: multichar endlinechar} - for k:=1 to l do print(buffer[k]); + for k:=1 to l do print_char(buffer[k]); print_ln; {now the transcript file contains the first line of input} end; flush_loggable_info; {should be done always} @@ -11900,7 +11900,7 @@ if tracefilenames then begin if term_offset+length(name)>max_print_line-2 then print_ln else if (term_offset>0)or(file_offset>0) then print_char(" "); print_char("("); - slow_print(name); + print_file_name(0,name,0); end; incr(open_parens); update_terminal; @@ -21283,7 +21283,7 @@ node $r_j$ is followed by |r@t$_{j+1}$@>=vlink(r@t$_j$@>)|; and if there are each node in this list refers to an insertion number; for example, `\.{\\insert 250}' would correspond to a node whose |subtype| is |qi(250)| (the same as the |subtype| field of the relevant |ins_node|). These |subtype| -fields are in increasing order, and |subtype(page_ins_head)=65535, so +fields are in increasing order, and |subtype(page_ins_head)=65535|, so |page_ins_head| serves as a convenient sentinel at the end of the list. A record is present for each insertion number that appears in the current page. @@ -21483,7 +21483,7 @@ last_glue:=max_halfword; last_penalty:=0; last_kern:=0; last_node_type:=-1; page_depth:=0; page_max_depth:=0 -@ At certain times box \outputbox is supposed to be void (i.e., |null|), +@ At certain times box \.{\\outputbox} is supposed to be void (i.e., |null|), or an insertion box is supposed to be ready to accept a vertical list. If not, an error message is printed, and the following subroutine flushes the unwanted contents, reporting them to the user. @@ -23279,7 +23279,7 @@ begin if cur_cmd=vadjust then cur_val:=output_box else begin scan_register_num; if cur_val=output_box then begin print_err("You can't "); print_esc("insert"); print_int(output_box); -@.You can't \\insert\outputbox@> +@.You can't \\insert\\outputbox@> help1("I'm changing to \insert0; box \outputbox is special."); error; cur_val:=0; end; diff --git a/Build/source/texk/web2c/luatexdir/makecpool.c b/Build/source/texk/web2c/luatexdir/makecpool.c index afb45ac2c62..218c7e668b0 100644 --- a/Build/source/texk/web2c/luatexdir/makecpool.c +++ b/Build/source/texk/web2c/luatexdir/makecpool.c @@ -6,7 +6,7 @@ #include <stdlib.h> static const char __svn_version[] = - "$Id: makecpool.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/makecpool.c $"; + "$Id: makecpool.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/makecpool.c $"; int main(int argc, char *argv[]) { diff --git a/Build/source/texk/web2c/luatexdir/managed-sa.c b/Build/source/texk/web2c/luatexdir/managed-sa.c index 544d5f4ceae..118f07ee5ac 100644 --- a/Build/source/texk/web2c/luatexdir/managed-sa.c +++ b/Build/source/texk/web2c/luatexdir/managed-sa.c @@ -22,7 +22,7 @@ #include "managed-sa.h" static const char __svn_version[] = - "$Id$ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/managed-sa.c $"; + "$Id$ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/managed-sa.c $"; static void store_sa_stack(sa_tree a, integer n, integer v, integer gl) { diff --git a/Build/source/texk/web2c/luatexdir/mathcodes.c b/Build/source/texk/web2c/luatexdir/mathcodes.c index 7e1f9afa96f..bd5a1990833 100644 --- a/Build/source/texk/web2c/luatexdir/mathcodes.c +++ b/Build/source/texk/web2c/luatexdir/mathcodes.c @@ -26,7 +26,7 @@ extern void rawset_sa_item(sa_tree head, integer n, integer v); static const char __svn_version[] = - "$Id$ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/mathcodes.c $"; + "$Id$ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/mathcodes.c $"; /* math codes */ diff --git a/Build/source/texk/web2c/luatexdir/nodes.h b/Build/source/texk/web2c/luatexdir/nodes.h index 36488e1031c..6c74123a9f0 100644 --- a/Build/source/texk/web2c/luatexdir/nodes.h +++ b/Build/source/texk/web2c/luatexdir/nodes.h @@ -192,8 +192,8 @@ typedef enum { explicit_disc, automatic_disc, syllable_disc, - init_disc, /* first of a duo of syllable_discs */ - select_disc, /* second of a duo of syllable_discs */ + init_disc, /* first of a duo of syllable_discs */ + select_disc, /* second of a duo of syllable_discs */ } discretionary_types; # define pre_break_head(a) ((a)+4) @@ -324,7 +324,7 @@ typedef enum { old_op_noad, old_bin_noad, old_rel_noad, - old_open_noad, /* 20 */ + old_open_noad, /* 20 */ old_close_noad, old_punct_noad, old_inner_noad, @@ -584,7 +584,7 @@ typedef enum { # define pdf_literal_type(a) subtype((a)+2) /* type of literal data */ -#define lua_refid_literal 1 /* not a |normal| string */ +# define lua_refid_literal 1 /* not a |normal| string */ /* literal ctm types */ diff --git a/Build/source/texk/web2c/luatexdir/pdf/pagetree.c b/Build/source/texk/web2c/luatexdir/pdf/pagetree.c index 03b743f5214..8d05d89956b 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pagetree.c +++ b/Build/source/texk/web2c/luatexdir/pdf/pagetree.c @@ -32,8 +32,8 @@ #endif static const char __svn_version[] = - "$Id: pagetree.c 2306 2009-04-16 15:01:45Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/pdf/pagetree.c $"; + "$Id: pagetree.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/pdf/pagetree.c $"; /**********************************************************************/ /* Page diversions */ @@ -62,7 +62,7 @@ typedef struct divert_list_entry_ { static int comp_divert_list_entry(const void *pa, const void *pb, void *p) { - (void)p; + (void) p; if (((const divert_list_entry *) pa)->divnum > ((const divert_list_entry *) pb)->divnum) return 1; diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.c b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.c index d5826ffecb7..d3d23cf5be7 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.c +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.c @@ -25,8 +25,8 @@ #include "ptexlib.h" static const char __svn_version[] = - "$Id: pdfpage.c 2414 2009-06-03 12:57:01Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/pdf/pdfpage.c $"; + "$Id: pdfpage.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/pdf/pdfpage.c $"; #define lround(a) (long) floor((a) + 0.5) #define setpdffloat(a,b,c) {(a).m = (b); (a).e = (c);} @@ -61,8 +61,8 @@ static void calc_k2(pdfstructure * p) lround(pdf2double(p->hz) * pdf2double(p->ext) * exp10_arr[p->tm[0].e]); p->k2 = exp10_arr[e_tj + - p->cw.e] / (exp10_arr[p->pdf.h.e] * pdf2double(p->fs) * - pdf2double(p->tm[0])); + p->cw.e] / (exp10_arr[p->pdf.h.e] * pdf2double(p->fs) * + pdf2double(p->tm[0])); } void pdf_page_init() @@ -92,7 +92,7 @@ void pdf_page_init() setpdffloat(p->cm[4], 0, decimal_digits); /* horizontal movement on page */ setpdffloat(p->cm[5], 0, decimal_digits); /* vertical movement on page */ /* for placement inside BT...ET */ - setpdffloat(p->tm[0], exp10_arr[6], 6); /* mantissa holds HZ expand * ExtendFont */ + setpdffloat(p->tm[0], exp10_arr[6], 6); /* mantissa holds HZ expand * ExtendFont */ setpdffloat(p->tm[1], 0, 0); setpdffloat(p->tm[2], 0, 3); /* mantissa holds SlantFont, 0 = default */ setpdffloat(p->tm[3], 1, 0); diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.h b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.h index aff5e0201e1..dce2c76ff6f 100644 --- a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.h +++ b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.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: pdfpage.h 2336 2009-04-19 08:38:24Z hhenkel $ */ +/* $Id: pdfpage.h 2448 2009-06-08 07:43:50Z taco $ */ #ifndef PDFPAGE_H # define PDFPAGE_H @@ -45,10 +45,10 @@ typedef enum { WMODE_H, WMODE_V } writing_mode; /* []TJ runs horizontal or verti # define setpdffloat(a,b,c) {(a).m = (b); (a).e = (c);} -#ifdef hz +# ifdef hz /* AIX 4.3 defines hz as 100 in system headers */ -#undef hz -#endif +# undef hz +# endif typedef struct { pdfpos pdf; /* pos. on page (PDF page raster) */ diff --git a/Build/source/texk/web2c/luatexdir/tex/filename.c b/Build/source/texk/web2c/luatexdir/tex/filename.c index dccf982d899..baf13da133d 100644 --- a/Build/source/texk/web2c/luatexdir/tex/filename.c +++ b/Build/source/texk/web2c/luatexdir/tex/filename.c @@ -22,8 +22,14 @@ #include "tokens.h" #include "commands.h" + static const char _svn_version[] = - "$Id: filename.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/filename.c $"; + "$Id: filename.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/filename.c $"; + +/* for use by |scan_file_name|, it comes from fontforge's Unicode library */ + +extern char *utf8_idpb(char *w, unsigned int i); + #define wake_up_terminal() ; #define clear_terminal() ; @@ -159,8 +165,20 @@ void scan_file_name(void) if ((cur_chr == ' ') && (state != token_list) && (loc > limit) && !quoted_filename) break; - if (!more_name(cur_chr)) - break; + if (cur_chr > 127) { + unsigned char *bytes; + unsigned char thebytes[5] = { 0 }; + utf8_idpb((char *) thebytes, cur_chr); + bytes = thebytes; + while (*bytes) { + if (!more_name(*bytes)) + break; + bytes++; + } + } else { + if (!more_name(cur_chr)) + break; + } get_x_token(); } end_name(); diff --git a/Build/source/texk/web2c/luatexdir/tex/linebreak.c b/Build/source/texk/web2c/luatexdir/tex/linebreak.c index e06bd89456f..cbabc38aed1 100644 --- a/Build/source/texk/web2c/luatexdir/tex/linebreak.c +++ b/Build/source/texk/web2c/luatexdir/tex/linebreak.c @@ -22,7 +22,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: linebreak.c 2294 2009-04-15 19:40:11Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/linebreak.c $"; + "$Id: linebreak.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/linebreak.c $"; /* Glue nodes in a horizontal list that is being paragraphed are not supposed to include ``infinite'' shrinkability; that is why the algorithm maintains @@ -606,7 +606,8 @@ static scaled best_pl_glue[4]; /*corresponding glue stretch or shrink */ * only character nodes, kern nodes, and box or rule nodes. */ -void add_to_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, scaled *widths) +void add_to_widths(halfword s, integer line_break_dir, + integer pdf_adjust_spacing, scaled * widths) { while (s != null) { if (is_char_node(s)) { @@ -639,7 +640,7 @@ void add_to_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, case rule_node: widths[1] += width(s); break; - case disc_node: /* TH temp */ + case disc_node: /* TH temp */ break; default: tconfusion("add_disc_widths"); @@ -655,7 +656,8 @@ void add_to_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, * with the |add_to_widths| function. */ -void sub_from_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, scaled *widths) +void sub_from_widths(halfword s, integer line_break_dir, + integer pdf_adjust_spacing, scaled * widths) { while (s != null) { /* @<Subtract the width of node |s| from |break_width|@>; */ @@ -689,7 +691,7 @@ void sub_from_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacin case rule_node: widths[1] -= width(s); break; - case disc_node: /* TH temp */ + case disc_node: /* TH temp */ break; default: tconfusion("sub_disc_widths"); @@ -763,8 +765,10 @@ compute_break_width(int break_type, int pdf_adjust_spacing, halfword p path, as we are talking about the breaking on _this_ position. */ - sub_from_widths(vlink_no_break(p), line_break_dir, pdf_adjust_spacing, break_width); - add_to_widths (vlink_post_break(p), line_break_dir, pdf_adjust_spacing, break_width); + sub_from_widths(vlink_no_break(p), line_break_dir, pdf_adjust_spacing, + break_width); + add_to_widths(vlink_post_break(p), line_break_dir, pdf_adjust_spacing, + break_width); do_one_seven_eight(add_disc_width_to_break_width); if (vlink_post_break(p) == null) { s = vlink(p); /* no post_break: 'skip' any 'whitespace' following */ @@ -1737,7 +1741,7 @@ ext_do_line_break(boolean d, case dir_node: /* @<DIR: Adjust the dir stack for the |line_break| routine@>; */ if (dir_dir(cur_p) >= 0) { line_break_dir = dir_dir(cur_p); - push_dir_node(cur_p); /* adds to dir_ptr */ + push_dir_node(cur_p); /* adds to dir_ptr */ } else { pop_dir_node(); if (dir_ptr != null) @@ -1793,7 +1797,8 @@ ext_do_line_break(boolean d, break; case disc_node: /* select_discs are handled by the leading init_disc */ - if (subtype(cur_p)==select_disc) break; + if (subtype(cur_p) == select_disc) + break; /* @<Try to break after a discretionary fragment, then |goto done5|@>; */ /* The following code knows that discretionary texts contain only character nodes, kern nodes, box nodes, and rule @@ -1812,7 +1817,8 @@ ext_do_line_break(boolean d, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, cur_p); } else { - add_to_widths(s,line_break_dir,pdf_adjust_spacing, disc_width); + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + disc_width); do_one_seven_eight(add_disc_width_to_active_width); ext_try_break(actual_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, @@ -1820,32 +1826,35 @@ ext_do_line_break(boolean d, pdf_protrude_chars, line_penalty, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, cur_p); - if (subtype(cur_p)==init_disc) { + if (subtype(cur_p) == init_disc) { /* we should at two break points after the one we * added above: * 1 which does a possible break in INIT's post_break * 2 which means the no_break actually was broken * just a character later */ /* do the select-0 case 'f-f-i' */ - assert(type(vlink(cur_p))==disc_node && - subtype(vlink(cur_p))==select_disc); + assert(type(vlink(cur_p)) == disc_node && + subtype(vlink(cur_p)) == select_disc); s = vlink_pre_break(vlink(cur_p)); - add_to_widths(s,line_break_dir,pdf_adjust_spacing, disc_width); + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + disc_width); ext_try_break(actual_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, adj_demerits, tracing_paragraphs, pdf_protrude_chars, line_penalty, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, - vlink(cur_p)); -#if 0 + vlink(cur_p)); +#if 0 /* TODO this does not work */ /* go back to the starting situation */ - do_one_seven_eight(sub_disc_width_from_active_width); + do_one_seven_eight + (sub_disc_width_from_active_width); do_one_seven_eight(reset_disc_width); /* add select no_break to active_width */ s = vlink_no_break(vlink(cur_p)); - add_to_widths(s,line_break_dir,pdf_adjust_spacing, disc_width); + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + disc_width); ext_try_break(actual_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, adj_demerits, tracing_paragraphs, @@ -1859,16 +1868,18 @@ ext_do_line_break(boolean d, } } s = vlink_no_break(cur_p); - add_to_widths(s,line_break_dir,pdf_adjust_spacing,active_width); - break; + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + active_width); + break; case math_node: auto_breaking = (subtype(cur_p) == after); kern_break(); break; case penalty_node: - ext_try_break(penalty(cur_p), unhyphenated_node, pdf_adjust_spacing, - par_shape_ptr, adj_demerits, tracing_paragraphs, - pdf_protrude_chars, line_penalty, last_line_fit, + ext_try_break(penalty(cur_p), unhyphenated_node, + pdf_adjust_spacing, par_shape_ptr, adj_demerits, + tracing_paragraphs, pdf_protrude_chars, + line_penalty, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, cur_p); break; @@ -1890,50 +1901,50 @@ ext_do_line_break(boolean d, } } if (cur_p == null) { - /* Try the final line break at the end of the paragraph, - and |goto done| if the desired breakpoints have been found */ - - /* The forced line break at the paragraph's end will reduce the list of - breakpoints so that all active nodes represent breaks at |cur_p=null|. - On the first pass, we insist on finding an active node that has the - correct ``looseness.'' On the final pass, there will be at least one active - node, and we will match the desired looseness as well as we can. - - The global variable |best_bet| will be set to the active node for the best - way to break the paragraph, and a few other variables are used to - help determine what is best. - */ + /* Try the final line break at the end of the paragraph, + and |goto done| if the desired breakpoints have been found */ + + /* The forced line break at the paragraph's end will reduce the list of + breakpoints so that all active nodes represent breaks at |cur_p=null|. + On the first pass, we insist on finding an active node that has the + correct ``looseness.'' On the final pass, there will be at least one active + node, and we will match the desired looseness as well as we can. + + The global variable |best_bet| will be set to the active node for the best + way to break the paragraph, and a few other variables are used to + help determine what is best. + */ ext_try_break(eject_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, adj_demerits, tracing_paragraphs, pdf_protrude_chars, line_penalty, last_line_fit, - double_hyphen_demerits, final_hyphen_demerits, first_p, - cur_p); + double_hyphen_demerits, final_hyphen_demerits, + first_p, cur_p); if (vlink(active) != active) { - /* @<Find an active node with fewest demerits@>; */ + /* @<Find an active node with fewest demerits@>; */ r = vlink(active); fewest_demerits = awful_bad; do { if (type(r) != delta_node) { if (total_demerits(r) < fewest_demerits) { - fewest_demerits = total_demerits(r); - best_bet = r; + fewest_demerits = total_demerits(r); + best_bet = r; } } r = vlink(r); } while (r != active); best_line = line_number(best_bet); - + /* /Find an active node with fewest demerits; */ if (looseness == 0) goto DONE; /*@<Find the best active node for the desired looseness@>; */ - + /* The adjustment for a desired looseness is a slightly more complicated version of the loop just considered. Note that if a paragraph is broken into segments by displayed equations, each segment will be subject to the looseness calculation, independently of the other segments. - */ + */ r = vlink(active); actual_looseness = 0; do { @@ -1955,40 +1966,40 @@ ext_do_line_break(boolean d, r = vlink(r); } while (r != active); best_line = line_number(best_bet); - + /* /Find the best active node for the desired looseness; */ if ((actual_looseness == looseness) || final_pass) goto DONE; } } - + /* Clean up the memory by removing the break nodes; */ clean_up_the_memory(); /* /Clean up the memory by removing the break nodes; */ - + if (!second_pass) { if (tracing_paragraphs > 0) tprint_nl("@secondpass"); threshold = tolerance; second_pass = true; final_pass = (emergency_stretch <= 0); - } else { /* if at first you do not succeed, \dots */ + } else { /* if at first you do not succeed, \dots */ if (tracing_paragraphs > 0) tprint_nl("@emergencypass"); background[2] += emergency_stretch; final_pass = true; } } - -DONE: + + DONE: if (tracing_paragraphs > 0) { end_diagnostic(true); normalize_selector(); } if (do_last_line_fit) { - /* Adjust \(t)the final line of the paragraph; */ - /* Here we either reset |do_last_line_fit| or adjust the |par_fill_skip| glue. - */ + /* Adjust \(t)the final line of the paragraph; */ + /* Here we either reset |do_last_line_fit| or adjust the |par_fill_skip| glue. + */ if (active_short(best_bet) == 0) { do_last_line_fit = false; } else { @@ -1999,18 +2010,18 @@ DONE: glue_ptr(last_line_fill) = q; } } - + /* @<Break the paragraph at the chosen...@>; */ /* Once the best sequence of breakpoints has been found (hurray), we call on the procedure |post_line_break| to finish the remainder of the work. (By introducing this subprocedure, we are able to keep |line_break| from getting extremely long.) - */ - + */ + /* first thing |ext_post_line_break| does is reset |dir_ptr| */ flush_node_list(dir_ptr); - dir_ptr=null; - + dir_ptr = null; + ext_post_line_break(d, right_skip, left_skip, diff --git a/Build/source/texk/web2c/luatexdir/tex/math.c b/Build/source/texk/web2c/luatexdir/tex/math.c index 8f84383267d..7b74fbbfb5c 100644 --- a/Build/source/texk/web2c/luatexdir/tex/math.c +++ b/Build/source/texk/web2c/luatexdir/tex/math.c @@ -27,8 +27,8 @@ #include "tokens.h" static const char _svn_version[] = - "$Id: math.c 2376 2009-05-08 08:40:13Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/math.c $"; + "$Id: math.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/math.c $"; #define mode cur_list.mode_field #define head cur_list.head_field @@ -211,7 +211,7 @@ void def_fam_fnt(integer fam_id, integer size_id, integer f, integer lvl) begin_diagnostic(); tprint("{assigning"); print_char(' '); - print_cmd_chr(def_family_cmd,size_id); + print_cmd_chr(def_family_cmd, size_id); print_int(fam_id); print_char('='); print_font_identifier(fam_fnt(fam_id, size_id)); @@ -238,7 +238,7 @@ void unsave_math_fam_data(integer gl) begin_diagnostic(); tprint("{restoring"); print_char(' '); - print_cmd_chr(def_family_cmd,size_id); + print_cmd_chr(def_family_cmd, size_id); print_int(fam_id); print_char('='); print_font_identifier(fam_fnt(fam_id, size_id)); @@ -267,8 +267,8 @@ void def_math_param(int param_id, int style_id, scaled value, int lvl) begin_diagnostic(); tprint("{assigning"); print_char(' '); - print_cmd_chr(set_math_param_cmd,param_id); - print_cmd_chr(math_style_cmd,style_id); + print_cmd_chr(set_math_param_cmd, param_id); + print_cmd_chr(math_style_cmd, style_id); print_char('='); print_int(value); print_char('}'); @@ -301,8 +301,8 @@ void unsave_math_param_data(integer gl) begin_diagnostic(); tprint("{restoring"); print_char(' '); - print_cmd_chr(set_math_param_cmd,param_id); - print_cmd_chr(math_style_cmd,style_id); + print_cmd_chr(set_math_param_cmd, param_id); + print_cmd_chr(math_style_cmd, style_id); print_char('='); print_int(get_math_param(param_id, style_id)); print_char('}'); @@ -456,7 +456,7 @@ i.e., a smaller style has a larger numerical value. @:TeXbook}{\sl The \TeX book@> */ -const char *math_style_names[] = { +const char *math_style_names[] = { "display", "crampeddisplay", "text", "crampedtext", "script", "crampedscript", @@ -467,22 +467,22 @@ const char *math_style_names[] = { const char *math_param_names[] = { "quad", "axis", "operatorsize", "overbarkern", "overbarrule", "overbarvgap", - "underbarkern","underbarrule", "underbarvgap", + "underbarkern", "underbarrule", "underbarvgap", "radicalkern", "radicalrule", "radicalvgap", "radicaldegreebefore", "radicaldegreeafter", "radicaldegreeraise", "stackvgap", "stacknumup", "stackdenomdown", "fractionrule", "fractionnumvgap", "fractionnumup", - "fractiondenomvgap","fractiondenomdown", "fractiondelsize", + "fractiondenomvgap", "fractiondenomdown", "fractiondelsize", "limitabovevgap", "limitabovebgap", "limitabovekern", "limitdownvgap", "limitdownbgap", "limitdownkern", "underdelimitervgap", "underdelimiterbgap", "overdelimitervgap", "overdelimiterbgap", "subshiftdrop", "supshiftdrop", "subshiftdown", - "subsupshiftdown","subtopmax", "supshiftup", + "subsupshiftdown", "subtopmax", "supshiftup", "supbottommin", "supsubbottommax", "subsupvgap", "spaceafterscript", "connectoroverlapmin", - "ordordspacing", "ordopspacing","ordbinspacing","ordrelspacing", - "ordopenspacing","ordclosespacing", "ordpunctspacing","ordinnerspacing", + "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", + "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", @@ -490,14 +490,19 @@ const char *math_param_names[] = { "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", - "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", + "openopenspacing", "openclosespacing", "openpunctspacing", + "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", - "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", + "closeopenspacing", "closeclosespacing", "closepunctspacing", + "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", - "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", + "punctopenspacing", "punctclosespacing", "punctpunctspacing", + "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", - "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", - NULL }; + "inneropenspacing", "innerclosespacing", "innerpunctspacing", + "innerinnerspacing", + NULL +}; pointer new_style(small_number s) { /* create a style node */ @@ -542,7 +547,7 @@ void show_math_node(pointer p) { switch (type(p)) { case style_node: - print_cmd_chr(math_style_cmd,subtype(p)); + print_cmd_chr(math_style_cmd, subtype(p)); break; case choice_node: tprint_esc("mathchoice"); @@ -659,12 +664,12 @@ void display_normal_noad(pointer p) switch (type(p)) { case simple_noad: switch (subtype(p)) { - case ord_noad_type: - tprint_esc("mathord"); + case ord_noad_type: + tprint_esc("mathord"); break; - case op_noad_type_normal: - case op_noad_type_limits: - case op_noad_type_no_limits: + case op_noad_type_normal: + case op_noad_type_limits: + case op_noad_type_no_limits: tprint_esc("mathop"); if (subtype(p) == op_noad_type_limits) tprint_esc("limits"); @@ -832,20 +837,20 @@ called for. void init_math(void) { - if ( cur_cmd == math_shift_cmd ) { - get_token(); /* |get_x_token| would fail on \.{\\ifmmode}\thinspace! */ + if (cur_cmd == math_shift_cmd) { + get_token(); /* |get_x_token| would fail on \.{\\ifmmode}\thinspace! */ if ((cur_cmd == math_shift_cmd) && (mode > 0)) { enter_display_math(); } else { back_input(); enter_ordinary_math(); } - } else if (cur_cmd==math_shift_cs_cmd && cur_chr == display_style ) { + } else if (cur_cmd == math_shift_cs_cmd && cur_chr == display_style) { enter_display_math(); - } else if (cur_cmd==math_shift_cs_cmd && cur_chr == text_style ) { + } else if (cur_cmd == math_shift_cs_cmd && cur_chr == text_style) { enter_ordinary_math(); } else { - you_cant(); + you_cant(); } } @@ -1313,7 +1318,8 @@ void set_math_char(mathcodeval mval) math_fam(nucleus(p)) = cur_fam; subtype(p) = ord_noad_type; } else { - switch (mval.class_value) { + switch (mval.class_value) { + /* *INDENT-OFF* */ case 0: subtype(p) = ord_noad_type; break; case 1: subtype(p) = op_noad_type_normal; break; case 2: subtype(p) = bin_noad_type; break; @@ -1321,7 +1327,8 @@ void set_math_char(mathcodeval mval) case 4: subtype(p) = open_noad_type; break; case 5: subtype(p) = close_noad_type; break; case 6: subtype(p) = punct_noad_type; break; - } + /* *INDENT-ON* */ + } } vlink(tail) = p; tail = p; @@ -1362,7 +1369,7 @@ void math_math_comp(void) subtype(tail) = cur_chr; q = new_node(math_char_node, 0); nucleus(tail) = q; - if (cur_chr==over_noad_type) + if (cur_chr == over_noad_type) (void) scan_math(nucleus(tail), cramped_style(m_style)); else (void) scan_math(nucleus(tail), m_style); @@ -1478,8 +1485,8 @@ void math_radical(void) else tconfusion("math_radical"); if (chr_code == 3) { - /* the trick with the |vlink(q)| is used by |scan_math| - to decide whether it needs to go on */ + /* the trick with the |vlink(q)| is used by |scan_math| + to decide whether it needs to go on */ q = new_node(math_char_node, 0); vlink(q) = tail; degree(tail) = q; @@ -1598,7 +1605,7 @@ void build_choices(void) break; } /* there are no other cases */ incr(saved(-1)); - push_math(math_choice_group, (prev_style+2)); + push_math(math_choice_group, (prev_style + 2)); scan_left_brace(); } @@ -1615,8 +1622,7 @@ void sub_sup(void) q = new_node(sub_mlist_node, 0); nucleus(tail) = q; } - if (cur_cmd == sup_mark_cmd || - cur_chr == sup_mark_cmd ) { /* super_sub_script */ + if (cur_cmd == sup_mark_cmd || cur_chr == sup_mark_cmd) { /* super_sub_script */ if (supscr(tail) != null) { char *hlp[] = { "I treat `x^1^2' essentially like `x^1{}^2'.", NULL @@ -1629,8 +1635,7 @@ void sub_sup(void) q = new_node(math_char_node, 0); supscr(tail) = q; (void) scan_math(supscr(tail), sup_style(m_style)); - } else if (cur_cmd == sub_mark_cmd || - cur_chr == sub_mark_cmd ) { + } else if (cur_cmd == sub_mark_cmd || cur_chr == sub_mark_cmd) { if (subscr(tail) != null) { char *hlp[] = { "I treat `x_1_2' essentially like `x_1{}_2'.", NULL @@ -1765,7 +1770,7 @@ void close_math_group(pointer p) math_list(saved(0)) = p; if (p != null) { if (vlink(p) == null) { - if (type(p) == simple_noad && subtype(p) == ord_noad_type ) { + if (type(p) == simple_noad && subtype(p) == ord_noad_type) { if (subscr(p) == null && supscr(p) == null) { type(saved(0)) = type(nucleus(p)); if (type(nucleus(p)) == math_char_node) { @@ -1775,14 +1780,15 @@ void close_math_group(pointer p) math_list(saved(0)) = math_list(nucleus(p)); math_list(nucleus(p)) = null; } - delete_attribute_ref(node_attr(saved(0))); + delete_attribute_ref(node_attr(saved(0))); node_attr(saved(0)) = node_attr(nucleus(p)); node_attr(nucleus(p)) = null; flush_node(p); } - } else if (type(p) == accent_noad) { - if (saved(0) == nucleus(tail)) { - if (type(tail) == simple_noad && subtype(tail) == ord_noad_type) { + } else if (type(p) == accent_noad) { + if (saved(0) == nucleus(tail)) { + if (type(tail) == simple_noad + && subtype(tail) == ord_noad_type) { q = head; while (vlink(q) != tail) q = vlink(q); @@ -1790,7 +1796,7 @@ void close_math_group(pointer p) nucleus(tail) = null; subscr(tail) = null; supscr(tail) = null; - delete_attribute_ref(node_attr(p)); + delete_attribute_ref(node_attr(p)); node_attr(p) = node_attr(tail); node_attr(tail) = null; flush_node(tail); @@ -1928,10 +1934,10 @@ void after_math(void) p = fin_mlist(null); /* this pops the nest */ if (cur_cmd == math_shift_cs_cmd && (cur_chr == text_style || cur_chr == display_style)) { - you_cant(); + you_cant(); } if (mode == -m) { /* end of equation number */ - if (cur_cmd == math_shift_cmd ) { + if (cur_cmd == math_shift_cmd) { check_second_math_shift(); } else { check_display_math_end(); @@ -1973,12 +1979,12 @@ void after_math(void) unsave_math(); } else { if (a == null) { - if (cur_cmd == math_shift_cmd) { + if (cur_cmd == math_shift_cmd) { check_second_math_shift(); } else { check_display_math_end(); } - } + } run_mlist_to_hlist(p, display_style, false); finish_displayed_math(l, danger, a); } @@ -2180,7 +2186,7 @@ void finish_display_alignment(pointer p, pointer q, memory_word aux_save) /* Interface to \.{\\Umath} and \.{\\mathstyle} */ -void setup_math_style (void) +void setup_math_style(void) { pointer q; tail_append(new_noad()); @@ -2190,9 +2196,9 @@ void setup_math_style (void) } -void print_math_style (void) +void print_math_style(void) { - if (abs(mode)==mmode) + if (abs(mode) == mmode) print_int(m_style); else print_int(-1); diff --git a/Build/source/texk/web2c/luatexdir/tex/mlist.c b/Build/source/texk/web2c/luatexdir/tex/mlist.c index c6528ddb300..45442af88da 100644 --- a/Build/source/texk/web2c/luatexdir/tex/mlist.c +++ b/Build/source/texk/web2c/luatexdir/tex/mlist.c @@ -24,7 +24,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: mlist.c 2414 2009-06-03 12:57:01Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/mlist.c $"; + "$Id: mlist.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/mlist.c $"; #define delimiter_factor int_par(param_delimiter_factor_code) #define delimiter_shortfall dimen_par(param_delimiter_shortfall_code) @@ -237,7 +237,7 @@ static scaled get_math_quad_size(int b) else if (b == script_script_size) var = script_script_style; else - var = text_style; + var = text_style; return get_math_param(math_param_quad, var); } @@ -831,11 +831,16 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f, DEFINE_DMATH_PARAMETERS(math_param_sub_shift_down, size_id, font_MATH_par(f, SubscriptShiftDown), lvl); - if (font_MATH_par(f, SubscriptShiftDownWithSuperscript)!=undefined_math_parameter) { + if (font_MATH_par(f, SubscriptShiftDownWithSuperscript) != + undefined_math_parameter) { DEFINE_MATH_PARAMETERS(math_param_sub_sup_shift_down, size_id, - font_MATH_par(f, SubscriptShiftDownWithSuperscript), lvl); + font_MATH_par(f, + SubscriptShiftDownWithSuperscript), + lvl); DEFINE_DMATH_PARAMETERS(math_param_sub_sup_shift_down, size_id, - font_MATH_par(f, SubscriptShiftDownWithSuperscript), lvl); + font_MATH_par(f, + SubscriptShiftDownWithSuperscript), + lvl); } else { DEFINE_MATH_PARAMETERS(math_param_sub_sup_shift_down, size_id, font_MATH_par(f, SubscriptShiftDown), lvl); @@ -1038,22 +1043,26 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f, /* The display-size radical_vgap is done twice because it needs values from both the sy and the ex font. */ - DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, - (default_rule_thickness(size_id) + - (abs(math_x_height(size_id)) / 4)), lvl); - - DEFINE_MATH_PARAMETERS(math_param_radical_degree_raise, size_id, - 60, lvl); - DEFINE_DMATH_PARAMETERS(math_param_radical_degree_raise, size_id, - 60, lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, + (default_rule_thickness(size_id) + + (abs(math_x_height(size_id)) / 4)), lvl); + + DEFINE_MATH_PARAMETERS(math_param_radical_degree_raise, size_id, + 60, lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_degree_raise, size_id, + 60, lvl); DEFINE_MATH_PARAMETERS(math_param_radical_degree_before, size_id, - xn_over_d(get_math_quad_size(size_id), 5, 18), lvl); + xn_over_d(get_math_quad_size(size_id), 5, 18), + lvl); DEFINE_DMATH_PARAMETERS(math_param_radical_degree_before, size_id, - xn_over_d(get_math_quad_size(size_id), 5, 18), lvl); - DEFINE_MATH_PARAMETERS(math_param_radical_degree_after,size_id, - (-xn_over_d(get_math_quad_size(size_id), 10, 18)), lvl); - DEFINE_DMATH_PARAMETERS(math_param_radical_degree_after,size_id, - (-xn_over_d(get_math_quad_size(size_id), 10, 18)), lvl); + xn_over_d(get_math_quad_size(size_id), 5, 18), + lvl); + DEFINE_MATH_PARAMETERS(math_param_radical_degree_after, size_id, + (-xn_over_d + (get_math_quad_size(size_id), 10, 18)), lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_degree_after, size_id, + (-xn_over_d + (get_math_quad_size(size_id), 10, 18)), lvl); } else if (fam_id == 3 && is_old_mathfont(f, total_mathex_params)) { /* fix old-style |ex| parameters */ @@ -1162,9 +1171,9 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f, /* The display-size radical_vgap is done twice because it needs values from both the sy and the ex font. */ - DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, - (default_rule_thickness(size_id) + - (abs(math_x_height(size_id)) / 4)), lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, + (default_rule_thickness(size_id) + + (abs(math_x_height(size_id)) / 4)), lvl); } } @@ -1178,7 +1187,7 @@ void finalize_math_parameters(void) def_math_param(math_param_space_after_script, display_style, script_space, level_one); def_math_param(math_param_space_after_script, text_style, - script_space, level_one); + script_space, level_one); def_math_param(math_param_space_after_script, script_style, script_space, level_one); def_math_param(math_param_space_after_script, script_script_style, @@ -2095,7 +2104,7 @@ void run_mlist_to_hlist(pointer p, integer mstyle, boolean penalties) int a, sfix; lua_State *L = Luas; if (p == null) { - vlink(temp_head) = null; + vlink(temp_head) = null; return; } finalize_math_parameters(); @@ -2107,7 +2116,7 @@ void run_mlist_to_hlist(pointer p, integer mstyle, boolean penalties) return; } nodelist_to_lua(L, p); /* arg 1 */ - lua_pushstring(L, math_style_names[mstyle]); /* arg 2 */ + lua_pushstring(L, math_style_names[mstyle]); /* arg 2 */ lua_pushboolean(L, penalties); /* arg 3 */ if (lua_pcall(L, 3, 1, 0) != 0) { /* 3 args, 1 result */ fprintf(stdout, "error: %s\n", lua_tostring(L, -1)); @@ -2118,13 +2127,13 @@ void run_mlist_to_hlist(pointer p, integer mstyle, boolean penalties) a = nodelist_from_lua(L); lua_settop(L, sfix); vlink(temp_head) = a; - } else if (callback_id==0) { + } else if (callback_id == 0) { cur_mlist = p; cur_style = mstyle; mlist_penalties = penalties; mlist_to_hlist(); } else { - vlink(temp_head) = null; + vlink(temp_head) = null; } } @@ -2362,10 +2371,10 @@ void make_radical(pointer q) height(x) + depth(x) + clr + theta); } left_delimiter(q) = null; - delta = (depth(y)+height(y)-theta) - (height(x) + depth(x) + clr); + delta = (depth(y) + height(y) - theta) - (height(x) + depth(x) + clr); if (delta > 0) - clr = clr + half(delta); /* increase the actual clearance */ - shift_amount(y) = (height(y)-theta)-(height(x) + clr); + clr = clr + half(delta); /* increase the actual clearance */ + shift_amount(y) = (height(y) - theta) - (height(x) + clr); h = depth(y) + height(y); p = overbar(x, clr, theta, radical_kern(cur_style), node_attr(y)); vlink(y) = p; @@ -2384,16 +2393,16 @@ void make_radical(pointer q) x = new_kern(ar); reset_attributes(x, node_attr(degree(q))); vlink(x) = y; - shift_amount(r) = - - ((xn_over_d(h, radical_degree_raise(cur_style), 100)) - - depth(y) - shift_amount(y)); + shift_amount(r) = + -((xn_over_d(h, radical_degree_raise(cur_style), 100)) - + depth(y) - shift_amount(y)); vlink(r) = x; x = new_kern(br); reset_attributes(x, node_attr(degree(q))); vlink(x) = r; y = x; } - math_list(degree(q)) = null; /* for \Uroot ..{<list>}{} */ + math_list(degree(q)) = null; /* for \Uroot ..{<list>}{} */ flush_node(degree(q)); } p = hpack(y, 0, additional); @@ -2566,8 +2575,8 @@ void do_make_math_accent(pointer q, internal_font_number f, integer c, } } else { /* new skewchar madness for bot accents */ s = char_bot_accent(cur_f, cur_c); - if (s == 0) { /* better than nothing: */ - s = char_top_accent(cur_f, cur_c); + if (s == 0) { /* better than nothing: */ + s = char_top_accent(cur_f, cur_c); } if (s != 0) { s_is_absolute = true; @@ -2814,44 +2823,45 @@ scaled make_op(pointer q) if (type(nucleus(q)) == math_char_node) { fetch(nucleus(q)); if (cur_style < text_style) { /* try to make it larger */ - ok_size = minimum_operator_size(cur_style); + ok_size = minimum_operator_size(cur_style); if (ok_size != undefined_math_parameter) { - /* creating a temporary delimiter is the cleanest way */ - y = new_node(delim_node, 0); - small_fam(y) = math_fam(nucleus(q)); - small_char(y) = math_character(nucleus(q)); - x = var_delimiter (y, text_size, ok_size); - delta = 0; + /* creating a temporary delimiter is the cleanest way */ + y = new_node(delim_node, 0); + small_fam(y) = math_fam(nucleus(q)); + small_char(y) = math_character(nucleus(q)); + x = var_delimiter(y, text_size, ok_size); + delta = 0; } else { ok_size = height_plus_depth(cur_f, cur_c) + 1; while ((char_tag(cur_f, cur_c) == list_tag) && - height_plus_depth(cur_f, cur_c) < ok_size) { - c = char_remainder(cur_f, cur_c); - if (!char_exists(cur_f, c)) + height_plus_depth(cur_f, cur_c) < ok_size) { + c = char_remainder(cur_f, cur_c); + if (!char_exists(cur_f, c)) break; - cur_c = c; - math_character(nucleus(q)) = c; - } - delta = char_italic(cur_f, cur_c); - x = clean_box(nucleus(q), cur_style); - if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) - width(x) = width(x) - delta; /* remove italic correction */ - shift_amount(x) = half(height(x) - depth(x)) - math_axis(cur_size); - /* center vertically */ - } - type(nucleus(q)) = sub_box_node; - math_list(nucleus(q)) = x; - - } else { /* normal size */ + cur_c = c; + math_character(nucleus(q)) = c; + } + delta = char_italic(cur_f, cur_c); + x = clean_box(nucleus(q), cur_style); + if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) + width(x) = width(x) - delta; /* remove italic correction */ + shift_amount(x) = + half(height(x) - depth(x)) - math_axis(cur_size); + /* center vertically */ + } + type(nucleus(q)) = sub_box_node; + math_list(nucleus(q)) = x; + + } else { /* normal size */ delta = char_italic(cur_f, cur_c); - x = clean_box(nucleus(q), cur_style); - if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) - width(x) = width(x) - delta; /* remove italic correction */ - shift_amount(x) = half(height(x) - depth(x)) - math_axis(cur_size); - /* center vertically */ - type(nucleus(q)) = sub_box_node; - math_list(nucleus(q)) = x; - } + x = clean_box(nucleus(q), cur_style); + if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) + width(x) = width(x) - delta; /* remove italic correction */ + shift_amount(x) = half(height(x) - depth(x)) - math_axis(cur_size); + /* center vertically */ + type(nucleus(q)) = sub_box_node; + math_list(nucleus(q)) = x; + } } else { delta = 0; } @@ -3079,7 +3089,7 @@ scaled math_kern_at(internal_font_number f, integer c, int side, int v) kerns_heights = co->bottom_right_math_kern_array; } else { tconfusion("math_kern_at"); - kerns_heights = NULL; /* not reached */ + kerns_heights = NULL; /* not reached */ } #ifdef DEBUG fprintf(stderr, " entry 0: %d,%d\n", kerns_heights[0], kerns_heights[1]); @@ -3299,11 +3309,11 @@ void make_scripts(pointer q, pointer p, scaled it) sub_mark_cmd, shift_down); if (delta2 != MATH_KERN_NOT_FOUND && delta2 != 0) { p = attach_hkern_to_new_hlist(q, delta2); - } + } } } /* now the horizontal shift for the superscript. */ - /* the superscript is also to be shifted by |delta1| (the italic correction)*/ + /* the superscript is also to be shifted by |delta1| (the italic correction) */ clr = MATH_KERN_NOT_FOUND; if (is_char_node(p) && supscr(q) != null && type(subscr(q)) == math_char_node) { @@ -3315,7 +3325,7 @@ void make_scripts(pointer q, pointer p, scaled it) } } if (delta2 == MATH_KERN_NOT_FOUND) - delta2=0; + delta2 = 0; if (clr != MATH_KERN_NOT_FOUND) { shift_amount(x) = clr + delta1 - delta2; } else { diff --git a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c index 2b238f87cd0..6e10980d374 100644 --- a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c +++ b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c @@ -22,7 +22,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: postlinebreak.c 2294 2009-04-15 19:40:11Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/postlinebreak.c $"; + "$Id: postlinebreak.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/postlinebreak.c $"; /* 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 @@ -218,7 +218,7 @@ void ext_post_line_break(boolean d, assert(a != null); assert(v != null); switch (subtype(r)) { - case select_disc: + case select_disc: if (vlink_pre_break(r) != null) { flush_node_list(vlink_pre_break(r)); vlink_pre_break(r) = null; @@ -230,8 +230,8 @@ void ext_post_line_break(boolean d, vlink_no_break(r) = null; tlink_no_break(r) = null; } - - assert(type(a)==disc_node && subtype(a)==init_disc); + + assert(type(a) == disc_node && subtype(a) == init_disc); flush_node_list(vlink_no_break(a)); vlink_no_break(a) = null; tlink_no_break(a) = null; @@ -241,17 +241,17 @@ void ext_post_line_break(boolean d, flush_node_list(vlink_post_break(a)); vlink_post_break(a) = null; tlink_post_break(a) = null; - + break; - case init_disc: - assert(type(v)==disc_node && subtype(v)==select_disc); - subtype(v) = syllable_disc; /* not special any more */ + case init_disc: + assert(type(v) == disc_node && subtype(v) == select_disc); + subtype(v) = syllable_disc; /* not special any more */ flush_node_list(vlink_no_break(v)); vlink_no_break(v) = vlink_post_break(r); tlink_no_break(v) = tlink_post_break(r); vlink_post_break(r) = null; tlink_post_break(r) = null; - default: + default: if (vlink_no_break(r) != null) { flush_node_list(vlink_no_break(r)); vlink_no_break(r) = null; diff --git a/Build/source/texk/web2c/luatexdir/tex/primitive.c b/Build/source/texk/web2c/luatexdir/tex/primitive.c index 61422a2058d..8e459bf1750 100644 --- a/Build/source/texk/web2c/luatexdir/tex/primitive.c +++ b/Build/source/texk/web2c/luatexdir/tex/primitive.c @@ -25,7 +25,7 @@ #include "tokens.h" static const char _svn_version[] = - "$Id: primitive.c 2297 2009-04-15 20:16:38Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/primitive.c $"; + "$Id: primitive.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/primitive.c $"; /* as usual, the file starts with a bunch of #defines that mimic pascal @ds */ diff --git a/Build/source/texk/web2c/luatexdir/tex/texdeffont.c b/Build/source/texk/web2c/luatexdir/tex/texdeffont.c index bdd3cfa043e..4e41870d738 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texdeffont.c +++ b/Build/source/texk/web2c/luatexdir/tex/texdeffont.c @@ -25,7 +25,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: texdeffont.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/texdeffont.c $"; + "$Id: texdeffont.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/texdeffont.c $"; #define text(a) hash[(a)].rh /* string number for control sequence name */ #define null_cs 1 /* equivalent of \.{\\csname\\endcsname} */ diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.c b/Build/source/texk/web2c/luatexdir/tex/texnodes.c index 8da9fe3b290..5f425cf2f92 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.c +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.c @@ -28,7 +28,7 @@ #define noDEBUG static const char _svn_version[] = - "$Id: texnodes.c 2329 2009-04-18 14:25:30Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/texnodes.c $"; + "$Id: texnodes.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/texnodes.c $"; #define append_char(A) str_pool[pool_ptr++]=(A) #define cur_length (pool_ptr - str_start_macro(str_ptr)) @@ -662,7 +662,7 @@ halfword copy_node(const halfword p) add_token_ref(write_tokens(p)); break; case pdf_literal_node: - copy_pdf_literal(r,p); + copy_pdf_literal(r, p); break; case pdf_colorstack_node: if (pdf_colorstack_cmd(p) <= colorstack_data) @@ -948,7 +948,7 @@ void flush_node(halfword p) delete_token_ref(write_tokens(p)); break; case pdf_literal_node: - free_pdf_literal(p); + free_pdf_literal(p); break; case pdf_colorstack_node: if (pdf_colorstack_cmd(p) <= colorstack_data) @@ -1180,7 +1180,7 @@ void check_node(halfword p) check_token_ref(write_tokens(p)); break; case pdf_literal_node: - if (pdf_literal_type(p)==normal) + if (pdf_literal_type(p) == normal) check_token_ref(pdf_literal_data(p)); break; case pdf_colorstack_node: @@ -1978,7 +1978,8 @@ void build_attribute_list(halfword b) attr_list_ref(attr_list_cache)++; node_attr(b) = attr_list_cache; #ifdef DEBUG - fprintf(stderr, "Added attrlist (%d) to node %d (count=%d)\n", node_attr(b), b, attr_list_ref(attr_list_cache)) ; + fprintf(stderr, "Added attrlist (%d) to node %d (count=%d)\n", + node_attr(b), b, attr_list_ref(attr_list_cache)); #endif } } @@ -1989,7 +1990,8 @@ void delete_attribute_ref(halfword b) assert(type(b) == attribute_list_node); attr_list_ref(b)--; #ifdef DEBUG - fprintf(stderr, "Removed attrlistref (%d) (count=%d)\n", b, attr_list_ref(b)) ; + fprintf(stderr, "Removed attrlistref (%d) (count=%d)\n", b, + attr_list_ref(b)); #endif if (attr_list_ref(b) == 0) { if (b == attr_list_cache) diff --git a/Build/source/texk/web2c/luatexdir/tex/texpdf.c b/Build/source/texk/web2c/luatexdir/tex/texpdf.c index 5c80298e43c..e84a336e46a 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texpdf.c +++ b/Build/source/texk/web2c/luatexdir/tex/texpdf.c @@ -22,7 +22,7 @@ #include <ctype.h> static const char _svn_version[] = - "$Id: texpdf.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/texpdf.c $"; + "$Id: texpdf.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/texpdf.c $"; #define number_chars 1114112 #define string_offset 2097152 diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.c b/Build/source/texk/web2c/luatexdir/tex/textoken.c index c3d8bae09ee..aa632fe1557 100644 --- a/Build/source/texk/web2c/luatexdir/tex/textoken.c +++ b/Build/source/texk/web2c/luatexdir/tex/textoken.c @@ -24,7 +24,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: textoken.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/textoken.c $"; + "$Id: textoken.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/textoken.c $"; #define skipping 1 /* |scanner_status| when passing conditional text */ #define defining 2 /* |scanner_status| when reading a macro definition */ @@ -216,7 +216,7 @@ boolean scan_keyword(char *s) pointer p; /* tail of the backup list */ pointer q; /* new node being added to the token list via |store_new_token| */ char *k; /* index into |str_pool| */ - pointer save_cur_cs = cur_cs; + pointer save_cur_cs = cur_cs; if (strlen(s) == 1) { /* @<Get the next non-blank non-call token@>; */ do { @@ -225,7 +225,7 @@ boolean scan_keyword(char *s) if ((cur_cs == 0) && ((cur_chr == *s) || (cur_chr == *s - 'a' + 'A'))) { return true; } else { - cur_cs = save_cur_cs; + cur_cs = save_cur_cs; back_input(); return false; } @@ -249,7 +249,7 @@ boolean scan_keyword(char *s) } else { back_input(); } - cur_cs = save_cur_cs; + cur_cs = save_cur_cs; return false; } } diff --git a/Build/source/texk/web2c/luatexdir/texmath.h b/Build/source/texk/web2c/luatexdir/texmath.h index 233904cae8c..9f9717f1ecd 100644 --- a/Build/source/texk/web2c/luatexdir/texmath.h +++ b/Build/source/texk/web2c/luatexdir/texmath.h @@ -18,7 +18,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: texmath.h 2280 2009-04-14 09:49:01Z taco $ */ +/* $Id: texmath.h 2448 2009-06-08 07:43:50Z taco $ */ #ifndef TEXMATH_H # define TEXMATH_H 1 @@ -40,19 +40,19 @@ extern halfword new_sub_box(halfword); # define default_code 010000000000 /* denotes |default_rule_thickness| */ typedef enum { - ord_noad_type = 0, - op_noad_type_normal, - op_noad_type_limits, - op_noad_type_no_limits, - bin_noad_type, - rel_noad_type, - open_noad_type, - close_noad_type, - punct_noad_type, - inner_noad_type, - under_noad_type, - over_noad_type, - vcenter_noad_type, + ord_noad_type = 0, + op_noad_type_normal, + op_noad_type_limits, + op_noad_type_no_limits, + bin_noad_type, + rel_noad_type, + open_noad_type, + close_noad_type, + punct_noad_type, + inner_noad_type, + under_noad_type, + over_noad_type, + vcenter_noad_type, } noad_types; extern void initialize_math(void); @@ -121,12 +121,12 @@ extern const char *math_style_names[]; # define sup_style(A) 2*((A)/4)+script_style+((A)%2) /* smaller */ # define num_style(A) (A)+2-2*((A)/6) /* smaller unless already script-script */ # define denom_style(A) 2*((A)/2)+cramped+2-2*((A)/6) /* smaller, cramped */ -# define sup_sup_style(A) sup_style(sup_style((A))) /* smaller */ +# define sup_sup_style(A) sup_style(sup_style((A))) /* smaller */ void mlist_to_hlist(void); -void setup_math_style (void); -void print_math_style (void); +void setup_math_style(void); +void print_math_style(void); # define text_size 0 # define script_size 1 diff --git a/Build/source/texk/web2c/luatexdir/textcodes.c b/Build/source/texk/web2c/luatexdir/textcodes.c index 2d353f1fb91..09012f601fe 100644 --- a/Build/source/texk/web2c/luatexdir/textcodes.c +++ b/Build/source/texk/web2c/luatexdir/textcodes.c @@ -25,7 +25,7 @@ #include "commands.h" static const char __svn_version[] = - "$Id$ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/textcodes.c $"; + "$Id$ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/textcodes.c $"; #define LCCODESTACK 8 #define LCCODEDEFAULT 0 diff --git a/Build/source/texk/web2c/luatexdir/utils/avlstuff.c b/Build/source/texk/web2c/luatexdir/utils/avlstuff.c index 363eb15088f..080c18f112c 100644 --- a/Build/source/texk/web2c/luatexdir/utils/avlstuff.c +++ b/Build/source/texk/web2c/luatexdir/utils/avlstuff.c @@ -24,8 +24,8 @@ #include "avl.h" static const char __svn_version[] = - "$Id: avlstuff.c 2329 2009-04-18 14:25:30Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/utils/avlstuff.c $"; + "$Id: avlstuff.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/utils/avlstuff.c $"; static struct avl_table **PdfObjTree = NULL; diff --git a/Build/source/texk/web2c/luatexdir/utils/synctex.c b/Build/source/texk/web2c/luatexdir/utils/synctex.c index 45a1c060946..081e02ef597 100644 --- a/Build/source/texk/web2c/luatexdir/utils/synctex.c +++ b/Build/source/texk/web2c/luatexdir/utils/synctex.c @@ -673,8 +673,8 @@ void synctex_vlist(halfword this_box) synctex_ctxt.tag = SYNCTEX_TAG_MODEL(this_box,box_node_size); synctex_ctxt.line = SYNCTEX_LINE_MODEL(this_box,box_node_size); pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_record_vlist(this_box); } @@ -699,8 +699,8 @@ void synctex_tsilv(halfword this_box) synctex_ctxt.tag = SYNCTEX_TAG_MODEL(this_box,box_node_size); synctex_ctxt.line = SYNCTEX_LINE_MODEL(this_box,box_node_size); pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_ctxt.recorder = NULL; synctex_record_tsilv(this_box); } @@ -724,8 +724,8 @@ void synctex_void_vlist(halfword p, halfword this_box) synctex_ctxt.tag = SYNCTEX_TAG_MODEL(p,box_node_size); synctex_ctxt.line = SYNCTEX_LINE_MODEL(p,box_node_size); pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_ctxt.recorder = NULL; /* reset */ synctex_record_void_vlist(p); } @@ -750,8 +750,8 @@ void synctex_hlist(halfword this_box) synctex_ctxt.tag = SYNCTEX_TAG_MODEL(this_box,box_node_size); synctex_ctxt.line = SYNCTEX_LINE_MODEL(this_box,box_node_size); pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_ctxt.recorder = NULL; /* reset */ synctex_record_hlist(this_box); } @@ -777,8 +777,8 @@ void synctex_tsilh(halfword this_box) synctex_ctxt.tag = SYNCTEX_TAG_MODEL(this_box,box_node_size); synctex_ctxt.line = SYNCTEX_LINE_MODEL(this_box,box_node_size); pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_ctxt.recorder = NULL; /* reset */ synctex_record_tsilh(this_box); } @@ -807,8 +807,8 @@ void synctex_void_hlist(halfword p, halfword this_box) synctex_ctxt.tag = SYNCTEX_TAG_MODEL(p,box_node_size); synctex_ctxt.line = SYNCTEX_LINE_MODEL(p,box_node_size); pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_ctxt.recorder = NULL; /* reset */ synctex_record_void_hlist(p); } @@ -857,8 +857,8 @@ void synctex_math(halfword p, halfword this_box) synctex_ctxt.tag = SYNCTEX_TAG_MODEL(p,medium_node_size); synctex_ctxt.line = SYNCTEX_LINE_MODEL(p,medium_node_size); pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_ctxt.recorder = NULL;/* no need to record once more */ synctex_math_recorder(p);/* always record synchronously */ } @@ -892,8 +892,8 @@ void synctex_horizontal_rule_or_glue(halfword p, halfword this_box) } synctex_ctxt.node = p; pos = synch_p_with_c(cur); - synctex_ctxt.curh = pos.h; - synctex_ctxt.curv = pos.v; + synctex_ctxt.curh = pos.h - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287); + synctex_ctxt.curv = cur_page_size.v - ((SYNCTEX_OFFSET_IS_PDF != 0) ? 0 : 4736287) - pos.v; synctex_ctxt.recorder = NULL; switch(SYNCTEX_TYPE(p)) { case rule_node: diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.c b/Build/source/texk/web2c/luatexdir/utils/utils.c index 0765f26408e..feb71d3183c 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.c +++ b/Build/source/texk/web2c/luatexdir/utils/utils.c @@ -41,17 +41,17 @@ #include "png.h" #ifdef POPPLER_VERSION -#define xpdfString "poppler" -#include "poppler-config.h" -#define xpdfVersion POPPLER_VERSION +# define xpdfString "poppler" +# include "poppler-config.h" +# define xpdfVersion POPPLER_VERSION #else -#define xpdfString "xpdf" -#include "xpdf/config.h" /* just to get the xpdf version */ +# define xpdfString "xpdf" +# include "xpdf/config.h" /* just to get the xpdf version */ #endif static const char __svn_version[] = - "$Id: utils.c 2384 2009-05-08 14:09:14Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/utils/utils.c $"; + "$Id: utils.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/utils/utils.c $"; #define check_nprintf(size_get, size_want) \ if ((unsigned)(size_get) >= (unsigned)(size_want)) \ diff --git a/Build/source/texk/web2c/luatexdir/utils/writezip.c b/Build/source/texk/web2c/luatexdir/utils/writezip.c index e853275897e..18650807d50 100644 --- a/Build/source/texk/web2c/luatexdir/utils/writezip.c +++ b/Build/source/texk/web2c/luatexdir/utils/writezip.c @@ -23,7 +23,7 @@ #include <assert.h> static const char __svn_version[] = - "$Id: writezip.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/utils/writezip.c $"; + "$Id: writezip.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/utils/writezip.c $"; #define ZIP_BUF_SIZE 32768 |