2016-04-04 13:08:00

9 files changed, 81 insertions, 71 deletions

diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf
index 64041ab40..69080d27d 100644
--- a/doc/context/documents/general/manuals/luatex.pdf
+++ b/doc/context/documents/general/manuals/luatex.pdf
diff --git a/doc/context/sources/general/manuals/luatex/luatex-contents.tex b/doc/context/sources/general/manuals/luatex/luatex-contents.tex
index f002716b1..6d06b3ef0 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-contents.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-contents.tex
@@ -9,9 +9,9 @@
 
     \definecolor[maincolor][black]
 
-    \placecontent
-      [criterium=text,
-       level=subsection]
+    \placelist
+      [chapter,section,subsection]
+      [criterium=text]
 
 \stop
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
index 745d28c74..150532ec2 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
@@ -334,19 +334,19 @@ forward one or two places. The glyph that ends up to the right of the insertion
 point will become the next \quote {left}.
 
 \starttabulate[|l|c|l|l|]
-\NC \bf textual (Knuth) \NC \bf number \NC \bf string    \NC result \NC\NR
-\NC l + r =: n          \NC 0          \NC \type {=:}     \NC \|n    \NC\NR
-\NC l + r =:\| n        \NC 1          \NC \type {=:|}    \NC \|nr   \NC\NR
-\NC l + r \|=: n        \NC 2          \NC \type {|=:}    \NC \|ln   \NC\NR
-\NC l + r \|=:\| n      \NC 3          \NC \type {|=:|}   \NC \|lnr  \NC\NR
-\NC l + r  =:\|\> n     \NC 5          \NC \type {=:|>}   \NC n\|r   \NC\NR
-\NC l + r \|=:\> n      \NC 6          \NC \type {|=:>}   \NC l\|n   \NC\NR
-\NC l + r \|=:\|\> n    \NC 7          \NC \type {|=:|>}  \NC l\|nr  \NC\NR
-\NC l + r \|=:\|\>\> n  \NC 11         \NC \type {|=:|>>} \NC ln\|r  \NC\NR
+\NC \bf textual (Knuth)   \NC \bf number \NC \bf string     \NC result      \NC\NR
+\NC \type{l + r =: n}     \NC 0          \NC \type {=:}     \NC \type{|n}   \NC\NR
+\NC \type{l + r =:| n}    \NC 1          \NC \type {=:|}    \NC \type{|nr}  \NC\NR
+\NC \type{l + r |=: n}    \NC 2          \NC \type {|=:}    \NC \type{|ln}  \NC\NR
+\NC \type{l + r |=:| n}   \NC 3          \NC \type {|=:|}   \NC \type{|lnr} \NC\NR
+\NC \type{l + r  =:|> n}  \NC 5          \NC \type {=:|>}   \NC \type{n|r}  \NC\NR
+\NC \type{l + r |=:> n}   \NC 6          \NC \type {|=:>}   \NC \type{l|n}  \NC\NR
+\NC \type{l + r |=:|> n}  \NC 7          \NC \type {|=:|>}  \NC \type{l|nr} \NC\NR
+\NC \type{l + r |=:|>> n} \NC 11         \NC \type {|=:|>>} \NC \type{ln|r} \NC\NR
 \stoptabulate
 
 The default value is~0, and can be left out. That signifies a \quote {normal}
-ligature where the ligature replaces both original glyphs. In this table the~\|
+ligature where the ligature replaces both original glyphs. In this table the~\type {|}
 indicates the final insertion point.
 
 The \type {commands} array is explained below.
diff --git a/doc/context/sources/general/manuals/luatex/luatex-introduction.tex b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
index ad03970a5..683be81b5 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
@@ -20,9 +20,9 @@ internals and experimental features evolved into stable ones or were dropped.
 Already quite early \LUATEX\ could be used for production and it was used in
 production by the authors. Successive versions sometimes demanded a adaption to
 the \LUA\ interfacing, but the concepts were unchanged. The current version can
-be considered stable in functionality and there will be no fundamental changes
-between 0.90 and 1.00. Of course we then can decide to move towards version 2.00
-with different properties.
+be considered stable in functionality and there will be no fundamental changes.
+Of course we then can decide to move towards version 2.00 with different
+properties.
 
 Don't expect \LUATEX\ to behave the same as \PDFTEX ! Although the core
 functionality of that 8 bit engine was starting point, it has been combined with
diff --git a/doc/context/sources/general/manuals/luatex/luatex-libraries.tex b/doc/context/sources/general/manuals/luatex/luatex-libraries.tex
index 93ea85118..9adf352a0 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-libraries.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-libraries.tex
@@ -415,7 +415,7 @@ what list you can give a treat.
 \NC\type {adjust_tail}     \NC \type {adjust_head}     \NC \NR
 \stoptabulate
 
-\subsubsection{\type {buildpage_filter}}
+\subsubsection{\type {buildpage_filter} and \type {contribute_filter}}
 
 This callback is called whenever \LUATEX\ is ready to move stuff to the main
 vertical list. You can use this callback to do specialized manipulation of the
@@ -427,15 +427,13 @@ end
 \stopfunctioncall
 
 The string \type {extrainfo} gives some additional information about what \TEX's
-state is with respect to the \quote {current page}. The possible values are:
+state is with respect to the \quote {current page}. The possible values for the
+\type {buildpage_filter} callback are:
 
 \starttabulate[|lT|p|]
 \NC \ssbf value     \NC \bf explanation                           \NC \NR
 \NC alignment       \NC a (partial) alignment is being added      \NC \NR
 \NC after_output    \NC an output routine has just finished       \NC \NR
-\NC box             \NC a typeset box is being added              \NC \NR
-%NC pre_box         \NC interline material is being added         \NC \NR
-%NC adjust          \NC \type {\vadjust} material is being added  \NC \NR
 \NC new_graf        \NC the beginning of a new paragraph          \NC \NR
 \NC vmode_par       \NC \type {\par} was found in vertical mode   \NC \NR
 \NC hmode_par       \NC \type {\par} was found in horizontal mode \NC \NR
@@ -446,7 +444,23 @@ state is with respect to the \quote {current page}. The possible values are:
 \NC end             \NC \LUATEX\ is terminating (it's all over)   \NC \NR
 \stoptabulate
 
-This callback does not replace any internal code.
+And for the \type {contribute_filter} called in the post line break handler
+we have four cases (three are only called when there is a need for it).
+
+\starttabulate[|lT|p|]
+\NC \ssbf value     \NC \bf explanation                              \NC \NR
+\NC pre_box         \NC interline material is being added            \NC \NR
+\NC pre_adjust      \NC \type {\vadjust} material is being added     \NC \NR
+\NC box             \NC a typeset box is being added (always called) \NC \NR
+\NC adjust          \NC \type {\vadjust} material is being added     \NC \NR
+\stoptabulate
+
+Just before the \type {box} related call we have a callout to the \type
+{append_to_vlist_filter}.
+
+These callbacks do not replace any internal code.
+
+% pre_box pre_adjust box adjust
 
 \subsubsection{\type {pre_linebreak_filter}}
 
@@ -488,7 +502,7 @@ three things:
 
 \startitemize
 \startitem
-    boolean \type {true} signals succesfull processing
+    boolean \type {true} signals successful processing
 \stopitem
 \startitem
     \type {<node>} signals that the \quote {head} node should be replaced by the
@@ -3964,17 +3978,17 @@ is also possible:
 
 \startfunctioncall
 <number> w, <number> h, <number> d  =
-  node.dimensions(<number> glue_set, <number> glue_sign,
-                 <number> glue_order, <node> n)
+    node.dimensions(<number> glue_set, <number> glue_sign,
+        <number> glue_order, <node> n)
 <number> w, <number> h, <number> d  =
-  node.dimensions(<number> glue_set, <number> glue_sign,
-                 <number> glue_order, <node> n, <string> dir)
+    node.dimensions(<number> glue_set, <number> glue_sign,
+         <number> glue_order, <node> n, <string> dir)
 <number> w, <number> h, <number> d  =
-  node.dimensions(<number> glue_set, <number> glue_sign,
-                 <number> glue_order, <node> n, <node> t)
+    node.dimensions(<number> glue_set, <number> glue_sign,
+        <number> glue_order, <node> n, <node> t)
 <number> w, <number> h, <number> d  =
-  node.dimensions(<number> glue_set, <number> glue_sign,
-                 <number> glue_order, <node> n, <node> t, <string> dir)
+    node.dimensions(<number> glue_set, <number> glue_sign,
+         <number> glue_order, <node> n, <node> t, <string> dir)
 \stopfunctioncall
 
 This calling method takes glue settings into account and is especially useful for
diff --git a/doc/context/sources/general/manuals/luatex/luatex-lua.tex b/doc/context/sources/general/manuals/luatex/luatex-lua.tex
index 5bf4f3475..eb2af013e 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-lua.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-lua.tex
@@ -71,7 +71,6 @@ but have no consequence. The following command|-|line options are understood:
 \NC --version                    \NC display version and exit \NC \NR
 \NC --credits                    \NC display credits and exit \NC \NR
 \NC --recorder                   \NC enable filename recorder \NC \NR
-\NC --etex                       \NC ignored \NC \NR
 \NC --output-comment=STRING      \NC use \type {STRING} for \DVI\ file comment instead of
                                      date (no effect for \PDF) \NC \NR
 \NC --output-directory=DIR       \NC use \type {DIR} as the directory to write files to \NC \NR
@@ -87,24 +86,26 @@ but have no consequence. The following command|-|line options are understood:
 \NC --[no-]file-line-error       \NC disable/enable \type {file:line:error} style messages  \NC \NR
 \NC --[no-]file-line-error-style \NC aliases of \type {--[no-]file-line-error} \NC \NR
 \NC --jobname=STRING             \NC set the job name to \type {STRING} \NC \NR
-\NC --[no-]parse-first-line      \NC ignored \NC \NR
-\NC --translate-file=            \NC ignored \NC \NR
-\NC --default-translate-file=    \NC ignored \NC \NR
-\NC --8bit                       \NC ignored \NC \NR
 \NC --[no-]mktex=FMT             \NC disable/enable \type {mktexFMT} generation with \type {FMT}
                                      is \type {tex} or \type {tfm} \NC \NR
 \NC --synctex=NUMBER             \NC enable \type {synctex} \NC \NR
 \stoptabulate
 
-A note on the creation of the various temporary files and the \type {\jobname}.
+Some of the traditional flags are just ignored:
+\type {--etex},
+\type {--translate-file},
+\type {--8bit}.
+\type {--[no-]parse-first-line},
+\type {--default-translate-file},
+
 The value to use for \type {\jobname} is decided as follows:
 
 \startitemize
 \startitem
-  If \type {--jobname} is given on the command line, its argument will be the
-  value for \type {\jobname}, without any changes. The argument will not be used
-  for actual input so it need not exist. The \type {--jobname} switch only
-  controls the \type {\jobname} setting.
+    If \type {--jobname} is given on the command line, its argument will be the
+    value for \type {\jobname}, without any changes. The argument will not be
+    used for actual input so it need not exist. The \type {--jobname} switch only
+    controls the \type {\jobname} setting.
 \stopitem
 \startitem
     Otherwise, \type {\jobname} will be the name of the first file that is read
@@ -120,7 +121,7 @@ The value to use for \type {\jobname} is decided as follows:
 \stopitemize
 
 The file names for output files that are generated automatically are created by
-attaching the proper extension (\type {.log}, \type {.pdf}, etc.) to the found
+attaching the proper extension (\type {log}, \type {pdf}, etc.) to the found
 \type {\jobname}. These files are created in the directory pointed to by \type
 {--output-directory}, or in the current directory, if that switch is not present.
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
index e77590369..440568be5 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
@@ -349,6 +349,9 @@ Id: \showid{glue}
 \NC shrink_order  \NC number   \NC \NC \NR
 \stoptabulate
 
+Note that we use the key \type {width} in both horizontal and vertical glue. This
+suits the \TEX\ internals well so we decided to stick to that naming.
+
 The exact meanings of the subtypes are as follows:
 
 \starttabulate[|rT|l|]
diff --git a/doc/context/sources/general/manuals/luatex/luatex-style.tex b/doc/context/sources/general/manuals/luatex/luatex-style.tex
index 1c79b7695..bb66dc00b 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-style.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-style.tex
@@ -1,7 +1,5 @@
 \startenvironment luatex-style
 
-% I'll clean this up some day.
-
 \usemodule[abr-02]
 
 \setuplayout
@@ -34,44 +32,37 @@
 \setupwhitespace
   [medium]
 
-\def\|{\string|}
-\def\>{\string>}
+\startluacode
+    local skipped = table.tohash { 'id', 'subtype', 'next', 'prev' }
 
-\def\showfields#1{\ctxlua
-    {
-        local t = string.split('#1',',')
+    function document.functions.showfields(s)
+        local t = string.split(s,',')
         local r = { }
         for _, a in pairs(node.fields(t[1],t[2])) do
-            if not (a == 'id' or a == 'subtype' or a =='next' or a=='prev') then
+            if not skipped[a] then
                 table.insert(r,'\\type{'.. a .. '}')
             end
         end
         tex.sprint(table.concat(r, ', '))
-    }%
-}
+    end
 
-\def\showid#1{\ctxlua
-    {
-        local t = string.split('#1',',')
+    function document.functions.showid(s)
+        local t = string.split(s,',')
         tex.sprint('\\type{'.. node.id(t[1]) .. '}')
         if t[2] then
-          tex.sprint(', \\type{'.. node.subtype(t[2]) .. '}')
+            tex.sprint(', \\type{'.. node.subtype(t[2]) .. '}')
         end
-    }%
-}
-
-\starttexdefinition unexpanded todo #1
-    \dontleavehmode
-    \startcolor[red]
-        \bf<TODO: #1>
-    \stopcolor
-\stoptexdefinition
+    end
+\stopluacode
 
-\definecolor[blue] [b=.5]
-\definecolor[red]  [r=.5]
-\definecolor[green][g=.5]
+\unexpanded\def\showfields#1{\ctxlua{document.functions.showfields("#1")}}
+\unexpanded\def\showid    #1{\ctxlua{document.functions.showid("#1")}}
 
+\definecolor[blue]      [b=.5]
+\definecolor[red]       [r=.5]
+\definecolor[green]     [g=.5]
 \definecolor[maincolor] [b=.5]
+\definecolor[keptcolor] [b=.5]
 \definecolor[othercolor][r=.5,g=.5]
 
 \setupbodyfont[modern] % we need this in examples so we predefine
@@ -319,12 +310,13 @@
 
 \setuplist
   [chapter,section,subsection,subsubsection]
-  [interaction=all]
+  [interaction=all,
+   width=6em]
 
 \setuplist
   [chapter]
   [style=bold,
-   color=maincolor]
+   color=keptcolor]
 
 % Hans doesn't like the bookmarks opening by default so we comment this:
 %
diff --git a/doc/context/sources/general/manuals/luatex/luatex.tex b/doc/context/sources/general/manuals/luatex/luatex.tex
index dd5bfac7c..fc17fbedf 100644
--- a/doc/context/sources/general/manuals/luatex/luatex.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex.tex
@@ -10,7 +10,7 @@
 
 \startdocument
   [version=0.95.0,
-   status=Experimental]
+   status=Pre-release]
 
 \component luatex-titlepage