2018-04-02 15:51:00

21 files changed, 77 insertions, 4 deletions

diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf
index b9925775e..0d7adafbe 100644
--- a/doc/context/documents/general/manuals/luatex.pdf
+++ b/doc/context/documents/general/manuals/luatex.pdf
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index 7f73888b2..76108aa59 100644
--- a/doc/context/documents/general/qrcs/setup-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf
index e95f798bf..958c189ec 100644
--- a/doc/context/documents/general/qrcs/setup-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index 7b808f8da..6ff801846 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 7e82d88c9..195cd6411 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index fcecfbcac..900b697dd 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
index 285347420..2b1369ae7 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
index 56f7170da..cabb087fb 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
index b9a6da180..33331d9e4 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
index 98c96cd82..0dbd7a847 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
index fefbe6ceb..9d59690de 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
index b60af34d4..ca4ac5581 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
index c66413500..50d22528f 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf
index 5fbbd909d..ed1eeec04 100644
--- a/doc/context/documents/general/qrcs/setup-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf
index 9e5810ceb..c1530f75d 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/doc/context/sources/general/manuals/hybrid/hybrid-grouping.tex b/doc/context/sources/general/manuals/hybrid/hybrid-grouping.tex
index 44018e746..c95186c99 100644
--- a/doc/context/sources/general/manuals/hybrid/hybrid-grouping.tex
+++ b/doc/context/sources/general/manuals/hybrid/hybrid-grouping.tex
@@ -25,7 +25,7 @@
        keywords=,
        author=Hans Hagen,
        address=PRAGMA ADE\\Ridderstraat 27\\8061GH Hasselt NL,
-       email=pragma@wxs.nl]
+       email=pragma@xs4all.nl]
     %
     % we use a buffer as abstract themselves are buffers and
     % inside macros we loose line endings and such
diff --git a/doc/context/sources/general/manuals/hybrid/hybrid-parbuilder.tex b/doc/context/sources/general/manuals/hybrid/hybrid-parbuilder.tex
index 06519b2fb..cceac6d55 100644
--- a/doc/context/sources/general/manuals/hybrid/hybrid-parbuilder.tex
+++ b/doc/context/sources/general/manuals/hybrid/hybrid-parbuilder.tex
@@ -28,7 +28,7 @@
        keywords=,
        author=Hans Hagen,
        address=PRAGMA ADE\\Ridderstraat 27\\8061GH Hasselt NL,
-       email=pragma@wxs.nl]
+       email=pragma@xs4all.nl]
     %
     % we use a buffer as abstract themselves are buffers and
     % inside macros we loose line endings and such
diff --git a/doc/context/sources/general/manuals/languages/languages-sorting.tex b/doc/context/sources/general/manuals/languages/languages-sorting.tex
index ce24f385c..956866e5d 100644
--- a/doc/context/sources/general/manuals/languages/languages-sorting.tex
+++ b/doc/context/sources/general/manuals/languages/languages-sorting.tex
@@ -230,6 +230,72 @@ This three entry index\jindex{ぱあ}\jindex{ぱー}\jindex{ぱぁ} should be so
 
 % ぱー $\prec$ ぱぁ $\prec$ ぱあ
 
+\startsection[title=Special usage]
+
+The following example demonstrates how you can trick the sorter into doing other
+things: \footnote {The \type {replacementlist} helper is the result of a request
+by John Grasty on the mailing list.}
+
+\startbuffer
+\startluacode
+    local list = {
+        -- old testament
+        "Genesis", "Exodus", "Leviticus", "Numbers", "Deuteronomy", "Joshua",
+        "Judges", "Ruth", "1 Samuel", "2 Samuel", "1 Kings", "2 Kings",
+        "1 Chronicles", "2 Chronicles", "Ezra", "Nehemiah", "Esther", "Job",
+        "Psalms", "Proverbs", "Ecclesiastes", "Canticles", "Isaiah", "Jeremiah",
+        "Lamentations", "Ezekiel", "Daniel", "Hosea", "Joel", "Amos", "Obadiah",
+        "Jonah", "Micah", "Nahum", "Habakkuk", "Zephaniah", "Haggai",
+        "Zechariah", "Malachi",
+        -- new testament
+        "Matthew", "Mark", "Luke", "John", "Acts", "Romans", "1 Corinthians",
+        "2 Corinthians", "Galatians", "Ephesians", "Philippians", "Colossians",
+        "1 Thessalonians", "2 Thessalonians", "1 Timothy", "2 Timothy", "Titus",
+        "Philemon", "Hebrews", "James", "1 Peter", "2 Peter", "1 John", "2 John",
+        "3 John", "Jude", "Revelation",
+    }
+
+    sorters.definitions["bible"] = {
+        replacements = sorters.replacementlist(list),
+    }
+\stopluacode
+
+\defineregister
+  [booksort]
+  [language=bible,
+   n=3,
+   criterium=text,
+   indicator=no]
+\stopbuffer
+
+\typebuffer \getbuffer
+
+We use this as follows:
+
+\startbuffer
+One   \booksort{Genesis+5.2}
+Two   \booksort{Exodus+2}
+Three \booksort{Genesis+45}
+Four  \booksort{Philemon+2}
+Five  \booksort{John+45}
+Six   \booksort{1 John 1+45}
+Seven \booksort{2 John 2+45}
+
+\placeregister
+  [booksort]
+  [language=bible]
+\stopbuffer
+
+\typebuffer
+
+which gives:
+
+\getbuffer
+
+\stoptext
+
+\stopsection
+
 \stopchapter
 
 \stopcomponent
diff --git a/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex b/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex
index d1da33878..e0119bf7e 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex
@@ -384,7 +384,7 @@ is easier to keep the code in a separate file and load it using \LUA's
 \directlua { dofile('mysetups.lua') }
 \stoptyping
 
-\subsection{\type {\luafunction}}
+\subsection{\type {\luafunction} and \type {\luafunctioncall}}
 
 The \type {\directlua} commands involves tokenization of its argument (after
 picking up an optional name or number specification). The tokenlist is then
@@ -417,6 +417,9 @@ in the following example the number \type {8} gets typeset.
 }
 \stoptyping
 
+The \type {\luafunctioncall} primitive does the same but is unexpandable, for instance
+in an \type {\edef}.
+
 \section {Alignments}
 
 \subsection{\tex {alignmark}}
diff --git a/doc/context/sources/general/manuals/luatex/luatex.tex b/doc/context/sources/general/manuals/luatex/luatex.tex
index 1d6f16f6a..3025788bf 100644
--- a/doc/context/sources/general/manuals/luatex/luatex.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex.tex
@@ -2,6 +2,10 @@
 
 % \disabledirectives[vspacing.synchronizepage]
 
+% wsl /data/context/runcontext.sh --global --path=/mnt/c/data/develop/context/manuals/mkiv/external/luatex luatex.tex
+%
+% same runtime as regular context or linux
+
 % author    : Hans Hagen with Taco Hoekwater, Luigi Scarso & Hartmut Henkel
 % copyright : PRAGMA ADE & ConTeXt Development Team
 % license   : Creative Commons Attribution ShareAlike 4.0 International
diff --git a/doc/context/sources/general/manuals/xml/xml-mkiv.tex b/doc/context/sources/general/manuals/xml/xml-mkiv.tex
index 0f9c74662..8550badec 100644
--- a/doc/context/sources/general/manuals/xml/xml-mkiv.tex
+++ b/doc/context/sources/general/manuals/xml/xml-mkiv.tex
@@ -2347,7 +2347,7 @@ status information, using for instance:
 \stopxmlcmd
 
 \startxmlcmd {\cmdbasicsetup{xmlinfo}}
-    typeset the name if the element given by \cmdinternal {cd:node}
+    typeset the name in the element given by \cmdinternal {cd:node}
 \stopxmlcmd
 
 \startxmlcmd {\cmdbasicsetup{xmlpath}}