2019-11-12 18:53:00

28 files changed, 54 insertions, 0 deletions

diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index 8fe444645..9e63f0ff1 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 08e6939e8..be8b1153d 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
deleted file mode 100644
index d78131958..000000000
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ /dev/null
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 8d4a8d959..679dc1b6f 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 b7ad4f18f..ee365ece0 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 7d21f8650..9b8746327 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 e0fb46a36..cc8d55253 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
deleted file mode 100644
index e5be97916..000000000
--- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf
+++ /dev/null
diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
index aa4ae01e9..222482588 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 83fac3d02..a0c940b7b 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 bf190b3b1..16dd35cb5 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 fce5f91c9..63c807061 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 bd547b5db..1c8e66c8a 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 f895eef78..f1ca86092 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/doc/context/scripts/mkii/texmfstart.html b/doc/context/scripts/mkii/texmfstart.html
index deb6a2cd1..fc3dbb685 100644
--- a/doc/context/scripts/mkii/texmfstart.html
+++ b/doc/context/scripts/mkii/texmfstart.html
@@ -57,6 +57,7 @@
         <tr><th>--stubpath</th><td>binpath</td><td>paths where stubs wil be written</td></tr>
         <tr><th>--windows</th><td></td><td>create windows (mswin) stubs</td></tr>
         <tr><th>--unix</th><td></td><td>create unix (linux) stubs</td></tr>
+        <tr><th>--addbinarypath</th><td></td><td>prepend the (found) binarypath to runners</td></tr>
         <tr><th/><td/><td/></tr>
         <tr><th>--verbose</th><td></td><td>give a bit more info</td></tr>
         <tr><th>--trackers</th><td>list</td><td>enable given trackers</td></tr>
diff --git a/doc/context/scripts/mkii/texmfstart.man b/doc/context/scripts/mkii/texmfstart.man
index 4bd27c02b..f6c876c00 100644
--- a/doc/context/scripts/mkii/texmfstart.man
+++ b/doc/context/scripts/mkii/texmfstart.man
@@ -59,6 +59,9 @@ create windows (mswin) stubs
 .B --unix
 create unix (linux) stubs
 .TP
+.B --addbinarypath
+prepend the (found) binarypath to runners
+.TP
 .B --verbose
 give a bit more info
 .TP
diff --git a/doc/context/scripts/mkii/texmfstart.xml b/doc/context/scripts/mkii/texmfstart.xml
index 2b54833d0..5e5958e16 100644
--- a/doc/context/scripts/mkii/texmfstart.xml
+++ b/doc/context/scripts/mkii/texmfstart.xml
@@ -27,6 +27,7 @@
     <flag name="stubpath" value="binpath"><short>paths where stubs wil be written</short></flag>
     <flag name="windows"><short>create windows (mswin) stubs</short></flag>
     <flag name="unix"><short>create unix (linux) stubs</short></flag>
+    <flag name="addbinarypath"><short>prepend the (found) binarypath to runners</short></flag>
    </subcategory>
    <subcategory>
     <flag name="verbose"><short>give a bit more info</short></flag>
diff --git a/doc/context/scripts/mkiv/context.html b/doc/context/scripts/mkiv/context.html
index 2c8c9abeb..9a8a18609 100644
--- a/doc/context/scripts/mkiv/context.html
+++ b/doc/context/scripts/mkiv/context.html
@@ -116,6 +116,8 @@
         <tr><th>--pipe</th><td></td><td>do not check for file and enter scroll mode (--dummyfile=whatever.tmp)</td></tr>
         <tr><th/><td/><td/></tr>
         <tr><th>--sandbox</th><td></td><td>process file in a limited environment</td></tr>
+        <tr><th/><td/><td/></tr>
+        <tr><th>--addbinarypath</th><td></td><td>prepend the (found) binarypath to runners</td></tr>
     </table>
 <br/>
             </div>
diff --git a/doc/context/scripts/mkiv/context.man b/doc/context/scripts/mkiv/context.man
index a652b37bf..5f28efd81 100644
--- a/doc/context/scripts/mkiv/context.man
+++ b/doc/context/scripts/mkiv/context.man
@@ -189,6 +189,9 @@ do not check for file and enter scroll mode (--dummyfile=whatever.tmp)
 .TP
 .B --sandbox
 process file in a limited environment
+.TP
+.B --addbinarypath
+prepend the (found) binarypath to runners
 .SH AUTHOR
 More information about ConTeXt and the tools that come with it can be found at:
 
diff --git a/doc/context/scripts/mkiv/context.xml b/doc/context/scripts/mkiv/context.xml
index 916dad377..b0566517d 100644
--- a/doc/context/scripts/mkiv/context.xml
+++ b/doc/context/scripts/mkiv/context.xml
@@ -225,6 +225,11 @@
                     <short>process file in a limited environment</short>
                 </flag>
             </subcategory>
+            <subcategory>
+                <flag name="addbinarypath">
+                    <short>prepend the (found) binarypath to runners</short>
+                </flag>
+            </subcategory>
         </category>
     </flags>
 </application>
diff --git a/doc/context/scripts/mkiv/mtx-context.html b/doc/context/scripts/mkiv/mtx-context.html
index 2c8c9abeb..9a8a18609 100644
--- a/doc/context/scripts/mkiv/mtx-context.html
+++ b/doc/context/scripts/mkiv/mtx-context.html
@@ -116,6 +116,8 @@
         <tr><th>--pipe</th><td></td><td>do not check for file and enter scroll mode (--dummyfile=whatever.tmp)</td></tr>
         <tr><th/><td/><td/></tr>
         <tr><th>--sandbox</th><td></td><td>process file in a limited environment</td></tr>
+        <tr><th/><td/><td/></tr>
+        <tr><th>--addbinarypath</th><td></td><td>prepend the (found) binarypath to runners</td></tr>
     </table>
 <br/>
             </div>
diff --git a/doc/context/scripts/mkiv/mtx-context.man b/doc/context/scripts/mkiv/mtx-context.man
index a652b37bf..5f28efd81 100644
--- a/doc/context/scripts/mkiv/mtx-context.man
+++ b/doc/context/scripts/mkiv/mtx-context.man
@@ -189,6 +189,9 @@ do not check for file and enter scroll mode (--dummyfile=whatever.tmp)
 .TP
 .B --sandbox
 process file in a limited environment
+.TP
+.B --addbinarypath
+prepend the (found) binarypath to runners
 .SH AUTHOR
 More information about ConTeXt and the tools that come with it can be found at:
 
diff --git a/doc/context/scripts/mkiv/mtx-context.xml b/doc/context/scripts/mkiv/mtx-context.xml
index 916dad377..b0566517d 100644
--- a/doc/context/scripts/mkiv/mtx-context.xml
+++ b/doc/context/scripts/mkiv/mtx-context.xml
@@ -225,6 +225,11 @@
                     <short>process file in a limited environment</short>
                 </flag>
             </subcategory>
+            <subcategory>
+                <flag name="addbinarypath">
+                    <short>prepend the (found) binarypath to runners</short>
+                </flag>
+            </subcategory>
         </category>
     </flags>
 </application>
diff --git a/doc/context/scripts/mkiv/mtxrun.html b/doc/context/scripts/mkiv/mtxrun.html
index 01d08f8cd..7ee29b2d1 100644
--- a/doc/context/scripts/mkiv/mtxrun.html
+++ b/doc/context/scripts/mkiv/mtxrun.html
@@ -57,6 +57,7 @@
         <tr><th>--stubpath</th><td>binpath</td><td>paths where stubs wil be written</td></tr>
         <tr><th>--windows</th><td></td><td>create windows (mswin) stubs</td></tr>
         <tr><th>--unix</th><td></td><td>create unix (linux) stubs</td></tr>
+        <tr><th>--addbinarypath</th><td></td><td>prepend the (found) binarypath to runners</td></tr>
         <tr><th/><td/><td/></tr>
         <tr><th>--verbose</th><td></td><td>give a bit more info</td></tr>
         <tr><th>--trackers</th><td>list</td><td>enable given trackers</td></tr>
diff --git a/doc/context/scripts/mkiv/mtxrun.man b/doc/context/scripts/mkiv/mtxrun.man
index 4bd27c02b..f6c876c00 100644
--- a/doc/context/scripts/mkiv/mtxrun.man
+++ b/doc/context/scripts/mkiv/mtxrun.man
@@ -59,6 +59,9 @@ create windows (mswin) stubs
 .B --unix
 create unix (linux) stubs
 .TP
+.B --addbinarypath
+prepend the (found) binarypath to runners
+.TP
 .B --verbose
 give a bit more info
 .TP
diff --git a/doc/context/scripts/mkiv/mtxrun.xml b/doc/context/scripts/mkiv/mtxrun.xml
index a3fcb0c17..e9ea5a10f 100644
--- a/doc/context/scripts/mkiv/mtxrun.xml
+++ b/doc/context/scripts/mkiv/mtxrun.xml
@@ -28,6 +28,7 @@
     <flag name="stubpath" value="binpath"><short>paths where stubs wil be written</short></flag>
     <flag name="windows"><short>create windows (mswin) stubs</short></flag>
     <flag name="unix"><short>create unix (linux) stubs</short></flag>
+    <flag name="addbinarypath"><short>prepend the (found) binarypath to runners</short></flag>
    </subcategory>
    <subcategory>
     <flag name="verbose"><short>give a bit more info</short></flag>
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex b/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex
index b16b4aaf4..6081be4f3 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex
@@ -104,3 +104,21 @@ developers and users.
 \stopchapter
 
 \stopcomponent
+
+% I'm not that strict with incrementing numbers, but let's occasionally bump
+% the number. Once we're stable it might happen more systematically. For sure
+% I don't want to end up with these redicoulous 0.99999999 kind of numbers.
+%
+% We started with 2.00.0 and kept that number till November 2019, after Alan
+% Braslau and I did the initial beta release at April 1, 2019. After more than
+% a year working on the code base after the \CONTEXT\ 2019 meeting a state was
+% reached where nothing fundamental got added for a while. When \LUATEX\ needs
+% a patch, I check the \LUAMETATEX\ code base as the same patch might be needed
+% there. On the other hand, we don't need a strict compatibility, so some
+% patched in \LUATEX\ are not applied here.
+%
+% In November 2019 I started wondering if we should bump the number, just for
+% the sake of showing that there's still some progress. So I decided to bump to
+% 2.01.0 then. Just as a reminder for myself: it was the day when I watched
+% Jacob Collier perform Lua (feat. MARO) live on YouTube (of course that is not
+% about the language at all, but still a nice coincidence).
diff --git a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
index d49c63afe..e5b6e1cb2 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
@@ -43,6 +43,7 @@ the table are as follows:
                                                                         complete control to the loader. \NC \NR
 \NC \type{fullname}         \NC no  \NC no  \NC yes  \NC string     \NC output font name, used as a fallback in the \PDF\ output
                                                                         if the \type {psname} is not set \NC \NR
+\NC \type{subfont}          \NC no  \NC no  \NC yes  \NC number     \NC default: 0, index in (\type {ttc}) font with multiple fonts \NC \NR
 \NC \type{header}           \NC yes \NC no  \NC no   \NC string     \NC header comments, if any \NC \NR
 \NC \type{hyphenchar}       \NC no  \NC no  \NC yes  \NC number     \NC default: \TEX's \prm {hyphenchar} \NC \NR
 \NC \type{parameters}       \NC no  \NC yes \NC yes  \NC hash       \NC default: 7 parameters, all zero \NC \NR
@@ -105,6 +106,11 @@ font in \type {font.fonts}. It is the actual expansion factor (a value between
 \type {-shrink} and \type {stretch}, with step \type {step}) of a font that was
 automatically generated by the font expansion algorithm.
 
+The \type {subfont} parameter can be used to specify the subfont in a \type {ttc}
+font. When given, it is used instead of the \type {psname} and \type {fullname}
+combination. The first subfont has number~1. A zero value signals using the names
+as lookup.
+
 Because we store the actual state of expansion with each glyph and don't have
 special font instances, we can change some font related parameters before lines
 are constructed, like: