texlive[46517] Build/source/texk/web2c/luatexdir: luatexdir: sync

[commits+kakuto at tug.org]

Revision: 46517
          http://tug.org/svn/texlive?view=revision&revision=46517
Author:   kakuto
Date:     2018-02-02 06:43:46 +0100 (Fri, 02 Feb 2018)
Log Message:
-----------
luatexdir: sync with the upstream

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h

Removed Paths:
-------------
    trunk/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh

Deleted: trunk/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh	2018-02-02 01:18:02 UTC (rev 46516)
+++ trunk/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh	2018-02-02 05:43:46 UTC (rev 46517)
@@ -1,25 +0,0 @@
-#! /bin/sh
-# creates a c header file with the current subversion version
-# This script should be run within the source directory.
-
-$DEBUG
-
-FILE="texk/web2c/luatexdir/luatex_svnversion.h"
-
-LANG=C
-if [ ! -r $FILE ]
-then
-  echo '#define luatex_svn_revision -1' > $FILE
-fi
-if ( svn info . >/dev/null 2>&1 && svnversion > /dev/null )
-then
-  # svn up > /dev/null
-  DEFREV=`cat $FILE`
-  SVNREV=`svnversion -c . | sed -ne 's/^[0-9]*:*\([0-9]*\).*/#define luatex_svn_revision \1/p'`
-  test "$DEFREV" != "$SVNREV" && echo "$SVNREV" > $FILE
-elif ( [ -f ../.git/refs/remotes/git-svn ] || [ -d ../.git/svn ] && git svn --version > /dev/null )
-then
-  DEFREV=`cat $FILE`
-  SVNREV=`git svn info | sed -ne 's/^Revision: \([0-9]*\).*$/#define luatex_svn_revision \1/p'`
-  test "$DEFREV" != "$SVNREV" && echo "$SVNREV" > $FILE
-fi

Modified: trunk/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-02-02 01:18:02 UTC (rev 46516)
+++ trunk/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-02-02 05:43:46 UTC (rev 46517)
@@ -1794,7 +1794,11 @@
     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
     if (uin->pd != NULL && uin->pd->pc != uin->pc)
         pdfdoc_changed_error(L);
-    if (((Object *) uin->d)->isNum())
+    if (((Object *) uin->d)->isInt())
+        lua_pushinteger(L, ((Object *) uin->d)->getInt());
+    else if (((Object *) uin->d)->isReal())
+        lua_pushinteger(L, ((Object *) uin->d)->getReal());
+    else if (((Object *) uin->d)->isNum()) /* redundant */
         lua_pushnumber(L, ((Object *) uin->d)->getNum()); /* integer or float */
     else
         lua_pushnil(L);

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2018-02-02 01:18:02 UTC (rev 46516)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2018-02-02 05:43:46 UTC (rev 46517)
@@ -1 +1 @@
-#define luatex_svn_revision 6533
+#define luatex_svn_revision 6562