texlive[50412] trunk: Additional wrapping of local boxes; updated
commits+lscarso at tug.org
commits+lscarso at tug.org
Sat Mar 16 15:22:45 CET 2019
Revision: 50412
http://tug.org/svn/texlive?view=revision&revision=50412
Author: lscarso
Date: 2019-03-16 15:22:44 +0100 (Sat, 16 Mar 2019)
Log Message:
-----------
Additional wrapping of local boxes; updated luatex manual.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/luatexdir/lang/texlang.c
trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
trunk/Build/source/texk/web2c/luatexdir/tex/maincontrol.c
trunk/Master/texmf-dist/doc/luatex/base/luatex-enhancements.tex
trunk/Master/texmf-dist/doc/luatex/base/luatex-introduction.tex
trunk/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex
trunk/Master/texmf-dist/doc/luatex/base/luatex-style.tex
trunk/Master/texmf-dist/doc/luatex/base/luatex-tex.tex
trunk/Master/texmf-dist/doc/luatex/base/luatex.pdf
trunk/Master/texmf-dist/doc/luatex/base/luatex.tex
Modified: trunk/Build/source/texk/web2c/luatexdir/lang/texlang.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/lang/texlang.c 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Build/source/texk/web2c/luatexdir/lang/texlang.c 2019-03-16 14:22:44 UTC (rev 50412)
@@ -944,6 +944,9 @@
halfword s, r = head, wordstart = null, save_tail1 = null, left = null, right = null;
halfword expstart = null;
boolean compound_hyphen = compound_hyphen_mode_par;
+ /*tex Let's play safe: */
+ if (tail == null)
+ return;
/*tex
This first movement assures two things:
@@ -969,7 +972,8 @@
r = find_next_wordstart(r,first_language,strict_bound);
if (r == null)
return;
- assert(tail != null);
+ if (tail == null)
+ return;
save_tail1 = vlink(tail);
s = new_penalty(0,word_penalty);
couple_nodes(tail, s);
Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2019-03-16 14:22:44 UTC (rev 50412)
@@ -1 +1 @@
-#define luatex_svn_revision 7112
+#define luatex_svn_revision 7116
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/maincontrol.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/maincontrol.c 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/maincontrol.c 2019-03-16 14:22:44 UTC (rev 50412)
@@ -2176,10 +2176,20 @@
p = vlink(head);
pop_nest();
if (p != null) {
- /*tex Somehow |filtered_hpack| goes beyond the first node so we loose it. */
- new_hyphenation(p, null);
+ /*tex
+ Somehow |filtered_hpack| goes beyond the first node so we loose it.
+ */
+ /*tex
+ There is no need for |new_hyphenation(p, null);| here as we're in
+ an |\hbox|.
+ */
(void) new_ligkern(p, null);
p = lua_hpack_filter(p, 0, additional, local_box_group, -1, null);
+ /*tex
+ We really need something packed so we play safe! This feature is inherited
+ but could have been delegated to a callback anyway.
+ */
+ p = hpack(p, 0, additional, -1);
}
if (kind == 0)
eq_define(local_left_box_base, box_ref_cmd, p);
Modified: trunk/Master/texmf-dist/doc/luatex/base/luatex-enhancements.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/base/luatex-enhancements.tex 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Master/texmf-dist/doc/luatex/base/luatex-enhancements.tex 2019-03-16 14:22:44 UTC (rev 50412)
@@ -61,7 +61,11 @@
There are three new primitives to test the version of \LUATEX:
\unexpanded\def\VersionHack#1% otherwise different luatex and luajittex runs
- {\cldcontext{(string.gsub(string.match("\luatexbanner","(.+)\letterpercent("),"jit",""))}}
+ {\ctxlua{%
+ local banner = "\luatexbanner"
+ local banner = string.match(banner,"(.+)\letterpercent(") or banner
+ context(string.gsub(banner ,"jit",""))%
+ }}
\starttabulate[|l|l|pl|]
\DB primitive \BC value
Modified: trunk/Master/texmf-dist/doc/luatex/base/luatex-introduction.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/base/luatex-introduction.tex 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Master/texmf-dist/doc/luatex/base/luatex-introduction.tex 2019-03-16 14:22:44 UTC (rev 50412)
@@ -163,7 +163,7 @@
\starttabulate[|||]
\NC Version \EQ \currentdate \NC \NR
\NC \LUATEX \EQ \cldcontext{LUATEXENGINE} %
- \cldcontext{LUATEXVERSION} / %
+ \cldcontext{"\letterpercent 0.2f",LUATEXVERSION} / %
\cldcontext{LUATEXFUNCTIONALITY}
\NC \NR
\NC \CONTEXT \EQ MkIV \contextversion \NC \NR
Modified: trunk/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex 2019-03-16 14:22:44 UTC (rev 50412)
@@ -2305,8 +2305,8 @@
\def\supported#1#2#3%
{\NC \type{#1}
- \NC \ifx#2\yes\libidx{node} {#1}\fi #2
- \NC \ifx#3\yes\libidx{node.direct}{#1}\fi #3 \NC
+ \NC \ifx#2\yes\lix{node} {#1}\fi #2
+ \NC \ifx#3\yes\lix{node.direct}{#1}\fi #3 \NC
\NR}
\starttabulate[|l|c|c|]
Modified: trunk/Master/texmf-dist/doc/luatex/base/luatex-style.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/base/luatex-style.tex 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Master/texmf-dist/doc/luatex/base/luatex-style.tex 2019-03-16 14:22:44 UTC (rev 50412)
@@ -436,6 +436,7 @@
\unexpanded\def\lib #1{\doifmode{*bodypart}{\expanded{\libraryindex{\currentlibraryindex+#1}}\type{\currentlibraryindex.#1}}}
\unexpanded\def\libindex#1{\doifmode{*bodypart}{\expanded{\libraryindex{\currentlibraryindex+#1}}}}
\unexpanded\def\libidx#1#2{\doifmode{*bodypart}{\expanded{\libraryindex{#1+#2}}\type{#1.#2}}}
+\unexpanded\def\lix #1#2{\doifmode{*bodypart}{\expanded{\libraryindex{#1+#2}}}}
% \setstructurepageregister[][keys:1=,entries:1=]
Modified: trunk/Master/texmf-dist/doc/luatex/base/luatex-tex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/base/luatex-tex.tex 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Master/texmf-dist/doc/luatex/base/luatex-tex.tex 2019-03-16 14:22:44 UTC (rev 50412)
@@ -1277,11 +1277,12 @@
tex.cprint(14,"12: $&{\\foo}") tex.print("\\par") -- comment triggers
\stopfunctioncall
-\subsubsection{\type {write}, \type {twrite}, \type {nwrite}}
+% \subsubsection{\type {write}, \type {twrite}, \type {nwrite}}
+\subsubsection{\type {write}}
\libindex{write}
-\libindex{twrite}
-\libindex{nwrite}
+% \libindex{twrite}
+% \libindex{nwrite}
\startfunctioncall
tex.write(<string> s, ...)
@@ -1301,10 +1302,10 @@
consecutive array of strings to print (the first non-string value will stop the
printing process).
-The functions \type {twrite} and \type {nwrite} can be used to write a token or
-node back to \TEX\, possibly intermixed with regular strings that will be
-tokenized. You have to make sure that you pass the right data because sometimes
-\TEX\ has expectations that need to be met.
+% The functions \type {twrite} and \type {nwrite} can be used to write a token or
+% node back to \TEX\, possibly intermixed with regular strings that will be
+% tokenized. You have to make sure that you pass the right data because sometimes
+% \TEX\ has expectations that need to be met.
\stopsubsection
@@ -1440,10 +1441,9 @@
In case of an error the \type {show_context} function will show the current
context where we're at (in the expansion).
-\subsubsection{\type {run}, \type {runtoks}, \type {finish}}
+\subsubsection{\type {run}, \type {finish}}
\libindex{run}
-\libindex{runtoks}
\libindex{finish}
These two functions start the interpretations and force its end. A runs normally
@@ -1454,6 +1454,8 @@
pushing and popping input states, but in the end after all the action is done
returns to the main loop.
+\subsubsection{\type {runtoks}}
+
Because of the fact that \TEX\ is in a complex dance of expanding, dealing with
fonts, typesetting paragraphs, messing around with boxes, building pages, and so
on, you cannot easily run a nested \TEX\ run (read nested main loop). However,
@@ -1473,7 +1475,7 @@
When the \prm {tracingnesting} parameter is set to a value larger than~2 some
information is reported about the state of the local loop.
-\subsubsection{\type {run}, \type {runtoks}, \type {finish}}
+\subsubsection{\type {forcehmode}}
\libindex{forcehmode}
Modified: trunk/Master/texmf-dist/doc/luatex/base/luatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/base/luatex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/base/luatex.tex 2019-03-16 11:56:39 UTC (rev 50411)
+++ trunk/Master/texmf-dist/doc/luatex/base/luatex.tex 2019-03-16 14:22:44 UTC (rev 50412)
@@ -62,7 +62,7 @@
\startdocument
[manual=Lua\TeX,
- status=experimental,
+ status=stable,
version=1.10]
\startnotmode[*export]
More information about the tex-live-commits
mailing list