2016-05-12 23:53:00

20 files changed, 143 insertions, 55 deletions

diff --git a/doc/context/documents/general/manuals/lua-mkiv.pdf b/doc/context/documents/general/manuals/lua-mkiv.pdf
index 2c1e444e3..9e92ebad9 100644
--- a/doc/context/documents/general/manuals/lua-mkiv.pdf
+++ b/doc/context/documents/general/manuals/lua-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf
index a63c4d917..8b746b0f2 100644
--- a/doc/context/documents/general/manuals/luatex.pdf
+++ b/doc/context/documents/general/manuals/luatex.pdf
diff --git a/doc/context/documents/general/manuals/mreadme.pdf b/doc/context/documents/general/manuals/mreadme.pdf
index 35aca89fc..031be0fda 100644
--- a/doc/context/documents/general/manuals/mreadme.pdf
+++ b/doc/context/documents/general/manuals/mreadme.pdf
diff --git a/doc/context/documents/general/manuals/sql-mkiv.pdf b/doc/context/documents/general/manuals/sql-mkiv.pdf
index bf6013d33..fa9a5ad61 100644
--- a/doc/context/documents/general/manuals/sql-mkiv.pdf
+++ b/doc/context/documents/general/manuals/sql-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/swiglib-mkiv.pdf b/doc/context/documents/general/manuals/swiglib-mkiv.pdf
index c61666845..57b717f9b 100644
--- a/doc/context/documents/general/manuals/swiglib-mkiv.pdf
+++ b/doc/context/documents/general/manuals/swiglib-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/templates-mkiv.pdf b/doc/context/documents/general/manuals/templates-mkiv.pdf
index 02a4aee0d..47a0d70a6 100644
--- a/doc/context/documents/general/manuals/templates-mkiv.pdf
+++ b/doc/context/documents/general/manuals/templates-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/tools-mkiv.pdf b/doc/context/documents/general/manuals/tools-mkiv.pdf
index 53118457e..1da11dcb0 100644
--- a/doc/context/documents/general/manuals/tools-mkiv.pdf
+++ b/doc/context/documents/general/manuals/tools-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/xtables-mkiv.pdf b/doc/context/documents/general/manuals/xtables-mkiv.pdf
index 9dbf4469e..fb04a53d9 100644
--- a/doc/context/documents/general/manuals/xtables-mkiv.pdf
+++ b/doc/context/documents/general/manuals/xtables-mkiv.pdf
diff --git a/doc/context/sources/general/manuals/lua/lua-mkiv.tex b/doc/context/sources/general/manuals/lua/lua-mkiv.tex
index a6a2b465a..40e885eac 100644
--- a/doc/context/sources/general/manuals/lua/lua-mkiv.tex
+++ b/doc/context/sources/general/manuals/lua/lua-mkiv.tex
@@ -1,7 +1,17 @@
 % language=uk
 
-% author  : Hans Hagen, PRAGMA ADE, NL
-% license : Creative Commons, Attribution-NonCommercial-ShareAlike 3.0 Unported
+% author    : Hans Hagen
+% copyright : PRAGMA ADE & ConTeXt Development Team
+% license   : Creative Commons Attribution ShareAlike 4.0 International
+% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions
+% origin    : the ConTeXt distribution
+%
+% comment   : Because this manual is distributed with TeX distributions it comes with a rather
+%             liberal license. We try to adapt these documents to upgrades in the (sub)systems
+%             that they describe. Using parts of the content otherwise can therefore conflict
+%             with existing functionality and we cannot be held responsible for that. Many of
+%             the manuals contain characteristic graphics and personal notes or examples that
+%             make no sense when used out-of-context.
 
 \usemodule[art-01,abr-02]
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
index 372aca1e5..03c0774c7 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
@@ -642,15 +642,18 @@ will simply step over such whatsits without ever looking at the contents.
 \NC             \NC table    \NC a \LUA\ table \NC \NR
 \stoptabulate
 
-The \type {type} can have one of five distinct values:
+The \type {type} can have one of six distinct values. The number is the \ASCII\
+value if the first character if the type name (so you can use string.byte("l")
+instead of \type {108}).
 
 \starttabulate[|lT|p|]
-\NC \rmbf value \NC \bf explanation \NC \NR
-\NC   97        \NC list of attributes \NC \NR
-\NC  100        \NC a \LUA\ number \NC \NR
-\NC  110        \NC a node list \NC \NR
-\NC  115        \NC a \LUA\ string \NC \NR
-\NC  116        \NC a \LUA\ token list in \LUA\ table form \NC \NR
+\NC \rmbf value \NC \bf meaning   \NC \bf explanation \NC \NR
+\NC   97        \NC a  \NC list of attributes (a node list) \NC \NR
+\NC  100        \NC d  \NC a \LUA\ number \NC \NR
+\NC  108        \NC l  \NC a \LUA\ value (table, number, boolean, etc) \NC \NR
+\NC  110        \NC n  \NC a node list \NC \NR
+\NC  115        \NC s  \NC a \LUA\ string \NC \NR
+\NC  116        \NC t  \NC a \LUA\ token list in \LUA\ table form (a list of triplets) \NC \NR
 \stoptabulate
 
 \subsubsubsection{save_pos whatsits}
diff --git a/doc/context/sources/general/manuals/mcommon.tex b/doc/context/sources/general/manuals/mcommon.tex
index b6b6026e9..94b5f9bf5 100644
--- a/doc/context/sources/general/manuals/mcommon.tex
+++ b/doc/context/sources/general/manuals/mcommon.tex
@@ -192,19 +192,19 @@
 
 % urls
 
-\useurl[gpl-simple]   [http://creativecommons.org/licenses/GPL/2.0/]
-\useurl[gpl-legal]    [http://creativecommons.org/licenses/GPL/2.0/legalcode]
-\useurl[byncsa-simple][http://creativecommons.org/licenses/by-nc-sa/2.5/]
-\useurl[byncsa-legal] [http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode]
-
-\useurl[garden]       [http://contextgarden.net]
-\useurl[install]      [http://wiki.contextgarden.net/ConTeXt_Standalone]
-\useurl[texlive]      [http://www.tug.org/texlive/]
-\useurl[group]        [http://group.contextgarden.net]
-\useurl[list]         [http://www.ntg.nl/mailman/listinfo/ntg-context]
-\useurl[development]  [http://www.ntg.nl/mailman/listinfo/dev-context]
-\useurl[announce]     [http://www.ntg.nl/mailman/listinfo/ann-context]
-\useurl[collector]    [http://tracker.luatex.org]
-\useurl[pragma]       [http://www.pragma-ade.com]
+\useurl[gpl-simple] [http://creativecommons.org/licenses/GPL/2.0/]
+\useurl[gpl-legal]  [http://creativecommons.org/licenses/GPL/2.0/legalcode]
+\useurl[bysa-simple][http://creativecommons.org/licenses/by-sa/4.0/]
+\useurl[bysa-legal] [http://creativecommons.org/licenses/by-sa/4.0/legalcode]
+
+\useurl[garden]     [http://contextgarden.net]
+\useurl[install]    [http://wiki.contextgarden.net/ConTeXt_Standalone]
+\useurl[texlive]    [http://www.tug.org/texlive/]
+\useurl[group]      [http://group.contextgarden.net]
+\useurl[list]       [http://www.ntg.nl/mailman/listinfo/ntg-context]
+\useurl[development][http://www.ntg.nl/mailman/listinfo/dev-context]
+\useurl[announce]   [http://www.ntg.nl/mailman/listinfo/ann-context]
+\useurl[collector]  [http://tracker.luatex.org]
+\useurl[pragma]     [http://www.pragma-ade.com]
 
 \stopenvironment
diff --git a/doc/context/sources/general/manuals/readme/mreadme.tex b/doc/context/sources/general/manuals/readme/mreadme.tex
index b2af11bc4..32c1684d9 100644
--- a/doc/context/sources/general/manuals/readme/mreadme.tex
+++ b/doc/context/sources/general/manuals/readme/mreadme.tex
@@ -1,6 +1,17 @@
 % interface=en engine=luatex language=uk
+
+% author    : Hans Hagen
+% copyright : PRAGMA ADE & ConTeXt Development Team
+% license   : Creative Commons Attribution ShareAlike 4.0 International
+% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions
+% origin    : the ConTeXt distribution
 %
-% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa
+% comment   : Because this manual is distributed with TeX distributions it comes with a rather
+%             liberal license. We try to adapt these documents to upgrades in the (sub)systems
+%             that they describe. Using parts of the content otherwise can therefore conflict
+%             with existing functionality and we cannot be held responsible for that. Many of
+%             the manuals contain characteristic graphics and personal notes or examples that
+%             make no sense when used out-of-context.
 
 \environment mcommon
 
@@ -104,8 +115,8 @@ distributed under the
 \stopnarrower
 
 For practical purposes distributers may also choose the \LATEX\ project licence,
-which is considered to be a bit more \TEX\ friendly. (BSD alike licences, the
-Ruby Licence and the Apache are all licences that apply well for \CONTEXT.)
+which is considered to be a bit more \TEX\ friendly. (BSD alike licences also
+apply well for \CONTEXT.)
 
 In practice, users may forget about the legal part, if only because I haven't
 even read (and understood) it completely myself, so let's stick to what Creative
@@ -157,6 +168,12 @@ holder.
 Your fair use and other rights are in no way affected by the above.
 \stopcolor
 
+Many source filed mention the \quotation {\CONTEXT\ Development Team} as
+copyright holder. This is because over time users submit patches and whenever
+something happens to the main author, those involved in development can take
+over without the need to bother about derived work. In the end the \CONTEXT\
+group is the place to get more information.
+
 \stopsubject
 
 \startsubject[title={Recommendations}]
@@ -224,13 +241,20 @@ Here are a few recommendations in case you want to distribute, extend of embed
 
 \startsubject[title={Documents}]
 
-The documentation is provided under another Creative Commons licence
+The documentation is provided under another Creative Commons licence:
 
 \startnarrower
-    \goto{Attribution NonCommercial ShareAlike}[url(byncsa-simple)]
+    \goto{Attribution ShareAlike}[url(bysa-simple)]
 \stopnarrower
 
-This one says:
+The manuals that are distributed with \CONTEXT\ comes with a rather liberal
+license. However, we try to adapt these documents to upgrades in the (sub)systems
+that they describe and derived work can therefore conflict with existing
+functionality and we cannot be held responsible for that. Many of the manuals
+contain characteristic graphics and personal notes or examples that make no sense
+when used out|-|of|-|context.
+
+The mentioned license says:
 
 \startcolor[blue]
 You are free:
@@ -243,8 +267,6 @@ You are free:
 {\sc Attribution:} You must attribute the work in the manner specified by the
 author or licensor.
 
-{\sc NonCommercial:} You may not use this work for commercial purposes.
-
 {\sc Share Alike:} If you alter, transform, or build upon this work, you may
 distribute the resulting work only under a license identical to this one.
 
@@ -262,10 +284,6 @@ distribute the resulting work only under a license identical to this one.
 Your fair use and other rights are in no way affected by the above.
 \stopcolor
 
-The non||commercial part is mostly a safeguard. We don't mind if user groups
-distribute printed copies, publish (parts of) manuals and|/|or if authors use
-example code in manuals and books about \CONTEXT.
-
 If you distribute \CONTEXT\ and related software on electronic media as part of
 \TEX\ distributions (either or not for money), you may also distribute the
 manuals and their sources in electronic form, preferable as provided by the
@@ -295,8 +313,8 @@ few starting points:
 \stoplines
 
 \startlines
-\goto{\url[byncsa-simple]}[url(byncsa-simple)]
-\goto{\url[byncsa-legal]}[url(byncsa-legal)]
+\goto{\url[bysa-simple]}[url(bysa-simple)]
+\goto{\url[bysa-legal]}[url(bysa-legal)]
 \stoplines
 
 \CONTEXT\ itself can be fetched from the main site or the garden:
diff --git a/doc/context/sources/general/manuals/sql/sql-mkiv.tex b/doc/context/sources/general/manuals/sql/sql-mkiv.tex
index 520532e0b..ec2c999aa 100644
--- a/doc/context/sources/general/manuals/sql/sql-mkiv.tex
+++ b/doc/context/sources/general/manuals/sql/sql-mkiv.tex
@@ -1,7 +1,17 @@
 % language=uk
 
-% author  : Hans Hagen, PRAGMA ADE, NL
-% license : Creative Commons, Attribution-NonCommercial-ShareAlike 3.0 Unported
+% author    : Hans Hagen
+% copyright : PRAGMA ADE & ConTeXt Development Team
+% license   : Creative Commons Attribution ShareAlike 4.0 International
+% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions
+% origin    : the ConTeXt distribution
+%
+% comment   : Because this manual is distributed with TeX distributions it comes with a rather
+%             liberal license. We try to adapt these documents to upgrades in the (sub)systems
+%             that they describe. Using parts of the content otherwise can therefore conflict
+%             with existing functionality and we cannot be held responsible for that. Many of
+%             the manuals contain characteristic graphics and personal notes or examples that
+%             make no sense when used out-of-context.
 
 \usemodule[art-01,abr-02]
 
diff --git a/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.jpg b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.jpg
new file mode 100644
index 000000000..8c45b41b9
--- /dev/null
+++ b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.jpg
diff --git a/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.pdf b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.pdf
new file mode 100644
index 000000000..d576c7d91
--- /dev/null
+++ b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.pdf
diff --git a/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.png b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.png
new file mode 100644
index 000000000..fba526e9f
--- /dev/null
+++ b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv-gm-1.png
diff --git a/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex
index fc7a269bb..c24be76bf 100644
--- a/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex
+++ b/doc/context/sources/general/manuals/swiglib/swiglib-mkiv.tex
@@ -1,7 +1,17 @@
 % language=uk
 
-% author  : Hans Hagen, PRAGMA ADE, NL
-% license : Creative Commons, Attribution-NonCommercial-ShareAlike 3.0 Unported
+% author    : Hans Hagen
+% copyright : PRAGMA ADE & ConTeXt Development Team
+% license   : Creative Commons Attribution ShareAlike 4.0 International
+% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions
+% origin    : the ConTeXt distribution
+%
+% comment   : Because this manual is distributed with TeX distributions it comes with a rather
+%             liberal license. We try to adapt these documents to upgrades in the (sub)systems
+%             that they describe. Using parts of the content otherwise can therefore conflict
+%             with existing functionality and we cannot be held responsible for that. Many of
+%             the manuals contain characteristic graphics and personal notes or examples that
+%             make no sense when used out-of-context.
 
 \usemodule[art-01,abr-02]
 
@@ -72,11 +82,11 @@ StartPage ;
         shifted (-1cm,2cm)
         withcolor \MPcolor{maincolor} ;
 
-%     draw textext.ulft("\definedfont[TitlePageMono]in context mkiv")
-%         xsized .6PaperWidth
-%         shifted lrcorner Page
-%         shifted (-1cm,6cm)
-%         withcolor \MPcolor{maincolor} ;
+  % draw textext.ulft("\definedfont[TitlePageMono]in context mkiv")
+  %     xsized .6PaperWidth
+  %     shifted lrcorner Page
+  %     shifted (-1cm,6cm)
+  %     withcolor \MPcolor{maincolor} ;
 
 StopPage ;
 
@@ -135,6 +145,12 @@ Here is an example of using such a library (by Luigi):
 local gm       = swiglib("gmwand.core")
 local findfile = resolvers.findfile
 
+if not gm then
+    -- no big deal for this manual as we use a system in flux
+    logs.report("swiglib","no swiglib libraries loaded")
+    return
+end
+
 gm.InitializeMagick(".")
 
 local magick_wand  = gm.NewMagickWand()
@@ -174,7 +190,9 @@ gm.DestroyMagickWand(magick_wand)
 \stopluacode
 \stopbuffer
 
-\typebuffer \getbuffer
+\typebuffer
+
+\getbuffer
 
 In practice you will probably stay away from manipulating text this way, but it
 illustrates that you can use the regular \CONTEXT\ helpers to locate files.
@@ -316,7 +334,7 @@ needs a lot of them) it will first look on its own path (which is remembered).
 The \MKIV\ lookups are somewhat more robust in the sense that they first check
 for matches on engine specific paths. This comes in handy when the search
 patterns are too generic and one can match on for instance \type {luajittex}
-whilc \type {luatex} is used.
+while \type {luatex} is used.
 
 \stopsection
 
@@ -326,7 +344,6 @@ whilc \type {luatex} is used.
 \NC author    \NC \getvariable{document}{author}, \getvariable{document}{affiliation}, \getvariable{document}{location} \NC \NR
 \NC version   \NC \currentdate \NC \NR
 \NC website   \NC \getvariable{document}{website} \endash\ \getvariable{document}{support} \NC \NR
-\NC copyright \NC \symbol[cc][cc-by-sa-nc] \NC \NR
 \NC comment   \NC the swiglib infrastructure is implemented by Luigi Scarso \NC \NR
 \stoptabulate
 
diff --git a/doc/context/sources/general/manuals/templates/templates-mkiv.tex b/doc/context/sources/general/manuals/templates/templates-mkiv.tex
index 9361d1a8d..01f2c429e 100644
--- a/doc/context/sources/general/manuals/templates/templates-mkiv.tex
+++ b/doc/context/sources/general/manuals/templates/templates-mkiv.tex
@@ -1,7 +1,17 @@
 % language=uk
 
-% author  : Hans Hagen, PRAGMA ADE, NL
-% license : Creative Commons, Attribution-NonCommercial-ShareAlike 3.0 Unported
+% author    : Hans Hagen
+% copyright : PRAGMA ADE & ConTeXt Development Team
+% license   : Creative Commons Attribution ShareAlike 4.0 International
+% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions
+% origin    : the ConTeXt distribution
+%
+% comment   : Because this manual is distributed with TeX distributions it comes with a rather
+%             liberal license. We try to adapt these documents to upgrades in the (sub)systems
+%             that they describe. Using parts of the content otherwise can therefore conflict
+%             with existing functionality and we cannot be held responsible for that. Many of
+%             the manuals contain characteristic graphics and personal notes or examples that
+%             make no sense when used out-of-context.
 
 \usemodule[art-01,abr-02]
 
diff --git a/doc/context/sources/general/manuals/tools/tools-mkiv.tex b/doc/context/sources/general/manuals/tools/tools-mkiv.tex
index 5f20e6985..2ac1e15f4 100644
--- a/doc/context/sources/general/manuals/tools/tools-mkiv.tex
+++ b/doc/context/sources/general/manuals/tools/tools-mkiv.tex
@@ -1,7 +1,17 @@
 % language=uk
 
-% author  : Hans Hagen, PRAGMA ADE, NL
-% license : Creative Commons, Attribution-NonCommercial-ShareAlike 3.0 Unported
+% author    : Hans Hagen
+% copyright : PRAGMA ADE & ConTeXt Development Team
+% license   : Creative Commons Attribution ShareAlike 4.0 International
+% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions
+% origin    : the ConTeXt distribution
+%
+% comment   : Because this manual is distributed with TeX distributions it comes with a rather
+%             liberal license. We try to adapt these documents to upgrades in the (sub)systems
+%             that they describe. Using parts of the content otherwise can therefore conflict
+%             with existing functionality and we cannot be held responsible for that. Many of
+%             the manuals contain characteristic graphics and personal notes or examples that
+%             make no sense when used out-of-context.
 
 \usemodule[abr-02]
 
diff --git a/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex
index 302f2880c..a41282622 100644
--- a/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex
+++ b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex
@@ -1,7 +1,17 @@
 % language=uk
 
-% author  : Hans Hagen, PRAGMA ADE, NL
-% license : Creative Commons, Attribution-NonCommercial-ShareAlike 3.0 Unported
+% author    : Hans Hagen
+% copyright : PRAGMA ADE & ConTeXt Development Team
+% license   : Creative Commons Attribution ShareAlike 4.0 International
+% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions
+% origin    : the ConTeXt distribution
+%
+% comment   : Because this manual is distributed with TeX distributions it comes with a rather
+%             liberal license. We try to adapt these documents to upgrades in the (sub)systems
+%             that they describe. Using parts of the content otherwise can therefore conflict
+%             with existing functionality and we cannot be held responsible for that. Many of
+%             the manuals contain characteristic graphics and personal notes or examples that
+%             make no sense when used out-of-context.
 
 \usemodule[art-01,abr-02]