diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-01-28 23:51:21 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-01-28 23:51:21 +0000 |
| commit | c34429954722cb24f56b3240ac26e71907fa62a6 (patch) | |
| tree | e6576ffc581dc32d05bd8be1d159f6b30c226764 /Build | |
| parent | e3216ca69c29d09b933573ca9f2e4a70346b435c (diff) | |
web2c/luatexdir: sync with the upstream (start of beta-0.89.0)
git-svn-id: svn://tug.org/texlive/trunk@39498 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/lnodelib.c | 19 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/luatex.c | 6 |
2 files changed, 15 insertions, 10 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c index f13c557dec9..d8c23b75c1f 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c @@ -193,19 +193,24 @@ #define nodelib_check_glue_spec(n,g,field) do { \ g = glue_ptr(n); \ v = (halfword) lua_tointeger(L, 3); \ - if ((!g) || (!valid_node(g))) { \ + if (!g) { \ g = new_node(glue_spec_node,0); \ + add_glue_ref(g); \ glue_ptr(n) = g; \ field(g) = v; \ } else if (field(g) != v) { \ - if (glue_ref_count(g) > 1) { \ - c = new_spec(g); \ + if (valid_node(g)) { \ + int c = new_spec(g); \ delete_glue_ref(g); \ - g = c; \ + add_glue_ref(c); \ + glue_ptr(n) = c; \ + field(c) = v; \ + } else { \ + g = new_spec(g); \ add_glue_ref(g); \ glue_ptr(n) = g; \ + field(g) = v; \ } \ - field(g) = v; \ } \ } while (0) @@ -5036,7 +5041,7 @@ static int lua_nodelib_setfield_whatsit(lua_State * L, int n, const char *s) static int lua_nodelib_fast_setfield(lua_State * L) { - halfword g, c, v; + halfword g, v; const char *s; halfword n = *((halfword *) lua_touserdata(L, 1)); int t = type(n); @@ -5895,7 +5900,7 @@ static int lua_nodelib_direct_setdiscretionary(lua_State * L) static int lua_nodelib_direct_setfield(lua_State * L) { - halfword g, c, v; + halfword g, v; const char *s; halfword n = lua_tointeger(L, 1); diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index 7474ce3323b..23e5252dcf5 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -28,10 +28,10 @@ #define TeX -int luatex_version = 88; /* \.{\\luatexversion} */ +int luatex_version = 89; /* \.{\\luatexversion} */ int luatex_revision = '0'; /* \.{\\luatexrevision} */ -int luatex_date_info = 2016011500; /* the compile date is now hardwired */ -const char *luatex_version_string = "beta-0.88.0"; +int luatex_date_info = 2016012800; /* the compile date is now hardwired */ +const char *luatex_version_string = "beta-0.89.0"; const char *engine_name = my_name; /* the name of this engine */ #include <kpathsea/c-ctype.h> |