2019-10-05 14:54:00

32 files changed, 206 insertions, 18 deletions

diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index 506dfc96a..115032824 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 3265015ea..a78461575 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 51102b6e7..d28f6d585 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 436f9f41d..c1169b609 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 09ba7f8cc..7ada4035b 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 c4f84e8e4..09643f6ef 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 4a8cec63f..88132acb4 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 439349327..2ae010e22 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 2ba16062a..950afa1ce 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 ecd479c4b..7686eb915 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 0ddd7011d..0fea84fbf 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 15edacd00..f0af2480c 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 d389a21cb..52f60e02f 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 3ec2dc1db..3f47c3e80 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/mkiv/mtx-update.html b/doc/context/scripts/mkiv/mtx-update.html
new file mode 100644
index 000000000..ed7363ca0
--- /dev/null
+++ b/doc/context/scripts/mkiv/mtx-update.html
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<!-- compare with lmx framework variant -->
+
+<!--
+    filename : context-base.xml
+    comment  : companion to mtx-server-ctx-startup.tex
+    author   : Hans Hagen, PRAGMA-ADE, Hasselt NL
+    copyright: PRAGMA ADE / ConTeXt Development Team
+    license  : see context related readme files
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+    <head>
+        <title>ConTeXt Minimals Updater 1.03</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+                <style type="text/css">
+            body { color: #FFFFFF; background-color: #808080; font-family: optima, verdana, futura, "lucida sans", arial, geneva, helvetica, sans; font-size: 12px; line-height: 18px; } a:link, a:active, a:visited { color: #FFFFFF; } a.dir-view:link, a.dir-view:active, a.dir-view:visited { color: #FFFFFF; text-decoration: underline; } .valid { color: #00FF00; } .invalid { color: #FF0000; } .invisible { visibility: hidden; } button, .commonlink, .smallbutton { font-weight: bold; font-size: 12px; text-decoration: none; color: #000000; border-color: #7F7F7F; border-style: solid; border-width: .125ex; background-color: #FFFFFF; padding: .5ex; } .smallbutton { width: 1em; } a.commonlink:link, a.commonlink:active, a.commonlink:visited, a.smalllink:link, a.smalllink:active, a.smalllink:visited { font-weight: bold; font-size: 12px; text-decoration: none; color: #000000; } h1, .title { font-style: normal; font-weight: normal; font-size: 18px; line-height: 18px; margin-bottom: 20px; } h2, .subtitle { font-style: normal; font-weight: normal; font-size: 12px; margin-top: 18px; margin-bottom: 18px; } table { line-height: 18px; font-size: 12px; margin: 0; } th { font-weight: bold; text-align: left; padding-bottom: 6px; } .tc { font-weight: bold; text-align: left; } p, li { max-width: 60em; } .empty-line { margin-top: 4px; } .more-room { margin-right: 1.5em; } .much-more-room { margin-right: 3em; } #main { position: absolute; left: 10%; top: 10%; right: 10%; bottom: 10%; z-index: 2; width: 80%; height: 80%; padding: 0%; margin: 0%; overflow: auto; border-style: none; border-width: 0; background-color: #3F3F3F; } #main-settings { margin: 12px; x_max-width: 60em; line-height: 18px; font-size: 12px; } #left { position: absolute; top : 10%; left: 0%; bottom: 0%; right: 90%; z-index: 1; width: 10%; height: 90%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #4F6F6F; } #right { position: absolute; top : 0%; left: 90%; bottom: 10%; right: 0%; z-index: 1; width: 10%; height: 90%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #4F6F6F; _margin-left: -15px; } #bottom { position: absolute; left: 10%; right: 0%; top: 90%; bottom: 0%; z-index: 1; width: 90%; height: 10%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #6F6F8F; } #top { position: absolute; left: 0%; right: 10%; top: 0%; bottom: 90%; z-index: 1; width: 90%; height: 10%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #6F6F8F; } #top-one { position: absolute; bottom: 50%; width: 100%; buggedheight: 100%; } #top-two { position: relative; margin-bottom: -9px; margin-left: 12px; margin-right: 12px; line-height: 18px; text-align: right; vertical-align: middle; } #bottom-one { position: absolute; bottom: 50%; width: 100%; buggedheight: 100%; } #bottom-two { position: relative; margin-bottom: -9px; margin-left: 12px; margin-right: 12px; line-height: 18px; text-align: left; vertical-align: middle; } #left-one { position: absolute; width: 100%; buggedheight: 100%; } #left-two { position: relative; margin-top: 12px; line-height: 18px; text-align: center; vertical-align: top; } #right-one { display: table; height: 100%; width: 100%; } #right-two { display: table-row; height: 100%; width: 100%; } #right-three { display: table-cell; width: 100%; vertical-align: bottom; _position: absolute; _top: 100%; } #right-four { text-align: center; margin-bottom: 2ex; _position: relative; _top: -100%; } #more-top { position: absolute; top: 0%; left: 90%; bottom: 90%; right: 0%; z-index: 3; width: 10%; height: 10%; padding: 0%; margin: 0%; border-style: none; border-width: 0; } #more-top-settings { text-align: center; } #more-right-settings { margin-right: 12px; margin-left: 12px; line-height: 18px; font-size: 10px; text-align: center; } #right-safari { _display: table; width: 100%; height: 100%; } 
+        </style>
+        <style type="text/css">
+                    </style>
+                    </head>
+        <body>
+            <div id="top">            <div id="top-one">
+                <div id="top-two">ConTeXt Minimals Updater 1.03 </div>
+            </div>
+        </div>
+        <div id="bottom">            <div id="bottom-one">
+                <div id="bottom-two">wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl</div>
+            </div>
+        </div>
+        <div id="left"></div>
+        <div id="right"></div>
+        <div id="main">
+            <div id='main-settings'>
+                <h1>Command line options</h1>
+<table>
+    <tr><th style="width: 10em">flag</th><th style="width: 8em">value</th><th>description</th></tr>
+        <tr><th/><td/><td/></tr>
+        <tr><th>--platform</th><td>string</td><td>platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)</td></tr>
+        <tr><th>--server</th><td>string</td><td>repository url (rsync://contextgarden.net)</td></tr>
+        <tr><th>--module</th><td>string</td><td>repository url (minimals)</td></tr>
+        <tr><th>--repository</th><td>string</td><td>specify version (current, experimental)</td></tr>
+        <tr><th>--context</th><td>string</td><td>specify version (current, latest, beta, yyyy.mm.dd)</td></tr>
+        <tr><th>--rsync</th><td>string</td><td>rsync binary (rsync)</td></tr>
+        <tr><th>--texroot</th><td>string</td><td>installation directory (not guessed for the moment)</td></tr>
+        <tr><th>--engine</th><td>string</td><td>tex engine (luatex, pdftex, xetex)</td></tr>
+        <tr><th>--modules</th><td>string</td><td>extra modules (can be list or 'all')</td></tr>
+        <tr><th>--fonts</th><td>string</td><td>additional fonts (can be list or 'all')</td></tr>
+        <tr><th>--goodies</th><td>string</td><td>extra binaries (like scite and texworks)</td></tr>
+        <tr><th>--force</th><td></td><td>instead of a dryrun, do the real thing</td></tr>
+        <tr><th>--update</th><td></td><td>update minimal tree</td></tr>
+        <tr><th>--make</th><td></td><td>also make formats and generate file databases</td></tr>
+        <tr><th>--keep</th><td></td><td>don't delete unused or obsolete files</td></tr>
+        <tr><th>--state</th><td></td><td>update tree using saved state</td></tr>
+        <tr><th>--cygwin</th><td></td><td>adapt drive specs to cygwin</td></tr>
+        <tr><th>--mingw</th><td></td><td>assume mingw binaries being used</td></tr>
+        <tr><th>--silent</th><td></td><td>less (or no) logging</td></tr>
+    </table>
+<br/>
+            </div>
+        </div>
+        </body>
+</html>
diff --git a/doc/context/scripts/mkiv/mtx-update.man b/doc/context/scripts/mkiv/mtx-update.man
new file mode 100644
index 000000000..a4ecef639
--- /dev/null
+++ b/doc/context/scripts/mkiv/mtx-update.man
@@ -0,0 +1,81 @@
+.TH "mtx-update" "1" "01-01-2019" "version 1.03" "ConTeXt Minimals Updater"
+.SH NAME
+ mtx-update - ConTeXt Minimals Updater
+.SH SYNOPSIS
+.B mtxrun --script update [
+.I OPTIONS ...
+.B ] [
+.I FILENAMES
+.B ]
+.SH DESCRIPTION
+.B ConTeXt Minimals Updater
+.SH OPTIONS
+.TP
+.B --platform=string
+platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)
+.TP
+.B --server=string
+repository url (rsync://contextgarden.net)
+.TP
+.B --module=string
+repository url (minimals)
+.TP
+.B --repository=string
+specify version (current, experimental)
+.TP
+.B --context=string
+specify version (current, latest, beta, yyyy.mm.dd)
+.TP
+.B --rsync=string
+rsync binary (rsync)
+.TP
+.B --texroot=string
+installation directory (not guessed for the moment)
+.TP
+.B --engine=string
+tex engine (luatex, pdftex, xetex)
+.TP
+.B --modules=string
+extra modules (can be list or 'all')
+.TP
+.B --fonts=string
+additional fonts (can be list or 'all')
+.TP
+.B --goodies=string
+extra binaries (like scite and texworks)
+.TP
+.B --force
+instead of a dryrun, do the real thing
+.TP
+.B --update
+update minimal tree
+.TP
+.B --make
+also make formats and generate file databases
+.TP
+.B --keep
+don't delete unused or obsolete files
+.TP
+.B --state
+update tree using saved state
+.TP
+.B --cygwin
+adapt drive specs to cygwin
+.TP
+.B --mingw
+assume mingw binaries being used
+.TP
+.B --silent
+less (or no) logging
+.SH AUTHOR
+More information about ConTeXt and the tools that come with it can be found at:
+
+
+.B "maillist:"
+ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context
+
+.B "webpage:"
+http://www.pragma-ade.nl / http://tex.aanhet.net
+
+.B "wiki:"
+http://contextgarden.net
diff --git a/doc/context/scripts/mkiv/mtx-update.xml b/doc/context/scripts/mkiv/mtx-update.xml
new file mode 100644
index 000000000..818b994fd
--- /dev/null
+++ b/doc/context/scripts/mkiv/mtx-update.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<application>
+ <metadata>
+  <entry name="name">mtx-update</entry>
+  <entry name="detail">ConTeXt Minimals Updater</entry>
+  <entry name="version">1.03</entry>
+ </metadata>
+ <flags>
+  <category name="basic">
+   <subcategory>
+    <flag name="platform" value="string"><short>platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)</short></flag>
+    <flag name="server" value="string"><short>repository url (rsync://contextgarden.net)</short></flag>
+    <flag name="module" value="string"><short>repository url (minimals)</short></flag>
+    <flag name="repository" value="string"><short>specify version (current, experimental)</short></flag>
+    <flag name="context" value="string"><short>specify version (current, latest, beta, yyyy.mm.dd)</short></flag>
+    <flag name="rsync" value="string"><short>rsync binary (rsync)</short></flag>
+    <flag name="texroot" value="string"><short>installation directory (not guessed for the moment)</short></flag>
+    <flag name="engine" value="string"><short>tex engine (luatex, pdftex, xetex)</short></flag>
+    <flag name="modules" value="string"><short>extra modules (can be list or 'all')</short></flag>
+    <flag name="fonts" value="string"><short>additional fonts (can be list or 'all')</short></flag>
+    <flag name="goodies" value="string"><short>extra binaries (like scite and texworks)</short></flag>
+    <flag name="force"><short>instead of a dryrun, do the real thing</short></flag>
+    <flag name="update"><short>update minimal tree</short></flag>
+    <flag name="make"><short>also make formats and generate file databases</short></flag>
+    <flag name="keep"><short>don't delete unused or obsolete files</short></flag>
+    <flag name="state"><short>update tree using saved state</short></flag>
+    <flag name="cygwin"><short>adapt drive specs to cygwin</short></flag>
+    <flag name="mingw"><short>assume mingw binaries being used</short></flag>
+    <flag name="silent"><short>less (or no) logging</short></flag>
+   </subcategory>
+  </category>
+ </flags>
+</application>
diff --git a/metapost/context/base/mpiv/mp-lmtx.mpxl b/metapost/context/base/mpiv/mp-lmtx.mpxl
index 3d24dfd75..bc658a7b2 100644
--- a/metapost/context/base/mpiv/mp-lmtx.mpxl
+++ b/metapost/context/base/mpiv/mp-lmtx.mpxl
@@ -2124,6 +2124,7 @@ presetparameters "mpsglyphs" [
 presetparameters "mpsglyph" [
     category = "dummy",
     unicode  = 0,
+  % unichar  = ""
 ] ;
 
 def lmt_registerglyphs = applyparameters "mpsglyphs" "lmt_do_registerglyphs" enddef ;
diff --git a/scripts/context/lua/mtx-update.lua b/scripts/context/lua/mtx-update.lua
index a3297e804..0462313d6 100644
--- a/scripts/context/lua/mtx-update.lua
+++ b/scripts/context/lua/mtx-update.lua
@@ -224,7 +224,7 @@ update.goodies = {
 --     ["unknown"]        = "unknown",
 -- }
 
-local platforms = {
+update.platforms = {
     ["mswin"]          = "mswin",
     ["windows"]        = "mswin",
     ["win32"]          = "mswin",
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index bed8b96fc..08e2176a8 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2019.10.04 17:44}
+\newcontextversion{2019.10.05 14:45}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index b042613af..e1b15ce6a 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.10.04 17:44}
+\edef\contextversion{2019.10.05 14:45}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii
index b85fcc245..02135bcbf 100644
--- a/tex/context/base/mkii/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
@@ -234,6 +234,7 @@
 \setinterfacevariable{hanging}{suspend}
 \setinterfacevariable{head}{tete}
 \setinterfacevariable{header}{entete}
+\setinterfacevariable{headintext}{headintext}
 \setinterfacevariable{height}{hauteur}
 \setinterfacevariable{helptext}{texteaide}
 \setinterfacevariable{hencefore}{precedent}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 1b4a8b805..07821ba93 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2019.10.04 17:44}
+\newcontextversion{2019.10.05 14:45}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index cc542ec68..ae52ed885 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.10.04 17:44}
+\edef\contextversion{2019.10.05 14:45}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 6158184ee..538735850 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.10.04 17:44}
+\edef\contextversion{2019.10.05 14:45}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/font-ogr.lua b/tex/context/base/mkiv/font-ogr.lua
index ed5bc709b..5d45c3c5b 100644
--- a/tex/context/base/mkiv/font-ogr.lua
+++ b/tex/context/base/mkiv/font-ogr.lua
@@ -202,18 +202,23 @@ do
     end
 
     function dropins.registerglyph(parameters)
-        local category   = parameters.category
-        local unicode    = parameters.unicode
-        local unitype    = type(unicode)
-        if unitype == "string" then
-            local uninumber = tonumber(unicode)
-            if uninumber then
-                unicode = round(uninumber)
-            else
-                unicode = utfbyte(unicode)
+        local category = parameters.category
+        local unicode  = parameters.unicode
+        local unichar  = parameters.unichar
+        if type(unichar) == "string" then
+            unicode = utfbyte(unichar)
+        else
+            local unitype = type(unicode)
+            if unitype == "string" then
+                local uninumber = tonumber(unicode)
+                if uninumber then
+                    unicode = round(uninumber)
+                else
+                    unicode = utfbyte(unicode)
+                end
+            elseif unitype == "number" then
+                unicode = round(unicode)
             end
-        elseif unitype == "number" then
-            unicode = round(unicode)
         end
         parameters.unicode = unicode
      -- print(category,unicode)
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 0d100562d..0ee0bd0ce 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 41c98c12c..215b37f01 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml
index 3e0e890d6..c1f7b970b 100644
--- a/tex/context/interface/mkii/keys-fr.xml
+++ b/tex/context/interface/mkii/keys-fr.xml
@@ -237,6 +237,7 @@
 		<cd:variable name='hanging' value='suspend'/>
 		<cd:variable name='head' value='tete'/>
 		<cd:variable name='header' value='entete'/>
+		<cd:variable name='headintext' value='headintext'/>
 		<cd:variable name='height' value='hauteur'/>
 		<cd:variable name='helptext' value='texteaide'/>
 		<cd:variable name='hencefore' value='precedent'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 51102b6e7..d28f6d585 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 41e4b2392..cb957009b 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 9d036f3ec..e9b99be70 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 10/04/19 17:44:12
+-- merge date  : 10/05/19 14:45:26
 
 do -- begin closure to overcome local limits and interference