summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-04-20 14:22:21 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-04-20 14:22:21 +0000
commit05f8d0158547b0198f0615e2b5dd51542ba48b41 (patch)
treecf1624e4a0cf28e07fd2c197ad5507791167025d /Build
parentfb7b7f390bf542b5455bf9aae21fb48d8efb1f65 (diff)
new luatex HEAD
git-svn-id: svn://tug.org/texlive/trunk@17944 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/NEWS36
-rw-r--r--Build/source/texk/web2c/luatexdir/font/texfont.w4
-rw-r--r--Build/source/texk/web2c/luatexdir/font/tfmofm.w4
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/loslibext.c4
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lpdflib.c4
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luainit.w56
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c23
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfgen.w11
-rw-r--r--Build/source/texk/web2c/luatexdir/ptexlib.h7
11 files changed, 94 insertions, 61 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 852833f971e..f9ca6e7962e 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-20 Taco Hoekwater <taco@luatex>
+
+ * new import from luatex repository (HEAD of 0.60.x branch)
+
2010-04-13 Taco Hoekwater <taco@luatex>
* am/luafontforge.am: delete three lines.
diff --git a/Build/source/texk/web2c/luatexdir/NEWS b/Build/source/texk/web2c/luatexdir/NEWS
index 2ab5446f5c1..e39ddca8c9a 100644
--- a/Build/source/texk/web2c/luatexdir/NEWS
+++ b/Build/source/texk/web2c/luatexdir/NEWS
@@ -2,6 +2,42 @@
This file is in the public domain.
==============================================================
+Luatex beta-0.60.1 was released ...
+==============================================================
+
+New features:
+
+* renamed node.skipable() to node.skippable().
+
+* More git discovery patches in getluatexsvnversion.sh.
+
+* Added --warnings=[no|min|yes|max|all] option to build.sh.
+
+* While cross-compiling, build.sh now adds an extra linker switch
+ to allow win32 exes to use 3G instead of 2G of virtual memory.
+
+
+Bugfixes:
+
+* Builds with --enable-ipc were broken.
+
+* Assigning and acquiring \fontdimen s from TeX code was broken.
+
+* An initial attempt at fixing bug #372 (\predisplaydirection).
+
+* An attempt to fix \eqno/\leqno placements in mixed direction
+ \mathdir/\textdir.
+
+* Our local xpdf patch is reverted, it is not needed any more.
+
+* The os.selfdir variable was not documented, as well as broken
+ on WIN32.
+
+* Fix "\input tikz hello \bye" bug, plus fix one sign error.
+
+* Fix handling of lua script files with UNC names.
+
+==============================================================
Luatex beta-0.60.0 was released 20100404
==============================================================
diff --git a/Build/source/texk/web2c/luatexdir/font/texfont.w b/Build/source/texk/web2c/luatexdir/font/texfont.w
index b2dd0a6cb86..3943da67cb3 100644
--- a/Build/source/texk/web2c/luatexdir/font/texfont.w
+++ b/Build/source/texk/web2c/luatexdir/font/texfont.w
@@ -33,7 +33,7 @@ problematic |if 0 != null|.
@c
static const char _svn_version[] =
- "$Id: texfont.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$Id: texfont.w 3634 2010-04-19 19:52:48Z taco $ "
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/texfont.w $";
#include "ptexlib.h"
@@ -516,7 +516,7 @@ static void dump_charinfo_variants(extinfo * o)
@ @c
static extinfo *undump_charinfo_variants(void)
{
- extinfo *c, *t, *h = NULL;
+ extinfo *c, *t = NULL, *h = NULL;
c = undump_variant();
while (c != NULL) {
if (h == null)
diff --git a/Build/source/texk/web2c/luatexdir/font/tfmofm.w b/Build/source/texk/web2c/luatexdir/font/tfmofm.w
index afe58217373..a007ac48b48 100644
--- a/Build/source/texk/web2c/luatexdir/font/tfmofm.w
+++ b/Build/source/texk/web2c/luatexdir/font/tfmofm.w
@@ -21,7 +21,7 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: tfmofm.w 3584 2010-04-02 17:45:55Z hhenkel $ "
+ "$Id: tfmofm.w 3634 2010-04-19 19:52:48Z taco $ "
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tfmofm.w $";
@ Here are some macros that help process ligatures and kerns
@@ -575,7 +575,7 @@ int read_tfm_info(internal_font_number f, const char *cnom, scaled s)
halfword lf, lh, bc, ec, nw, nh, nd, ni, nl, nk, ne, np, slh; /* sizes of subfiles */
scaled *widths, *heights, *depths, *italics, *kerns;
halfword font_dir;
- int a, b, c, d; /* byte variables */
+ int a, b, c=0, d=0; /* byte variables */
int i; /* counter */
int font_level, header_length;
int nco, ncw, npc, nlw, neew;
diff --git a/Build/source/texk/web2c/luatexdir/lua/loslibext.c b/Build/source/texk/web2c/luatexdir/lua/loslibext.c
index 8ddc2d2a7e4..467dc975670 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 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 $";
+ "$Id: loslibext.c 3634 2010-04-19 19:52:48Z 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)
@@ -268,7 +268,7 @@ static char *get_command_name(char *maincmd)
int i, k, quoted;
quoted = k = 0;
for (i = 0; (i < MAX_PATH) && maincmd[i] &&
- (maincmd[i] != ' ' && maincmd[i] != '\t' || quoted); i++) {
+ ((maincmd[i] != ' ' && maincmd[i] != '\t') || quoted); i++) {
if (maincmd[i] == '"') {
quoted = !quoted;
} else {
diff --git a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
index ff31b6c1dae..e5f688400e9 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
@@ -18,7 +18,7 @@
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
static const char _svn_version[] =
- "$Id: lpdflib.c 3612 2010-04-13 09:29:42Z taco $ "
+ "$Id: lpdflib.c 3618 2010-04-15 05:54:45Z taco $ "
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/lpdflib.c $";
#include "lua/luatex-api.h"
@@ -577,7 +577,7 @@ static int l_registerannot(lua_State * L)
if (i <= 0)
luaL_error(L,
"pdf.registerannot() can only register positive object numbers");
- addto_page_resources(static_pdf, obj_type_annot, -i);
+ addto_page_resources(static_pdf, obj_type_annot, i);
break;
default:
luaL_error(L, "pdf.registerannot() needs exactly 1 argument");
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w
index 3393716b36a..1e5f8681ba5 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 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 $";
+ "$Id: luainit.w 3621 2010-04-15 16:08:22Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/luainit.w $";
@
TH: TODO
@@ -224,6 +224,11 @@ static void parse_options(int argc, char **argv)
int option_index;
char *firstfile = NULL;
opterr = 0; /* dont whine */
+ if ((strstr(argv[0], "luatexlua") != NULL) ||
+ (strstr(argv[0], "texlua") != NULL)) {
+ lua_only = 1;
+ luainit = 1;
+ }
for (;;) {
g = getopt_long_only(argc, argv, "+", long_options, &option_index);
@@ -356,42 +361,37 @@ static void parse_options(int argc, char **argv)
uexit(0);
}
}
- /* attempt to find |dump_name| */
- if (argv[optind] && argv[optind][0] == '&') {
+ /* attempt to find |input_name| / |dump_name| */
+ if (lua_only) {
+ if (argv[optind]) {
+ startup_filename = strdup(argv[optind]);
+ lua_offset = optind;
+ }
+ } else if (argv[optind] && argv[optind][0] == '&') {
dump_name = strdup(argv[optind] + 1);
} else if (argv[optind] && argv[optind][0] != '\\') {
if (argv[optind][0] == '*') {
input_name = strdup(argv[optind] + 1);
} else {
firstfile = strdup(argv[optind]);
- if (lua_only) {
- startup_filename = firstfile;
- } else {
- if ((strstr(firstfile, ".lua") ==
- firstfile + strlen(firstfile) - 4)
- || (strstr(firstfile, ".luc") ==
- firstfile + strlen(firstfile) - 4)
- || (strstr(firstfile, ".LUA") ==
- firstfile + strlen(firstfile) - 4)
- || (strstr(firstfile, ".LUC") ==
- firstfile + strlen(firstfile) - 4)
- || (strstr(argv[0], "luatexlua") != NULL)
- || (strstr(argv[0], "texlua") != NULL)) {
- startup_filename = firstfile;
- lua_only = 1;
- lua_offset = optind;
- luainit = 1;
- } else {
- input_name = firstfile;
+ if ((strstr(firstfile, ".lua") ==
+ firstfile + strlen(firstfile) - 4)
+ || (strstr(firstfile, ".luc") ==
+ firstfile + strlen(firstfile) - 4)
+ || (strstr(firstfile, ".LUA") ==
+ firstfile + strlen(firstfile) - 4)
+ || (strstr(firstfile, ".LUC") ==
+ firstfile + strlen(firstfile) - 4)) {
+ if (startup_filename == NULL) {
+ startup_filename = firstfile;
+ lua_offset = optind;
+ lua_only = 1;
+ luainit = 1;
}
+ } else {
+ input_name = firstfile;
}
}
- } else {
- if ((strstr(argv[0], "luatexlua") != NULL) ||
- (strstr(argv[0], "texlua") != NULL)) {
- lua_only = 1;
- luainit = 1;
- }
}
if (safer_option) /* --safer implies --nosocket */
nosocket_option = 1;
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index 02fcd642ef9..66ddbc49dcb 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -10,20 +10,21 @@
#defines TeX or MF, which avoids the need for a special
Makefile rule. */
#include "luatex.h"
-
+#include "ptexlib.h"
+#include "lua/luatex-api.h"
#include "luatex_svnversion.h"
static const char _svn_version[] =
- "$Id: luatex.c 3612 2010-04-13 09:29:42Z taco $ "
+ "$Id: luatex.c 3637 2010-04-20 13:44:56Z taco $ "
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/luatex.c $";
#define TeX
int luatex_svn = luatex_svn_revision;
int luatex_version = 60; /* \.{\\luatexversion} */
-int luatex_revision = '0'; /* \.{\\luatexrevision} */
+int luatex_revision = '1'; /* \.{\\luatexrevision} */
int luatex_date_info = -extra_version_info; /* the compile date is negated */
-const char *luatex_version_string = "beta-0.60.0";
+const char *luatex_version_string = "beta-0.60.1";
const char *engine_name = "luatex"; /* the name of this engine */
#include <kpathsea/c-ctype.h>
@@ -46,7 +47,6 @@ const char *engine_name = "luatex"; /* the name of this engine */
#include <signal.h> /* Catch interrupts. */
-#include <texmfmp-help.h>
/* {tex,mf}d.h defines TeX, MF, INI, and other such symbols.
Unfortunately there's no way to get the banner into this code, so
@@ -393,9 +393,6 @@ int runsystem(char *cmd)
#endif
-/* The main program, etc. */
-
-extern void lua_initialize(int ac, char **av);
/* What we were invoked as and with. */
char **argv;
@@ -407,13 +404,7 @@ string dump_name;
/* The C version of the jobname, if given. */
const_string c_job_name;
-/* Full source file name. */
-extern string fullnameoffile;
-
-/* The main body of the WEB is transformed into this procedure. */
-extern TEXDLL void mainbody(void);
-
-char *ptexbanner;
+const char *ptexbanner;
#if !defined(WIN32) || defined(__MINGW32__)
/* The entry point: set up for reading the command line, which will
@@ -433,7 +424,7 @@ int main(int ac, string * av)
lua_initialize(ac, av);
/* Call the real main program. */
- mainbody();
+ main_body();
return EXIT_SUCCESS;
}
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index 9325bee7d82..4e5a14a4bca 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 3612
+#define luatex_svn_revision 3634
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
index d10ff01d99b..2d8dfaa1305 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
@@ -19,7 +19,7 @@
@ @c
static const char _svn_version[] =
- "$Id: pdfgen.w 3612 2010-04-13 09:29:42Z taco $"
+ "$Id: pdfgen.w 3638 2010-04-20 14:00:47Z taco $"
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/pdf/pdfgen.w $";
#include "ptexlib.h"
@@ -703,6 +703,7 @@ void addto_page_resources(PDF pdf, pdf_obj_type t, int k)
void **pp;
pdf_object_list *p, *item = NULL;
assert(pdf != NULL);
+ /* assert(obj_type(pdf, k) == t); *//* TODO, not yet strictly true */
re = pdf->page_resources;
assert(re != NULL);
assert(t <= PDF_OBJ_TYPE_MAX);
@@ -729,7 +730,7 @@ void addto_page_resources(PDF pdf, pdf_obj_type t, int k)
item->link = NULL;
item->info = k;
pr->list = item;
- set_obj_scheduled(pdf, k);
+ set_obj_scheduled(pdf, k); /* k is an object number */
} else {
for (p = pr->list; p->info != k && p->link != NULL; p = p->link);
if (p->info != k) {
@@ -1985,12 +1986,12 @@ void pdf_end_page(PDF pdf, boolean shipping_page)
if ((ol = get_page_resources_list(pdf, obj_type_font)) != NULL) {
pdf_puts(pdf, "/Font << ");
while (ol != NULL) {
- assert(pdf_font_num(ol->info) > 0); /* always base font: an object number */
+ assert(ol->info > 0); /* always base font: an object number */
pdf_puts(pdf, "/F");
- pdf_print_int(pdf, ol->info);
+ pdf_print_int(pdf, obj_info(pdf, ol->info));
pdf_print_resname_prefix(pdf);
pdf_out(pdf, ' ');
- pdf_print_int(pdf, pdf_font_num(ol->info));
+ pdf_print_int(pdf, ol->info);
pdf_puts(pdf, " 0 R ");
ol = ol->link;
}
diff --git a/Build/source/texk/web2c/luatexdir/ptexlib.h b/Build/source/texk/web2c/luatexdir/ptexlib.h
index 1f45113f6c9..e26b84d7980 100644
--- a/Build/source/texk/web2c/luatexdir/ptexlib.h
+++ b/Build/source/texk/web2c/luatexdir/ptexlib.h
@@ -27,13 +27,14 @@
# define EXTERN extern
# include "luatex.h"
+# include "lib/lib.h"
+
# ifdef MSVC
extern double rint(double x);
# endif
-extern string fullnameoffile;
# if defined(WIN32) || defined(__MINGW32__) || defined(__CYGWIN__)
-extern char **suffixlist;
+extern char **suffixlist; /* in luainit.w */
# endif
@@ -406,7 +407,7 @@ extern void topenin(void);
/* extern void calledit (); */
/* Set an array size from texmf.cnf. */
-extern void setupboundvariable(integer *, const_string, integer);
+/*extern void setupboundvariable(integer *, const_string, integer);*/
/* here are a few functions that used to be in coerce.h */