2016-09-23 10:19:00

14 files changed, 130 insertions, 24 deletions

diff --git a/doc/context/documents/general/fonts/fonts-mkiv.pdf b/doc/context/documents/general/fonts/fonts-mkiv.pdf
index 2618dd563..c96d8cda2 100644
--- a/doc/context/documents/general/fonts/fonts-mkiv.pdf
+++ b/doc/context/documents/general/fonts/fonts-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf
index eba3d9c33..a5b873ebd 100644
--- a/doc/context/documents/general/manuals/luatex.pdf
+++ b/doc/context/documents/general/manuals/luatex.pdf
diff --git a/doc/context/general/qrcs/setup-cs.pdf b/doc/context/general/qrcs/setup-cs.pdf
new file mode 100644
index 000000000..dab5da3f4
--- /dev/null
+++ b/doc/context/general/qrcs/setup-cs.pdf
diff --git a/doc/context/general/qrcs/setup-de.pdf b/doc/context/general/qrcs/setup-de.pdf
new file mode 100644
index 000000000..fb76ba4ab
--- /dev/null
+++ b/doc/context/general/qrcs/setup-de.pdf
diff --git a/doc/context/general/qrcs/setup-en.pdf b/doc/context/general/qrcs/setup-en.pdf
new file mode 100644
index 000000000..73f85f451
--- /dev/null
+++ b/doc/context/general/qrcs/setup-en.pdf
diff --git a/doc/context/general/qrcs/setup-fr.pdf b/doc/context/general/qrcs/setup-fr.pdf
new file mode 100644
index 000000000..c018d66dd
--- /dev/null
+++ b/doc/context/general/qrcs/setup-fr.pdf
diff --git a/doc/context/general/qrcs/setup-it.pdf b/doc/context/general/qrcs/setup-it.pdf
new file mode 100644
index 000000000..9fe725d5d
--- /dev/null
+++ b/doc/context/general/qrcs/setup-it.pdf
diff --git a/doc/context/general/qrcs/setup-nl.pdf b/doc/context/general/qrcs/setup-nl.pdf
new file mode 100644
index 000000000..ca79fafde
--- /dev/null
+++ b/doc/context/general/qrcs/setup-nl.pdf
diff --git a/doc/context/general/qrcs/setup-ro.pdf b/doc/context/general/qrcs/setup-ro.pdf
new file mode 100644
index 000000000..7609347b1
--- /dev/null
+++ b/doc/context/general/qrcs/setup-ro.pdf
diff --git a/doc/context/scripts/mkiv/mtx-cache.xml b/doc/context/scripts/mkiv/mtx-cache.xml
index 0f851a1e0..4bd3acc3d 100644
--- a/doc/context/scripts/mkiv/mtx-cache.xml
+++ b/doc/context/scripts/mkiv/mtx-cache.xml
@@ -2,7 +2,7 @@
 <application>
  <metadata>
   <entry name="name">mtx-cache</entry>
-  <entry name="detail">ConTeXt & MetaTeX Cache Management</entry>
+  <entry name="detail">ConTeXt &amp; MetaTeX Cache Management</entry>
   <entry name="version">0.10</entry>
  </metadata>
  <flags>
diff --git a/doc/context/sources/general/manuals/luatex/luatex-math.tex b/doc/context/sources/general/manuals/luatex/luatex-math.tex
index ca93b1b9b..b6634f840 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-math.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-math.tex
@@ -38,6 +38,99 @@ be used as numeric values, so you can write code like this:
 \fi \fi
 \stoptyping
 
+Sometimes you won't get what you expect so a bit of explanation might help to
+understand what happens. When math is parsed and expanded it gets turned into a
+linked list. In a second pass the formula will be build. This has to do with the
+fact that in order to determine the automatically chosen sizes (in for instance
+fractions) following content can influence preceding sizes. A side effect of this
+is for instance that one cannot change the definition of a font family (and
+thereby reusing numbers) because the number that got used is stored and used in
+the second pass (so changing \type {\fam 12} mid|-|formula spoils over to
+preceding use of that family).
+
+The style switching primitives like \type {\textstyle} are turned into nodes so
+the styles set there are frozen. The \type {\mathchoice} primitive results in
+four lists being constructed of which one is used in the second pass. The fact
+that some automatic styles are not yet known also means that the \type
+{\mathstyle} primitive expands to the current style which can of course be
+different from the one really used. It's a snapshot of the first pass state. As a
+consequence in the following example you get a style number (first pass) typeset
+that can actually differ from the used style (second pass). In the case of a math
+choice used ungrouped, the chosen style is used after the choice too, unless you
+group.
+
+\startbuffer[1]
+    [a:\mathstyle]\quad
+    \bgroup
+    \mathchoice
+        {\bf \scriptstyle       (x:d :\mathstyle)}
+        {\bf \scriptscriptstyle (x:t :\mathstyle)}
+        {\bf \scriptscriptstyle (x:s :\mathstyle)}
+        {\bf \scriptscriptstyle (x:ss:\mathstyle)}
+    \egroup
+    \quad[b:\mathstyle]\quad
+    \mathchoice
+        {\bf \scriptstyle       (y:d :\mathstyle)}
+        {\bf \scriptscriptstyle (y:t :\mathstyle)}
+        {\bf \scriptscriptstyle (y:s :\mathstyle)}
+        {\bf \scriptscriptstyle (y:ss:\mathstyle)}
+    \quad[c:\mathstyle]\quad
+    \bgroup
+    \mathchoice
+        {\bf \scriptstyle       (z:d :\mathstyle)}
+        {\bf \scriptscriptstyle (z:t :\mathstyle)}
+        {\bf \scriptscriptstyle (z:s :\mathstyle)}
+        {\bf \scriptscriptstyle (z:ss:\mathstyle)}
+    \egroup
+    \quad[d:\mathstyle]
+\stopbuffer
+
+\startbuffer[2]
+    [a:\mathstyle]\quad
+    \begingroup
+    \mathchoice
+        {\bf \scriptstyle       (x:d :\mathstyle)}
+        {\bf \scriptscriptstyle (x:t :\mathstyle)}
+        {\bf \scriptscriptstyle (x:s :\mathstyle)}
+        {\bf \scriptscriptstyle (x:ss:\mathstyle)}
+    \endgroup
+    \quad[b:\mathstyle]\quad
+    \mathchoice
+        {\bf \scriptstyle       (y:d :\mathstyle)}
+        {\bf \scriptscriptstyle (y:t :\mathstyle)}
+        {\bf \scriptscriptstyle (y:s :\mathstyle)}
+        {\bf \scriptscriptstyle (y:ss:\mathstyle)}
+    \quad[c:\mathstyle]\quad
+    \begingroup
+    \mathchoice
+        {\bf \scriptstyle       (z:d :\mathstyle)}
+        {\bf \scriptscriptstyle (z:t :\mathstyle)}
+        {\bf \scriptscriptstyle (z:s :\mathstyle)}
+        {\bf \scriptscriptstyle (z:ss:\mathstyle)}
+    \endgroup
+    \quad[d:\mathstyle]
+\stopbuffer
+
+\typebuffer[1]
+
+% \typebuffer[2]
+
+This gives:
+
+\blank $\displaystyle \getbuffer[1]$ \blank
+\blank $\textstyle    \getbuffer[1]$ \blank
+
+Using \type {\begingroup} \unknown\ \type {\endgroup} instead gives:
+
+\blank $\displaystyle \getbuffer[2]$ \blank
+\blank $\textstyle    \getbuffer[2]$ \blank
+
+This might look wrong but it's just a side effect of \type {\mathstyle} expanding
+to the current (first pass) style and the number being injected in the list that
+gets converted in the second pass. It all makes sense and it illustrates the
+importance of grouping. In fact, the math choice style being effective afterwards
+has advantages. It would be hard to get it otherwise.
+
 \subsection{\type {\Ustack}}
 
 There are a few math commands in \TEX\ where the style that will be used is not
diff --git a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
index 549cfe377..0fb78c7a7 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
@@ -783,7 +783,7 @@ that can be passed to the extensions.
 
 \starttexsyntax
 \pdfextension literal
-    [ direct | page ] { tokens }
+    [ direct | page | raw ] { tokens }
 \stoptexsyntax
 
 \starttexsyntax
diff --git a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
index fd0b47c72..7495e6a61 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
@@ -739,8 +739,13 @@ Possible mode values are:
 \NC 0           \NC setorigin              \NC \NR
 \NC 1           \NC page                   \NC \NR
 \NC 2           \NC direct                 \NC \NR
+\NC 3           \NC raw                    \NC \NR
 \stoptabulate
 
+The higher the number, the less checking and the more you can run into troubles.
+Especially the \type {raw} variant can produce bad \PDF\ so you can best check
+what you generate.
+
 \subsubsubsection{pdf_refobj whatsits}
 
 \starttabulate[|lT|l|p|]
diff --git a/doc/fonts/hoekwater/koeieletters/koeieletters.rme b/doc/fonts/hoekwater/koeieletters/koeieletters.rme
index 4be11cce8..fdb2128bf 100644
--- a/doc/fonts/hoekwater/koeieletters/koeieletters.rme
+++ b/doc/fonts/hoekwater/koeieletters/koeieletters.rme
@@ -1,21 +1,27 @@
 Remarks
 
-The Koeieletters font is copyrighted (2006) by Hans Hagen
-and Taco Hoekwater. The font is based on original drawings
-by Duane Bibby.
+The Koeieletters font is copyrighted by Hans Hagen and Taco Hoekwater. The
+font is based on original drawings by Duane Bibby. There are two versions:
 
-The Koeieletters font is distributed under the Creative
-Commons Attribution No Derivative Works licence. A summary
-of this licence can be found at the bottom of this file. The
-complete version of the licence can be found at:
+Type1    : 2006  koeie*.afm  koeie*.tfm  koeie*.pfb
+TrueType : 2016  koeieletterso.ttf
+
+Because the shapes are in fact artistic drawings the Koeieletters font is
+distributed under the Creative Commons Attribution No Derivative Works
+licence. A summary of this licence can be found at the bottom of this file.
+The complete version of the licence can be found at:
 
     http://creativecommons.org/licenses/by-nd/2.5/legalcode
 
-The font is supported by ConTeXt and more information about
-its history, evolution and usage can be found in the manual
-at www.pragma-ade.com.
+The font is supported by ConTeXt and more information about its history,
+evolution and usage can be found in articles in the NTG Maps, the ConTeXt
+Group Journal and in manual distributed with Context.
+
+www.pragma-ade.com
+contextgarden.net
+
 
-==== http://creativecommons.org/licenses/by-nd/2.5/ ====
+============= http://creativecommons.org/licenses/by-nd/2.5/ ==============
 
 Attribution-NoDerivs 2.5
 
@@ -26,20 +32,22 @@ You are free:
 
 Under the following conditions:
 
-    Attribution: You must attribute the work in the manner
-    specified by the author or licensor.
+    Attribution: You must attribute the work in the manner specified by the
+    author or licensor.
 
-    Derivative Works: You may not alter, transform, or
-    build upon this work.
+    Derivative Works: You may not alter, transform, or build upon this work.
 
-    * For any reuse or distribution, you must make clear
-      to others the license terms of this work.
-    * Any of these conditions can be waived if you get
-      permission from the copyright holder.
+    * For any reuse or distribution, you must make clear to others the
+      license terms of this work.
+    * Any of these conditions can be waived if you get permission from the
+      copyright holder.
 
-Your fair use and other rights are in no way affected
-by the above.
+Your fair use and other rights are in no way affected by the above.
 
-==== end of copy =======================================
+============= end of copy =================================================
 
 
+If you think this sounds a bit strict, keep in mind that we use this font
+for predictable demonstration and explorative purposes in ConTeXt and that
+the font is based on original artwork. Feel free to use the font any way
+you want. Just don't mess with the design.