summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/lua
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-04-13 10:01:03 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-04-13 10:01:03 +0000
commit27cb85d417e47314739f93914e08da7ff8608bed (patch)
treeca94d101f3dc61de75b746901733862c33c197bc /Build/source/texk/web2c/luatexdir/lua
parent677b8b6ff1ec8b35713c4764d191a814fbb8aeb2 (diff)
new luatex and mplib from the luatex repository
git-svn-id: svn://tug.org/texlive/trunk@17836 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/lua')
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lepdflib.cc2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lfontlib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/limglib.c6
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lkpselib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/llanglib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/llualib.c14
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lnodelib.c9
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/loslibext.c12
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lpdflib.c8
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lstatslib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/ltexiolib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/ltexlib.c38
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/ltokenlib.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luagen.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luainit.w18
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luanode.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luastuff.w6
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luatex-api.h3
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luatoken.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/texluac.w4
21 files changed, 73 insertions, 67 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c
index c29f2de0e96..a3961703528 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lcallbacklib.c
@@ -21,7 +21,7 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: lcallbacklib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lcallbacklib.c $";
+ "$Id: lcallbacklib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lcallbacklib.c $";
int callback_count = 0;
int saved_callback_count = 0;
diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
index 551cc2d1ee3..2c1bc34fc1b 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -19,7 +19,7 @@
static const char _svn_version[] =
"$Id: lepdflib.cc 3366 2010-01-20 14:49:31Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lepdflib.cc $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lepdflib.cc $";
#include "image/epdf.h"
diff --git a/Build/source/texk/web2c/luatexdir/lua/lfontlib.c b/Build/source/texk/web2c/luatexdir/lua/lfontlib.c
index 32b9e776fc1..da7a69cb571 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lfontlib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lfontlib.c
@@ -22,7 +22,7 @@
static const char _svn_version[] =
- "$Id: lfontlib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lfontlib.c $";
+ "$Id: lfontlib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lfontlib.c $";
#define TIMERS 0
diff --git a/Build/source/texk/web2c/luatexdir/lua/limglib.c b/Build/source/texk/web2c/luatexdir/lua/limglib.c
index 0c2d7e4d65e..5245e31d0a3 100644
--- a/Build/source/texk/web2c/luatexdir/lua/limglib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/limglib.c
@@ -18,8 +18,8 @@
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
static const char _svn_version[] =
- "$Id: limglib.c 3404 2010-01-28 11:17:10Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/limglib.c $";
+ "$Id: limglib.c 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/limglib.c $";
#include <stdio.h>
#include <string.h>
@@ -424,7 +424,7 @@ static void lua_to_image(lua_State * L, image * a)
/**********************************************************************/
-void copy_image(lua_State * L, lua_Number scale)
+static void copy_image(lua_State * L, lua_Number scale)
{
image *a, **aa, *b, **bb;
if (lua_gettop(L) != 1)
diff --git a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
index 16c6a4ba23a..35191538f0b 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
@@ -28,7 +28,7 @@
#include <kpathsea/tex-file.h>
static const char _svn_version[] =
- "$Id: lkpselib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lkpselib.c $";
+ "$Id: lkpselib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lkpselib.c $";
static const unsigned filetypes[] = {
kpse_gf_format,
diff --git a/Build/source/texk/web2c/luatexdir/lua/llanglib.c b/Build/source/texk/web2c/luatexdir/lua/llanglib.c
index 093593d1301..7b880b4293e 100644
--- a/Build/source/texk/web2c/luatexdir/lua/llanglib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/llanglib.c
@@ -23,7 +23,7 @@
static const char _svn_version[] =
- "$Id: llanglib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/llanglib.c $";
+ "$Id: llanglib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/llanglib.c $";
#define LANG_METATABLE "luatex.lang"
diff --git a/Build/source/texk/web2c/luatexdir/lua/llualib.c b/Build/source/texk/web2c/luatexdir/lua/llualib.c
index eded8dd8f25..ec247e88010 100644
--- a/Build/source/texk/web2c/luatexdir/lua/llualib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/llualib.c
@@ -21,7 +21,7 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: llualib.c 3551 2010-03-26 14:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/llualib.c $";
+ "$Id: llualib.c 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/llualib.c $";
#define LOAD_BUF_SIZE 256
#define UINT_MAX32 0xFFFFFFFF
@@ -157,7 +157,7 @@ static int bytecode_register_shadow_get(lua_State * L, int k)
}
-int writer(lua_State * L, const void *b, size_t size, void *B)
+static int writer(lua_State * L, const void *b, size_t size, void *B)
{
bytecode *buf = (bytecode *) B;
(void) L; /* for -Wunused */
@@ -173,7 +173,7 @@ int writer(lua_State * L, const void *b, size_t size, void *B)
return 0;
}
-const char *reader(lua_State * L, void *ud, size_t * size)
+static const char *reader(lua_State * L, void *ud, size_t * size)
{
bytecode *buf = (bytecode *) ud;
(void) L; /* for -Wunused */
@@ -187,7 +187,7 @@ const char *reader(lua_State * L, void *ud, size_t * size)
return (const char *) buf->buf;
}
-int get_bytecode(lua_State * L)
+static int get_bytecode(lua_State * L)
{
int k;
k = (int) luaL_checkinteger(L, -1);
@@ -210,7 +210,7 @@ int get_bytecode(lua_State * L)
return 1;
}
-int set_bytecode(lua_State * L)
+static int set_bytecode(lua_State * L)
{
int k, ltype;
unsigned int i;
@@ -263,7 +263,7 @@ int set_bytecode(lua_State * L)
}
-int set_luaname(lua_State * L)
+static int set_luaname(lua_State * L)
{
int k;
const char *s;
@@ -286,7 +286,7 @@ int set_luaname(lua_State * L)
return 0;
}
-int get_luaname(lua_State * L)
+static int get_luaname(lua_State * L)
{
int k;
k = (int) luaL_checkinteger(L, 2);
diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
index 3b626826e58..1da8d985181 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
@@ -18,8 +18,8 @@
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
static const char _svn_version[] =
- "$Id: lnodelib.c 3560 2010-03-29 09:27:08Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lnodelib.c $";
+ "$Id: lnodelib.c 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lnodelib.c $";
#include "lua/luatex-api.h"
#include "ptexlib.h"
@@ -685,7 +685,7 @@ make_luaS_index(depth);
make_luaS_index(expansion_factor);
-void initialize_luaS_indexes(lua_State * L)
+static void initialize_luaS_indexes(lua_State * L)
{
init_luaS_index(id);
init_luaS_index(next);
@@ -3308,7 +3308,7 @@ static int lua_nodelib_first_character(lua_State * L)
/* this is too simplistic, but it helps Hans to get going */
-halfword do_ligature_n(halfword prev, halfword stop, halfword lig)
+static halfword do_ligature_n(halfword prev, halfword stop, halfword lig)
{
vlink(lig) = vlink(stop);
vlink(stop) = null;
@@ -3395,6 +3395,7 @@ static const struct luaL_reg nodelib_f[] = {
{"protect_glyphs", lua_nodelib_protect_glyphs},
{"unprotect_glyphs", lua_nodelib_unprotect_glyphs},
{"protrusion_skipable", lua_nodelib_cp_skipable},
+ {"protrusion_skippable", lua_nodelib_cp_skipable},
{NULL, NULL} /* sentinel */
};
diff --git a/Build/source/texk/web2c/luatexdir/lua/loslibext.c b/Build/source/texk/web2c/luatexdir/lua/loslibext.c
index 9130f488d59..8ddc2d2a7e4 100644
--- a/Build/source/texk/web2c/luatexdir/lua/loslibext.c
+++ b/Build/source/texk/web2c/luatexdir/lua/loslibext.c
@@ -25,7 +25,7 @@
#include <time.h>
static const char _svn_version[] =
- "$Id: loslibext.c 3518 2010-03-17 09:57:13Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/loslibext.c $";
+ "$Id: loslibext.c 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/loslibext.c $";
#if defined(_WIN32) || defined(__NT__)
# define MKDIR(a,b) mkdir(a)
@@ -603,7 +603,7 @@ static int os_setenv(lua_State * L)
}
-void find_env(lua_State * L)
+static void find_env(lua_State * L)
{
char *envitem, *envitem_orig;
char *envkey;
@@ -872,11 +872,12 @@ static int os_gettimeofday(lua_State * L)
static const char repl[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-static int dirs_made = 0;
-
#define MAXTRIES 36*36*36
-char *do_mkdtemp(char *tmpl)
+#ifndef HAVE_MKDTEMP
+static int dirs_made = 0;
+
+static char *do_mkdtemp(char *tmpl)
{
int count;
int value;
@@ -908,6 +909,7 @@ char *do_mkdtemp(char *tmpl)
}
return NULL;
}
+#endif
static int os_tmpdir(lua_State * L)
{
diff --git a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
index b715f02b24b..ff31b6c1dae 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
@@ -18,8 +18,8 @@
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
static const char _svn_version[] =
- "$Id: lpdflib.c 3582 2010-04-02 16:37:08Z hhenkel $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lpdflib.c $";
+ "$Id: lpdflib.c 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lpdflib.c $";
#include "lua/luatex-api.h"
#include "ptexlib.h"
@@ -31,7 +31,7 @@ for (i = 0; i < (l); i++) { \
pdf_quick_out(p, ((const unsigned char *) (s))[i]); \
}
-int luapdfprint(lua_State * L)
+static int luapdfprint(lua_State * L)
{
int n;
unsigned i;
@@ -83,7 +83,7 @@ int luapdfprint(lua_State * L)
return 0;
}
-unsigned char *fread_to_buf(lua_State * L, const char *filename, size_t * len)
+static unsigned char *fread_to_buf(lua_State * L, const char *filename, size_t * len)
{
int i = 0;
int ilen = 0;
diff --git a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c
index 4d233c43e4a..020fe6d616a 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c
@@ -19,7 +19,7 @@
static const char _svn_version[] =
"$Id: lstatslib.c 3477 2010-03-12 13:59:34Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/lstatslib.c $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lstatslib.c $";
#include "lua/luatex-api.h"
#include "ptexlib.h"
diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c b/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c
index 79f92f83d53..63ab77d9f65 100644
--- a/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/ltexiolib.c
@@ -21,7 +21,7 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: ltexiolib.c 3550 2010-03-26 14:37:09Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/ltexiolib.c $";
+ "$Id: ltexiolib.c 3550 2010-03-26 14:37:09Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/ltexiolib.c $";
typedef void (*texio_printer) (const char *);
diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c
index fa0544a1853..317dbbd9afd 100644
--- a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c
@@ -23,7 +23,7 @@
static const char _svn_version[] =
- "$Id: ltexlib.c 3550 2010-03-26 14:37:09Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/ltexlib.c $";
+ "$Id: ltexlib.c 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/ltexlib.c $";
#define attribute(A) eqtb[attribute_base+(A)].hh.rh
#define dimen(A) eqtb[scaled_base+(A)].hh.rh
@@ -120,22 +120,22 @@ static int do_luacprint(lua_State * L, int partial, int deftable)
return 0;
}
-int luacwrite(lua_State * L)
+static int luacwrite(lua_State * L)
{
return do_luacprint(L, FULL_LINE, NO_CAT_TABLE);
}
-int luacprint(lua_State * L)
+static int luacprint(lua_State * L)
{
return do_luacprint(L, FULL_LINE, DEFAULT_CAT_TABLE);
}
-int luacsprint(lua_State * L)
+static int luacsprint(lua_State * L)
{
return do_luacprint(L, PARTIAL_LINE, DEFAULT_CAT_TABLE);
}
-int luactprint(lua_State * L)
+static int luactprint(lua_State * L)
{
int i, j, n;
int cattable, startstrings;
@@ -575,7 +575,7 @@ static int tex_scaledimen(lua_State * L)
}
-int get_item_index(lua_State * L, int i, int base)
+static int get_item_index(lua_State * L, int i, int base)
{
size_t kk;
int k;
@@ -680,7 +680,7 @@ static int setskip(lua_State * L)
return vsetskip(L, isglobal);
}
-int getskip(lua_State * L)
+static int getskip(lua_State * L)
{
halfword j;
int k;
@@ -778,7 +778,7 @@ static int getattribute(lua_State * L)
return 1;
}
-int vsettoks(lua_State * L, int is_global)
+static int vsettoks(lua_State * L, int is_global)
{
int i, err;
int k;
@@ -925,17 +925,17 @@ static int getboxdim(lua_State * L, int whichdim)
return 1;
}
-int getboxwd(lua_State * L)
+static int getboxwd(lua_State * L)
{
return getboxdim(L, width_offset);
}
-int getboxht(lua_State * L)
+static int getboxht(lua_State * L)
{
return getboxdim(L, height_offset);
}
-int getboxdp(lua_State * L)
+static int getboxdp(lua_State * L)
{
return getboxdim(L, depth_offset);
}
@@ -1011,7 +1011,7 @@ static int setboxdp(lua_State * L)
return vsetboxdim(L, depth_offset, isglobal);
}
-int settex(lua_State * L)
+static int settex(lua_State * L)
{
const char *st;
int i, j, texstr;
@@ -1075,7 +1075,7 @@ int settex(lua_State * L)
return 0;
}
-int do_convert(lua_State * L, int cur_code)
+static int do_convert(lua_State * L, int cur_code)
{
int texstr;
int i = -1;
@@ -1126,7 +1126,7 @@ int do_convert(lua_State * L, int cur_code)
}
-int do_scan_internal(lua_State * L, int cur_cmd, int cur_code)
+static int do_scan_internal(lua_State * L, int cur_cmd, int cur_code)
{
int texstr;
char *str = NULL;
@@ -1156,7 +1156,7 @@ int do_scan_internal(lua_State * L, int cur_cmd, int cur_code)
return 1;
}
-int do_lastitem(lua_State * L, int cur_code)
+static int do_lastitem(lua_State * L, int cur_code)
{
int retval = 1;
switch (cur_code) {
@@ -1319,7 +1319,7 @@ static int getpdfxformname(lua_State * L)
}
-int get_parshape(lua_State * L)
+static int get_parshape(lua_State * L)
{
int n;
halfword par_shape_ptr = equiv(par_shape_loc);
@@ -1343,7 +1343,7 @@ int get_parshape(lua_State * L)
}
-int gettex(lua_State * L)
+static int gettex(lua_State * L)
{
int cur_cs = -1;
int retval = 1; /* default is to return nil */
@@ -1397,7 +1397,7 @@ int gettex(lua_State * L)
}
-int getlist(lua_State * L)
+static int getlist(lua_State * L)
{
const char *str;
if (lua_isstring(L, 2)) {
@@ -1445,7 +1445,7 @@ int getlist(lua_State * L)
return 1;
}
-int setlist(lua_State * L)
+static int setlist(lua_State * L)
{
halfword *n_ptr;
const char *str;
diff --git a/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c b/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c
index 02e6d84dff6..0f1c5332466 100644
--- a/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/ltokenlib.c
@@ -21,7 +21,7 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: ltokenlib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/ltokenlib.c $";
+ "$Id: ltokenlib.c 3404 2010-01-28 11:17:10Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/ltokenlib.c $";
#define is_valid_token(L,i) (lua_istable(L,i) && lua_objlen(L,i)==3)
#define get_token_cmd(L,i) lua_rawgeti(L,i,1)
diff --git a/Build/source/texk/web2c/luatexdir/lua/luagen.w b/Build/source/texk/web2c/luatexdir/lua/luagen.w
index 292176575c0..69589ba04e0 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luagen.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luagen.w
@@ -20,7 +20,7 @@
@ @c
static const char _svn_version[] =
"$Id: luagen.w 3583 2010-04-02 17:40:44Z hhenkel $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luagen.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luagen.w $";
#include "ptexlib.h"
#include "pdf/pdfpage.h"
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w
index cd8c8872a7f..3393716b36a 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w
@@ -28,7 +28,7 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: luainit.w 3583 2010-04-02 17:40:44Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luainit.w $";
+ "$Id: luainit.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luainit.w $";
@
TH: TODO
@@ -110,20 +110,20 @@ const_string LUATEX_IHELP[] = {
NULL
};
-@ @c
-char *ex_selfdir(char *argv0)
+@ The return value will be the directory of the executable, e.g.: \.{c:/TeX/bin}
+@c
+static char *ex_selfdir(char *argv0)
{
#if defined(WIN32)
- char short_path[PATH_MAX], path[PATH_MAX], *fp;
+ char path[PATH_MAX], *fp;
/* SearchPath() always gives back an absolute directory */
- if (SearchPath(NULL, argv0, ".exe", PATH_MAX, short_path, &fp) == 0)
+ if (SearchPath(NULL, argv0, ".exe", PATH_MAX, path, NULL) == 0)
FATAL1("Can't determine where the executable %s is.\n", argv0);
/* slashify the dirname */
for (fp = path; fp && *fp; fp++)
if (IS_DIR_SEP(*fp))
*fp = DIR_SEP;
- /* sdir will be the directory of the executable, ie: c:/TeX/bin */
return xdirname(path);
#else
return kpse_selfdir(argv0);
@@ -437,7 +437,7 @@ static char *find_filename(char *name, const char *envkey)
@ @c
-char *cleaned_invocation_name(char *arg)
+static char *cleaned_invocation_name(char *arg)
{
char *ret, *dot;
const char *start = xbasename(arg);
@@ -450,7 +450,7 @@ char *cleaned_invocation_name(char *arg)
}
@ @c
-void init_kpse(void)
+static void init_kpse(void)
{
if (!user_progname) {
@@ -480,7 +480,7 @@ void init_kpse(void)
}
@ @c
-void fix_dumpname(void)
+static void fix_dumpname(void)
{
int dist;
if (dump_name) {
diff --git a/Build/source/texk/web2c/luatexdir/lua/luanode.w b/Build/source/texk/web2c/luatexdir/lua/luanode.w
index 81e6b4fa74e..ce157f0767a 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luanode.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luanode.w
@@ -24,7 +24,7 @@
static const char _svn_version[] =
"$Id: luanode.w 3583 2010-04-02 17:40:44Z hhenkel $ "
-"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luanode.w $";
+"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luanode.w $";
@ @c
static const char *group_code_names[] = {
diff --git a/Build/source/texk/web2c/luatexdir/lua/luastuff.w b/Build/source/texk/web2c/luatexdir/lua/luastuff.w
index 06547bc4de9..e8a3c5b9321 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luastuff.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luastuff.w
@@ -19,8 +19,8 @@
@ @c
static const char _svn_version[] =
- "$Id: luastuff.w 3583 2010-04-02 17:40:44Z hhenkel $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luastuff.w $";
+ "$Id: luastuff.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luastuff.w $";
#include "lua/luatex-api.h"
#include "ptexlib.h"
@@ -71,7 +71,7 @@ const char *getS(lua_State * L, void *ud, size_t * size)
}
@ @c
-void *my_luaalloc(void *ud, void *ptr, size_t osize, size_t nsize)
+static void *my_luaalloc(void *ud, void *ptr, size_t osize, size_t nsize)
{
void *ret = NULL;
(void) ud; /* for -Wunused */
diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
index 155fb6a3cb6..e754a498d8d 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
+++ b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
-/* $Id: luatex-api.h 3558 2010-03-29 07:21:45Z taco $ */
+/* $Id: luatex-api.h 3612 2010-04-13 09:29:42Z taco $ */
#ifndef LUATEX_API_H
# define LUATEX_API_H 1
@@ -198,5 +198,6 @@ extern char charsetstr[]; /* from mpdir/psout.w */
extern char **environ;
+extern int luac_main(int argc, char *argv[]); /* texluac.w */
#endif
diff --git a/Build/source/texk/web2c/luatexdir/lua/luatoken.w b/Build/source/texk/web2c/luatexdir/lua/luatoken.w
index 7a96fcd1a11..7647eec5f9b 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luatoken.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luatoken.w
@@ -23,7 +23,7 @@
static const char _svn_version[] =
"$Id: luatoken.w 3583 2010-04-02 17:40:44Z hhenkel $ "
-"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/luatoken.w $";
+"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luatoken.w $";
@ @c
command_item command_names[] = {
diff --git a/Build/source/texk/web2c/luatexdir/lua/texluac.w b/Build/source/texk/web2c/luatexdir/lua/texluac.w
index 108e27864dc..772d7941d15 100644
--- a/Build/source/texk/web2c/luatexdir/lua/texluac.w
+++ b/Build/source/texk/web2c/luatexdir/lua/texluac.w
@@ -44,9 +44,11 @@
#include "lua51/lstring.h"
#include "lua51/lundump.h"
+#include "lua/luatex-api.h"
+
@ @c
static const char _svn_version[] =
- "$Id: texluac.w 3583 2010-04-02 17:40:44Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/lua/texluac.w $";
+ "$Id: texluac.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/texluac.w $";
@ @c
#define PROGNAME "texluac" /* default program name */