summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-02-02 05:43:46 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-02-02 05:43:46 +0000
commit766f9e22c66d047e709bffc758c53a4b853e710e (patch)
tree5029cac173e2ca4d63c1f4ea61ffc1af6763a1f1 /Build/source/texk/web2c/luatexdir
parentc770744a2b54ca47bd4d5df7eddf582003af753f (diff)
luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@46517 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rwxr-xr-xBuild/source/texk/web2c/luatexdir/getluatexsvnversion.sh25
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lepdflib.cc6
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
3 files changed, 6 insertions, 27 deletions
diff --git a/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh b/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh
deleted file mode 100755
index 7728ec50ea9..00000000000
--- a/Build/source/texk/web2c/luatexdir/getluatexsvnversion.sh
+++ /dev/null
@@ -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
diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
index a537e0a7c03..0bc34909f9e 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -1794,7 +1794,11 @@ static int m_Object_getNum(lua_State * L)
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);
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index c574a050792..f252a2d3fa5 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 6533
+#define luatex_svn_revision 6562