summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/luatex/base/luatex-nodes.tex4
-rw-r--r--Master/texmf-dist/doc/luatex/base/luatex-tex.tex20
-rw-r--r--Master/texmf-dist/doc/luatex/base/luatex.pdfbin1756455 -> 1756085 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/base/luatex.tex7
4 files changed, 21 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex b/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex
index a3b8f4b2437..a379b7b0a4d 100644
--- a/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex
+++ b/Master/texmf-dist/doc/luatex/base/luatex-nodes.tex
@@ -1935,8 +1935,8 @@ character protrusion is active, this node can be skipped.
\libindex {setglue}
-You can set the properties of a glue in one go. If you pass no values or
-not valid numbers, the glue will become a zero glue.
+You can set the five properties of a glue in one go. Non|-|numeric values are
+equivalent to zero and reset a property.
\startfunctioncall
node.setglue(<node> n)
diff --git a/Master/texmf-dist/doc/luatex/base/luatex-tex.tex b/Master/texmf-dist/doc/luatex/base/luatex-tex.tex
index 4e70243c6d2..dacaec0cb92 100644
--- a/Master/texmf-dist/doc/luatex/base/luatex-tex.tex
+++ b/Master/texmf-dist/doc/luatex/base/luatex-tex.tex
@@ -689,13 +689,14 @@ We have similar setters for \type {count}, \type {dimen}, \type {muskip}, and
\type {toks}. Counters and dimen are represented by numbers, skips and muskips by
nodes, and toks by strings.
-Again the glue variants are not using the \nod {glue-spec} userdata nodes. The
+Again the glue variants are not using the \nod {glue_spec} userdata nodes. The
\type {setglue} function accepts upto 5 arguments: width, stretch, shrink,
-stretch order and shrink order and the \type {getglue} function reports them,
-unless the second argument is \type {false} in which care only the width is
-returned.
+stretch order and shrink order. If you pass no values or if a value is not a
+number the corresponding property will become a zero. The \type {getglue}
+function reports all properties, unless the second argument is \type {false} in
+which care only the width is returned.
-Here is an example usign a threesome:
+Here is an example using a threesome:
\startfunctioncall
local d = tex.getdimen("foo")
@@ -725,7 +726,7 @@ are special because they have to deal with more properties.
As with the general \type {get} and \type {set} function discussed before, for
the skip registers \type {getskip} returns a node and \type {getglue} returns
-numbers, while \type {setskip} accepts a node and \type {setglue} expects upto 5
+numbers, while \type {setskip} accepts a node and \type {setglue} expects upto five
numbers. Again, when you pass \type {false} as second argument to \type {getglue}
you only get the width returned. The same is true for the \type {mu} variants
\type {getmuskip}, \type {setmuskip}, \type {getmuskip} and\type {setmuskip}.
@@ -737,7 +738,7 @@ tex.scantoks(0,3,"$e=mc^2$")
tex.scantoks("global",0,"$\int\limits^1_2$")
\stopfunctioncall
-In the function-based interface, it is possible to define values globally by
+In the function|-|based interface, it is possible to define values globally by
using the string \type {global} as the first function argument.
\stopsubsection
@@ -1614,7 +1615,10 @@ primitives \quote{\tex{ }}, \quote{\tex {/}} and \quote{\type {-}} are defined.
\startluacode
function document.showprimitives(tag)
- for k, v in table.sortedpairs(tex.extraprimitives(tag)) do
+ local t = tex.extraprimitives(tag)
+ table.sort(t)
+ for i=1,#t do
+ local v = t[i]
if v ~= ' ' and v ~= "/" and v ~= "-" then
context.type(v)
context.space()
diff --git a/Master/texmf-dist/doc/luatex/base/luatex.pdf b/Master/texmf-dist/doc/luatex/base/luatex.pdf
index f7ecdaa1b9f..aad713bec60 100644
--- a/Master/texmf-dist/doc/luatex/base/luatex.pdf
+++ b/Master/texmf-dist/doc/luatex/base/luatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/base/luatex.tex b/Master/texmf-dist/doc/luatex/base/luatex.tex
index fb331cabffb..5a14b40bfda 100644
--- a/Master/texmf-dist/doc/luatex/base/luatex.tex
+++ b/Master/texmf-dist/doc/luatex/base/luatex.tex
@@ -23,6 +23,13 @@
% comment : Some (parts of) chapters might have been published in TugBoat, the NTG Maps, the
% ConTeXt Group journal or otherwise. Thanks to the editors for corrections. Also
% thanks to users for testing, feedback and corrections.
+%
+% comment : Of course specific distribution can add to the manual, but that is of course not
+% our responsibility. The official (latest) version of this manual is part of the
+% ConTeXt distribution, including a pdf file that is produced with the current
+% version of ConTeXt. So, in case of doubt use that one as reference. Some of the
+% improvements in the LuaMetaTeX manual that apply to LuaTeX might get retrofitted
+% in LuaTeX manual in due time.
% \tex vs \type vs \syntax vs. \luatex
% \em \it \/