diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-01-16 04:56:12 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-01-16 04:56:12 +0000 |
commit | 2799b66b62910f3c6a13a752a2364038d6d11555 (patch) | |
tree | 7368b0beb5c14ceb4e8b09c9f42dc715643328d3 /Build/source/texk/web2c | |
parent | 8547cbd639fc4e31ae4f91db91037a2930995acd (diff) |
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@39405 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/luatex.c | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/inputstack.w | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index f434524c821..7474ce3323b 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 = 87; /* \.{\\luatexversion} */ -int luatex_revision = '2'; /* \.{\\luatexrevision} */ -int luatex_date_info = 2016011100; /* the compile date is now hardwired */ -const char *luatex_version_string = "beta-0.87.2"; +int luatex_version = 88; /* \.{\\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"; const char *engine_name = my_name; /* the name of this engine */ #include <kpathsea/c-ctype.h> diff --git a/Build/source/texk/web2c/luatexdir/tex/inputstack.w b/Build/source/texk/web2c/luatexdir/tex/inputstack.w index 273863d2042..be4cf9378e4 100644 --- a/Build/source/texk/web2c/luatexdir/tex/inputstack.w +++ b/Build/source/texk/web2c/luatexdir/tex/inputstack.w @@ -662,6 +662,15 @@ a linked list of variable size nodes representing lines not yet processed: the |subtype| field contains the size of this node, all the following words contain ASCII codes. +/* + + hh: todo: if this is really critical code (which it isn't) then we can + consider a c stack and store a pointer to a line in the line node instead + which saves splitting here and reconstructing later. + +*/ + + @c halfword pseudo_files; /* stack of pseudo files */ @@ -696,13 +705,12 @@ static halfword string_to_pseudo(str_number str, int nl) w.b2 = (quarterword) (l > m ? s[m++] : ' '); w.b3 = (quarterword) (l > m ? s[m] : ' '); varmem[++i].qqqq = w; - if (pseudo_lines(h) == null) { + if (q == null) { pseudo_lines(h) = r; - q = r; } else { - couple_nodes(q, r); + vlink(q) = r ; /* no prev node here so no couple_nodes !*/ } - q = vlink(q); + q = r ; if (s[l] == nl) l++; } |