summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2014-03-29 08:58:51 +0000
committerTaco Hoekwater <taco@elvenkind.com>2014-03-29 08:58:51 +0000
commitcd703703903b866f4b023ca4b5956ce14d77cd13 (patch)
treecbb2fd395755beef1be765c8ae0efa02fa9c3007 /Build/source/texk
parente3e1b6cff6fd08293785e8dae902c911f938a59b (diff)
luatex 0.79.1
git-svn-id: svn://tug.org/texlive/trunk@33319 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c8
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfgen.w8
-rw-r--r--Build/source/texk/web2c/luatexdir/ptexlib.h4
5 files changed, 19 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 931b0c5f8c9..7839bd2f8d0 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-29 Taco Hoekwater <taco@luatex.org>
+
+ Import LuaTeX 0.79.1 from LuaTeX repository (released)
+
+2014-03-28 Taco Hoekwater <taco@luatex.org>
+
+ Import LuaTeX 0.79.0 from LuaTeX repository (released)
+
2014-03-15 Taco Hoekwater <taco@luatex.org>
Import LuaTeX snapshot 0.79.0 from LuaTeX repository (r4903).
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index fccdd4a386e..8b1bda83eec 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -16,16 +16,16 @@
#include "luatex_svnversion.h"
static const char _svn_version[] =
- "$Id: luatex.c 4890 2014-03-14 14:58:36Z taco $ "
- "$URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/luatex.c $";
+ "$Id: luatex.c 4969 2014-03-29 08:47:58Z taco $ "
+ "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.79.1/source/texk/web2c/luatexdir/luatex.c $";
#define TeX
int luatex_svn = luatex_svn_revision;
int luatex_version = 79; /* \.{\\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.79.0";
+const char *luatex_version_string = "beta-0.79.1";
#ifdef LuajitTeX
const char *engine_name = "luajittex"; /* the name of this engine */
#else
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index ad371665df3..5617183ee9d 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 4914
+#define luatex_svn_revision 4971
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
index 7d6b74fd09c..2854d5c671e 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
@@ -19,8 +19,8 @@
@ @c
static const char _svn_version[] =
- "$Id: pdfgen.w 4956 2014-03-28 12:12:17Z luigi $"
- "$URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/pdf/pdfgen.w $";
+ "$Id: pdfgen.w 4967 2014-03-28 19:44:06Z luigi $"
+ "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.79.1/source/texk/web2c/luatexdir/pdf/pdfgen.w $";
#include "ptexlib.h"
@@ -2284,7 +2284,7 @@ static int pdf_print_info(PDF pdf, int luatexversion,
trapped_given = substr_of_str("/Trapped", s);
}
p = get_pdf_table_string("info");
- if (strlen(p) > 0) {
+ if (p && strlen(p) > 0) {
creator_given = creator_given || substr_of_str("/Creator", p);
producer_given = producer_given || substr_of_str("/Producer", p);
creationdate_given = creationdate_given || substr_of_str("/CreationDate", p);
@@ -2301,7 +2301,7 @@ static int pdf_print_info(PDF pdf, int luatexversion,
delete_token_ref(pdf_info_toks);
pdf_info_toks = null;
}
- if (strlen(p) > 0) {
+ if (p && strlen(p) > 0) {
pdf_out(pdf, '\n');
pdf_puts(pdf, p); /* no free, pointer */
pdf_out(pdf, '\n');
diff --git a/Build/source/texk/web2c/luatexdir/ptexlib.h b/Build/source/texk/web2c/luatexdir/ptexlib.h
index 98bc822ef11..5485760db75 100644
--- a/Build/source/texk/web2c/luatexdir/ptexlib.h
+++ b/Build/source/texk/web2c/luatexdir/ptexlib.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: ptexlib.h 4911 2014-03-20 14:00:02Z luigi $ */
+/* $Id: ptexlib.h 4965 2014-03-28 17:50:08Z luigi $ */
#ifndef PTEXLIB_H
# define PTEXLIB_H
@@ -255,7 +255,7 @@ void lua_node_filter(int filterid, int extrainfo, halfword head_node,
halfword * tail_node);
halfword lua_vpack_filter(halfword head_node, scaled size, int pack_type,
scaled maxd, int extrainfo, int d);
-void lua_node_filter_s(int filterid, const char *extrainfo);
+void lua_node_filter_s(int filterid, int extrainfo);
int lua_linebreak_callback(int is_broken, halfword head_node,
halfword * new_head);