2020-07-29 18:36:00

17 files changed, 32 insertions, 19 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 6221f5318..28ba4fab6 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{2020.07.29 14:02}
+\newcontextversion{2020.07.29 18:33}
 
 %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 ca3e68987..e9cb67507 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{2020.07.29 14:02}
+\edef\contextversion{2020.07.29 18:33}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index 923e871bc..afc3bebb2 100644
--- a/tex/context/base/mkii/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
@@ -211,6 +211,7 @@
 \setinterfacevariable{flushouter}{flushouter}
 \setinterfacevariable{flushright}{flushright}
 \setinterfacevariable{followingpage}{followingpage}
+\setinterfacevariable{font}{font}
 \setinterfacevariable{footer}{fusszeile}
 \setinterfacevariable{footnote}{fussnote}
 \setinterfacevariable{force}{zwinge}
@@ -832,6 +833,7 @@
 \setinterfaceconstant{focusin}{focusin}
 \setinterfaceconstant{focusoffset}{focusoffset}
 \setinterfaceconstant{focusout}{focusout}
+\setinterfaceconstant{font}{font}
 \setinterfaceconstant{footer}{fusszeile}
 \setinterfaceconstant{footerdistance}{fusszeilenabstand}
 \setinterfaceconstant{footerstate}{fusszeilenstatus}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 70e1cfc10..21caad4da 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{2020.07.29 14:02}
+\newcontextversion{2020.07.29 18:33}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 3417d8041..38f871ce2 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{2020.07.29 14:02}
+\edef\contextversion{2020.07.29 18:33}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index fbd38ef99..ea7e7c1b4 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{2020.07.29 14:02}
+\edef\contextversion{2020.07.29 18:33}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/mlib-lua.lmt b/tex/context/base/mkiv/mlib-lua.lmt
index 30fc2ff63..366a8bca7 100644
--- a/tex/context/base/mkiv/mlib-lua.lmt
+++ b/tex/context/base/mkiv/mlib-lua.lmt
@@ -95,7 +95,7 @@ end
 function inject.path(p,close,connector)
     local curled = false
     local n = #p
-    if p.close then
+    if p.close or p.cycle then
         close = true
     end
     if n > 1 then
@@ -111,7 +111,7 @@ function inject.path(p,close,connector)
             end
         end
     end
-    return inject_path(currentmpx,p,curled,close)
+    return inject_path(currentmpx,p,close,curled)
 end
 
 -- bonus:
diff --git a/tex/context/base/mkiv/mlib-scn.lmt b/tex/context/base/mkiv/mlib-scn.lmt
index 4c6c15a89..4497dffc8 100644
--- a/tex/context/base/mkiv/mlib-scn.lmt
+++ b/tex/context/base/mkiv/mlib-scn.lmt
@@ -335,7 +335,7 @@ local function get(v)
     elseif t == "table" then
         local n = #v
         if type(v[1]) == "table" then
-            return injectpath(v) -- cycle ?
+            return injectpath(v)
         elseif n == 2 then
             return injectpair(v)
         elseif n == 3 then
diff --git a/tex/context/base/mkiv/mult-aux.mkxl b/tex/context/base/mkiv/mult-aux.mkxl
index df460ee17..fef40ec2c 100644
--- a/tex/context/base/mkiv/mult-aux.mkxl
+++ b/tex/context/base/mkiv/mult-aux.mkxl
@@ -411,7 +411,7 @@
       \ifempty\currentstyleparameter\else\dousecurrentstyleparameter\fi}%
    \protected\def#4##1% color
      {\edef\currentcolorparameter{#1{##1}}% this name is public
-     %\ifx\currentcolorparameter\empty\else\dousecurrentcolorparameter\fi}}
+     %\ifx\currentcolorparameter\empty\else\dousecurrentcolorparameter\fi}}%
       \ifempty\currentcolorparameter\else\dousecurrentcolorparameter\fi}}
 
 \protected\def\installstyleandcolorhandler#1#2%
diff --git a/tex/context/base/mkiv/page-imp.mkiv b/tex/context/base/mkiv/page-imp.mkiv
index 6dcd47ac6..2f1e75e9d 100644
--- a/tex/context/base/mkiv/page-imp.mkiv
+++ b/tex/context/base/mkiv/page-imp.mkiv
@@ -322,7 +322,7 @@
      \gdef\arrangedrotationO{0}%
      \gdef\arrangedrotationE{180}%
      \processcommalist[#1]\doinstalledarrangedoption
-     \ifx\handlearrangedpage\undefined
+     \ifdefined\handlearrangedpage\else
        \global\arrangingpagesfalse
      \fi
      \setuppapersize
@@ -357,6 +357,15 @@
 \installpagearrangement {\v!normal}
   {\global\arrangingpagesfalse}
 
+%D (WS:) Watch out with 2UP and A4/A5:
+%D
+%D \definepapersize [A4] [width=210mm,height=297mm]
+%D \definepapersize [A5] [width=148mm,height=210mm]
+%D
+%D 297 mm - 2 * 148 mm = 1 mm
+%D
+%D This is only visible when we have a full background.
+
 \installpagearrangement 2*16
   {\dosetuparrangement{4}{4}{16}{5}{5}%
      \pusharrangedpageTHIRTYTWO\poparrangedpagesAB\relax}
diff --git a/tex/context/base/mkiv/page-ins.mkiv b/tex/context/base/mkiv/page-ins.mkiv
index bac31476c..96088b79e 100644
--- a/tex/context/base/mkiv/page-ins.mkiv
+++ b/tex/context/base/mkiv/page-ins.mkiv
@@ -1,6 +1,6 @@
 %D \module
-%D   [       file=core-ins,
-%D        version=2002.04.16,
+%D   [       file=page-ins,
+%D        version=2002.04.16, % was core-ins
 %D          title=\CONTEXT\ Insertion Macros,
 %D       subtitle=Insertions,
 %D         author=Hans Hagen,
diff --git a/tex/context/base/mkiv/page-spr.mkiv b/tex/context/base/mkiv/page-spr.mkiv
index bb95ee467..2d9e488f5 100644
--- a/tex/context/base/mkiv/page-spr.mkiv
+++ b/tex/context/base/mkiv/page-spr.mkiv
@@ -121,8 +121,8 @@
 \unexpanded\def\page_spread_stop_yes
   {\kern\zeropoint
    \page
-   \setuplayout[\c!textwidth=\textwidth]
-   \page[\v!left]
+   \setuplayout[\c!textwidth=\textwidth]%
+   \page[\v!left]%
    \egroup}
 
 \unexpanded\def\page_spread_start_nop
diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl
index 82608ddcc..c889aa05b 100644
--- a/tex/context/base/mkiv/spac-ver.mkxl
+++ b/tex/context/base/mkiv/spac-ver.mkxl
@@ -120,8 +120,8 @@
 \setvalue{\??interlinespacerelative\v!auto }{\let\setrelativeinterlinespace\spac_linespacing_set_relative_interlinespace}
 
 \def\spac_linespacing_set_specified_relative_interlinespace#1% fragile?
-  {\doifelsedimenstring{#1}
-     {\setupspecifiedinterlinespace[\c!line=#1]}
+  {\doifelsedimenstring{#1}%
+     {\setupspecifiedinterlinespace[\c!line=#1]}%
      {\assignvalue{#1}\currentrelativeinterlinespace{1.00}{1.25}{1.50}%
       \spacing\currentrelativeinterlinespace}}
 
@@ -1730,11 +1730,11 @@
 
 \unexpanded\def\synchronizegridsnapping
   {\edef\askedgridmode{\layoutparameter\c!grid}%
-   \ifx\askedgridmode\v!no       % official
+   \ifx\askedgridmode\v!no         % official
      \spac_grids_check_nop
    \orelse\ifx\askedgridmode\v!off % for taco and luigi
      \spac_grids_check_nop
-   \orelse\ifempty\askedgridmode % to be sure
+   \orelse\ifempty\askedgridmode   % to be sure
      \spac_grids_check_nop
    \else
      \spac_grids_check_yes
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index fa3d89df4..f9ccbd281 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 9b57349bb..581730810 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-de.xml b/tex/context/interface/mkii/keys-de.xml
index c8ecc0d28..b75bdd588 100644
--- a/tex/context/interface/mkii/keys-de.xml
+++ b/tex/context/interface/mkii/keys-de.xml
@@ -214,6 +214,7 @@
 		<cd:variable name='flushouter' value='flushouter'/>
 		<cd:variable name='flushright' value='flushright'/>
 		<cd:variable name='followingpage' value='followingpage'/>
+		<cd:variable name='font' value='font'/>
 		<cd:variable name='footer' value='fusszeile'/>
 		<cd:variable name='footnote' value='fussnote'/>
 		<cd:variable name='force' value='zwinge'/>
@@ -838,6 +839,7 @@
 		<cd:constant name='focusin' value='focusin'/>
 		<cd:constant name='focusoffset' value='focusoffset'/>
 		<cd:constant name='focusout' value='focusout'/>
+		<cd:constant name='font' value='font'/>
 		<cd:constant name='footer' value='fusszeile'/>
 		<cd:constant name='footerdistance' value='fusszeilenabstand'/>
 		<cd:constant name='footerstate' value='fusszeilenstatus'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index af32e9c95..4e1146097 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  : 2020-07-29 14:02
+-- merge date  : 2020-07-29 18:33
 
 do -- begin closure to overcome local limits and interference