2019-10-05 14:54:00

13 files changed, 24 insertions, 17 deletions

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