From 1145b81eac3be2270d19e000fc463c5ba2d99f0e Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 21 Dec 2014 23:21:18 +0000 Subject: web2c/luatexdir: Sync with the upstream git-svn-id: svn://tug.org/texlive/trunk@35877 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/luatexdir/lua/lnodelib.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index c04be02d1ea..6ce736f5a90 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-12-21 Akira Kakuto + + * lua/lnodelib.c: Sync with the upstream. Luigi fixes 'print' for + alink(n) when n is an attribute node. + 2014-12-20 Akira Kakuto * tex/texnodes.w: Sync with the upstream. Luigi makes minor changes. diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c index f6d74af2918..0dd584e78fb 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c @@ -96,7 +96,7 @@ */ static const char _svn_version[] = - "$Id: lnodelib.c 5091 2014-12-09 15:44:36Z luigi $ " + "$Id: lnodelib.c 5115 2014-12-21 17:46:00Z luigi $ " "$URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/lua/lnodelib.c $"; #include "ptexlib.h" @@ -3910,9 +3910,10 @@ static void lua_nodelib_do_tostring(lua_State * L, halfword n, const char *tag) char a[7] = { ' ', ' ', ' ', 'n', 'i', 'l', 0 }; char v[7] = { ' ', ' ', ' ', 'n', 'i', 'l', 0 }; msg = xmalloc(256); - if (alink(n) != null) + + if ((alink(n) != null) && (type(n) != attribute_node)) snprintf(a, 7, "%6d", (int) alink(n)); - if (vlink(n) != null) + if (vlink(n) != null) snprintf(v, 7, "%6d", (int) vlink(n)); snprintf(msg, 255, "<%s %s < %6d > %s : %s %d>", tag, a, (int) n, v, node_data[type(n)].name, subtype(n)); lua_pushstring(L, msg); -- cgit v1.2.3