diff --git a/manual/luatex-callbacks.tex b/manual/luatex-callbacks.tex
index eb4fd6b8635c19682bf47ba8157ca7c513fec54d..34a8010eb0389df07cf78e304f9c67a2994dee80 100644
--- a/manual/luatex-callbacks.tex
+++ b/manual/luatex-callbacks.tex
@@ -45,8 +45,8 @@ instead of a function for clearing the callback.
For some minor speed gain, you can assign the boolean \type {false} to the
non|-|file related callbacks, doing so will prevent \LUATEX\ from executing
whatever it would execute by default (when no callback function is registered at
-all). Be warned: this may cause all sorts of grief unless you know {\em exactly}
-what you are doing!
+all). Be warned: this may cause all sorts of grief unless you know \notabene
+{exactly} what you are doing!
\startfunctioncall
<table> info =
diff --git a/manual/luatex-graphics.tex b/manual/luatex-graphics.tex
index d134b3163703759d2f8d4510a11382a26695dde3..56da90071b53d999fcf512cd9ab2ad212899aa4d 100644
--- a/manual/luatex-graphics.tex
+++ b/manual/luatex-graphics.tex
@@ -392,8 +392,8 @@ Generally speaking, it is best to keep your chunks small, but beware that all
chunks have to obey proper syntax, like each of them is a small file. For
instance, you cannot split a single statement over multiple chunks.
-In contrast with the normal stand alone \type {mpost} command, there is {\em no}
-implied \quote{input} at the start of the first chunk.
+In contrast with the normal stand alone \type {mpost} command, there is
+\notabene {no} implied \quote{input} at the start of the first chunk.
\subsection{\type {mp:finish}}
diff --git a/manual/luatex-languages.tex b/manual/luatex-languages.tex
index bdca27da4af9ce8609ce0323e1bde2bf0609e191..365e87f266c3d1d683d510b17883813ccf06c583 100644
--- a/manual/luatex-languages.tex
+++ b/manual/luatex-languages.tex
@@ -709,10 +709,10 @@ For example, take the word \type {office}, hyphenated \type {of-fice}, using a
type ligatures:
\starttabulate[|l|l|]
-\NC Initial: \NC \type {{o}{f}{f}{i}{c}{e}} \NC\NR
-\NC After hyphenation: \NC \type {{o}{f}{{-},{},{}}{f}{i}{c}{e}} \NC\NR
-\NC First ligature stage: \NC \type {{o}{{f-},{f},{<ff>}}{i}{c}{e}} \NC\NR
-\NC Final result: \NC \type {{o}{{f-},{<fi>},{<ffi>}}{c}{e}} \NC\NR
+\NC initial \NC \type {{o}{f}{f}{i}{c}{e}} \NC\NR
+\NC after hyphenation \NC \type {{o}{f}{{-},{},{}}{f}{i}{c}{e}} \NC\NR
+\NC first ligature stage \NC \type {{o}{{f-},{f},{<ff>}}{i}{c}{e}} \NC\NR
+\NC final result \NC \type {{o}{{f-},{<fi>},{<ffi>}}{c}{e}} \NC\NR
\stoptabulate
That's bad enough, but let us assume that there is also a hyphenation point
@@ -734,25 +734,25 @@ the top-level discretionary that resulted from the first hyphenation point.
Here is that nested solution again, in a different representation:
-\starttabulate[|l|l|l|l|]
-\NC \NC pre \NC post \NC replace \NC \NR
-\NC topdisc \NC \type {f-}$^1$ \NC sub1 \NC sub2 \NC \NR
-\NC sub1 \NC \type {f-}$^2$ \NC \type {i}$^3$ \NC \type {<fi>}$^4$ \NC \NR
-\NC sub2 \NC \type {<ff>-}$^5$\NC \type {i}$^6$ \NC \type {<ffi>}$^7$ \NC \NR
+\starttabulate[|l|c|c|c|c|c|c|]
+\NC \BC pre \BC \BC post \BC \BC replace \BC \NC \NR
+\NC topdisc \NC \type {f-} \NC (1) \NC \NC sub 1 \NC \NC sub 2 \NC \NR
+\NC sub 1 \NC \type {f-} \NC (2) \NC \type {i} \NC (3) \NC \type {<fi>} \NC (4) \NC \NR
+\NC sub 2 \NC \type {<ff>-} \NC (5) \NC \type {i} \NC (6) \NC \type {<ffi>} \NC (7) \NC \NR
\stoptabulate
When line breaking is choosing its breakpoints, the following fields will
eventually be selected:
-\starttabulate[|l|l|]
-\NC \type {of-f-ice} \NC \type {f-}$^1$ \NC \NR
-\NC \NC \type {f-}$^2$ \NC \NR
-\NC \NC \type {i}$^3$ \NC \NR
-\NC \type {of-fice} \NC \type {f-}$^1$ \NC \NR
-\NC \NC \type {<fi>}$^4$ \NC \NR
-\NC \type {off-ice} \NC \type {<ff>-}$^5$ \NC \NR
-\NC \NC \type {i}$^6$ \NC \NR
-\NC \type {office} \NC \type {<ffi>}$^7$ \NC \NR
+\starttabulate[|l|c|c|]
+\NC \type {of-f-ice} \NC \type {f-} \NC (1) \NC \NR
+\NC \NC \type {f-} \NC (2) \NC \NR
+\NC \NC \type {i} \NC (3) \NC \NR
+\NC \type {of-fice} \NC \type {f-} \NC (1) \NC \NR
+\NC \NC \type {<fi>} \NC (4) \NC \NR
+\NC \type {off-ice} \NC \type {<ff>-} \NC (5) \NC \NR
+\NC \NC \type {i} \NC (6) \NC \NR
+\NC \type {office} \NC \type {<ffi>} \NC (7) \NC \NR
\stoptabulate
The current solution in \LUATEX\ is not able to handle nested discretionaries,
@@ -770,14 +770,14 @@ make the whole stuff fit into just two discretionary nodes.
The mapping of the seven list fields to the six fields in this discretionary node
pair is as follows:
-\starttabulate[|l|p|]
-\BC field \BC description \NC \NR
-\NC \type {disc1.pre} \NC \type {f-}$^1$ \NC \NR
-\NC \type {disc1.post} \NC \type {<fi>}$^4$ \NC \NR
-\NC \type {disc1.replace} \NC \type {<ffi>}$^7$ \NC \NR
-\NC \type {disc2.pre} \NC \type {f-}$^2$ \NC \NR
-\NC \type {disc2.post} \NC \type {i}$^{3{,}6}$\NC \NR
-\NC \type {disc2.replace} \NC \type {<ff>-}$^5$\NC \NR
+\starttabulate[|l|c|c|]
+\BC field \BC description \NC \NC \NR
+\NC \type {disc1.pre} \NC \type {f-} \NC (1) \NC \NR
+\NC \type {disc1.post} \NC \type {<fi>} \NC (4) \NC \NR
+\NC \type {disc1.replace} \NC \type {<ffi>} \NC (7) \NC \NR
+\NC \type {disc2.pre} \NC \type {f-} \NC (2) \NC \NR
+\NC \type {disc2.post} \NC \type {i} \NC (3,6) \NC \NR
+\NC \type {disc2.replace} \NC \type {<ff>-} \NC (5) \NC \NR
\stoptabulate
What is actually generated after ligaturing has been applied is therefore:
diff --git a/manual/luatex-lua.tex b/manual/luatex-lua.tex
index 702fb3810e49663937d9ba7e3a1e4833d6f16b18..3d7e14700c75468bbbcd3f75f72a55d8568bcc81 100644
--- a/manual/luatex-lua.tex
+++ b/manual/luatex-lua.tex
@@ -404,7 +404,7 @@ The \type {os} library has a few extra functions and variables:
\startitem
\type {os.env} is a hash table containing a dump of the variables and
values in the process environment at the start of the run. It is writeable,
- but the actual environment is {\em not\/} updated automatically.
+ but the actual environment is \notabene {not} updated automatically.
\stopitem
\startitem
@@ -559,12 +559,17 @@ When Universal Time is needed, you can pass the flag \type {utc} to the engine.
property also works when the date and time are set by \LUATEX\ itself. It has a
complementary entry \type {use_utc_time} in the \type {texconfig} table.
-{\em To some extend a cleaner solution would be to have a flag that disables all
-variable data in one go (like filenames and so) but we just follow the method
-implemented in \PDFTEX\ where primitives are used to influence other properties.}
-
-{\em In \CONTEXT\ we provide the command line argument \type {--nodates} that
-does bit more disabling of dates.}
+\startnotabene
+ To some extend a cleaner solution would be to have a flag that disables all
+ variable data in one go (like filenames and so) but we just follow the method
+ implemented in \PDFTEX\ where primitives are used to influence other
+ properties.
+\stopnotabene
+
+\startnotabene
+ In \CONTEXT\ we provide the command line argument \type {--nodates} that does
+ bit more disabling of dates.
+\stopnotabene
\stopchapter
diff --git a/manual/luatex-nodes.tex b/manual/luatex-nodes.tex
index f7bea575fca91d44b0a5630750ce0d17d0b4a5db..60fc97ec671696931a9a8d747e89553c92ec0377 100644
--- a/manual/luatex-nodes.tex
+++ b/manual/luatex-nodes.tex
@@ -1704,7 +1704,7 @@ node.set_attribute(<node> n, <number> id, <number> val)
\stopfunctioncall
Sets the attribute with number \type {id} to the value \type {val}. Duplicate
-assignments are ignored. {\em [needs explanation]}
+assignments are ignored.
\subsubsection{\type {node.unset_attribute}}
diff --git a/manual/luatex-style.tex b/manual/luatex-style.tex
index c07dc3b765c1f07c4435b0a99146fd6410414daa..547fd204aaa9caf90bb8308d712db0d16852bf3a 100644
--- a/manual/luatex-style.tex
+++ b/manual/luatex-style.tex
@@ -214,7 +214,7 @@
luaorbitfactor := 1 ;
picture p ; p := lualogo xsized (3PaperWidth/5) ;
- draw p shifted center Page shifted (0,-.5ypart center ulcorner p) ;
+ draw p shifted center Page shifted (0,-.85ypart center ulcorner p) ;
StopPage ;
\stopuseMPgraphic
@@ -354,6 +354,16 @@
[margin=3em,
width=5em]
+\definestartstop
+ [notabene]
+ [style=slanted]
+
+\definestartstop
+ [preamble]
+ [style=normal,
+ before=\blank,
+ after=\blank]
+
% Hans doesn't like the bookmarks opening by default so we comment this:
%
% \setupinteractionscreen
diff --git a/manual/luatex-titlepage.tex b/manual/luatex-titlepage.tex
index 8ab56f85dd236e379fc778ba3997eeaff94b0a62..307741ee115a9e5117d964e1f0a52589d388a90c 100644
--- a/manual/luatex-titlepage.tex
+++ b/manual/luatex-titlepage.tex
@@ -21,7 +21,7 @@
[align=middle,
foregroundcolor=blue,
frame=off]
- {Lua\TeX\\Reference}
+ {Lua\TeX\\Reference Manual}
\definedfont[Bold*default at 18pt] \setupinterlinespace
diff --git a/manual/luatex.pdf b/manual/luatex.pdf
index 34bab3a1e10513549ce485e97e6eb056d4959df3..42d27172271458b11a8c859439a863d6b10f4181 100644
Binary files a/manual/luatex.pdf and b/manual/luatex.pdf differ
diff --git a/manual/luatex.tex b/manual/luatex.tex
index ba4bf3d1e2daab1013f2aca5fc89d1407b780aa0..b31b8759861d5d98d2eb9ccadc4aed95d469fa7e 100644
--- a/manual/luatex.tex
+++ b/manual/luatex.tex
@@ -47,7 +47,13 @@
[status=beta,
version=1.06.0]
-\component luatex-titlepage
+\startnotmode[*export]
+ \component luatex-titlepage
+\stopnotmode
+
+\startmode[*export]
+ \component luatex-export-titlepage
+\stopmode
\startfrontmatter
\component luatex-contents