2020-07-28 23:04:00

17 files changed, 56 insertions, 33 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index feec73f69..fc33cbde7 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.27 16:21}
+\newcontextversion{2020.07.28 23:01}
 
 %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 6e12a920d..2b963931e 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.27 16:21}
+\edef\contextversion{2020.07.28 23:01}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii
index d944ecccf..0868762e9 100644
--- a/tex/context/base/mkii/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
@@ -211,6 +211,7 @@
 \setinterfacevariable{flushouter}{lijnbuiten}
 \setinterfacevariable{flushright}{lijnrechts}
 \setinterfacevariable{followingpage}{opvolgendepagina}
+\setinterfacevariable{font}{font}
 \setinterfacevariable{footer}{voet}
 \setinterfacevariable{footnote}{voetnoot}
 \setinterfacevariable{force}{forceer}
@@ -832,6 +833,7 @@
 \setinterfaceconstant{focusin}{focusin}
 \setinterfaceconstant{focusoffset}{focusoffset}
 \setinterfaceconstant{focusout}{focusuit}
+\setinterfaceconstant{font}{font}
 \setinterfaceconstant{footer}{voet}
 \setinterfaceconstant{footerdistance}{voetafstand}
 \setinterfaceconstant{footerstate}{voetstatus}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 9408f9e1a..fe3e63829 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.27 16:21}
+\newcontextversion{2020.07.28 23:01}
 
 %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 95d207612..ff3cb96b0 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.27 16:21}
+\edef\contextversion{2020.07.28 23:01}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index b684d2ad6..5fb5c4024 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.27 16:21}
+\edef\contextversion{2020.07.28 23:01}
 
 %D Kind of special:
 
@@ -326,6 +326,7 @@
 \loadmkxlfile{pack-lyr} % LMTX
 \loadmarkfile{pack-pos}
 \loadmkvifile{page-mak}
+\loadmkxlfile{page-mcl} % LMTX
 
 \loadmarkfile{strc-reg} % uses mixed columns
 
diff --git a/tex/context/base/mkiv/core-ini.mkiv b/tex/context/base/mkiv/core-ini.mkiv
index cb8881c22..bbe66307b 100644
--- a/tex/context/base/mkiv/core-ini.mkiv
+++ b/tex/context/base/mkiv/core-ini.mkiv
@@ -170,8 +170,9 @@
 
 \newif \ifinpagebody
 \newif \ifinsidecolumns
-\newif \ifdoublesided   \doublesidedfalse
-\newif \ifsinglesided   \singlesidedtrue
+\newif \ifinsidemulticolumns  % simple mixed-in-text columns
+\newif \ifdoublesided         \doublesidedfalse
+\newif \ifsinglesided         \singlesidedtrue
 \newif \ifinsidefloat
 \newif \ifdoingblocks
 \newif \ifgridsnapping
@@ -180,6 +181,9 @@
 \newconstant\pageduplexmode % 0 single 1 double 2 mix
 \newconstant\pagebodymode   % 0 not 1 normal pagebody 2 spread
 
+\newcount\nofcolumns      \nofcolumns     \plusone
+\newcount\nofmulticolumns \nofmulticolumns\plusone
+
 %D \macros
 %D   {ifproductionrun}
 %D
diff --git a/tex/context/base/mkiv/page-col.mkiv b/tex/context/base/mkiv/page-col.mkiv
index 272ffe181..a51406cd9 100644
--- a/tex/context/base/mkiv/page-col.mkiv
+++ b/tex/context/base/mkiv/page-col.mkiv
@@ -22,7 +22,7 @@
 %D We reserve a counter for the number of columns as well as the current
 %D column. Both are not to be changed by users!
 
-\newcount\nofcolumns \nofcolumns\plusone
+%newcount\nofcolumns \nofcolumns\plusone % already in core-ini.mkiv
 \newcount\mofcolumns \mofcolumns\plusone
 
 \newconstant\columndirection % 0:lr 1:rl
diff --git a/tex/context/base/mkiv/page-mul.mkiv b/tex/context/base/mkiv/page-mul.mkiv
index f1d68827a..a0a02543e 100644
--- a/tex/context/base/mkiv/page-mul.mkiv
+++ b/tex/context/base/mkiv/page-mul.mkiv
@@ -690,17 +690,17 @@
         \else
           \unvcopy#4%
         \fi
-        \fuzzysnappedbox\unvbox\scratchbox
+        \unvbox\scratchbox
         \fakecolumnfootnotes{#1}}%
    \else\ifcase\c_strc_notes_page_location
      \global\setbox#1\vsplit#2 to #3%
      \global\setbox#1\vbox
-       {\fuzzysnappedbox\unvbox{#1}}% % or \box ?
+       {\unvbox{#1}}% % or \box ?
    \else
      \columnfootnotecorrection{#1}{#3}%
      \setbox\scratchbox\vsplit#2 to #3%
      \global\setbox#1\vbox to #3%
-       {\fuzzysnappedbox\unvbox\scratchbox
+       {\unvbox\scratchbox
         \fakecolumnfootnotes{#1}}%
    \fi \fi
    \egroup}
@@ -714,7 +714,7 @@
 \def\page_mul_split_last_column#1#2%
   {\global\setbox\lastcolumnbox\vbox
      {\unvcopy\lasttopcolumnbox
-      \fuzzysnappedbox\unvbox{#1}%
+      \unvbox{#1}%
       \fakecolumnfootnotes\lastcolumnbox}}
 
 %D NEW: still to be documented.
diff --git a/tex/context/base/mkiv/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv
index 6be653155..059e099fd 100644
--- a/tex/context/base/mkiv/spac-ver.mkiv
+++ b/tex/context/base/mkiv/spac-ver.mkiv
@@ -1883,11 +1883,8 @@
 
 %D This has become obsolete:
 
-\def\fuzzysnappedbox#1#2% \box<n> \unvbox<n>
-  {#1#2}
-
-\def\moveboxontogrid#1#2#3% will become obsolete, but it needs checking
-  {}
+% \def\moveboxontogrid#1#2#3% will become obsolete, but it needs checking
+%   {}
 
 %D Helper:
 
diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl
index d5f85569a..82608ddcc 100644
--- a/tex/context/base/mkiv/spac-ver.mkxl
+++ b/tex/context/base/mkiv/spac-ver.mkxl
@@ -1878,11 +1878,8 @@
 
 %D This has become obsolete:
 
-\def\fuzzysnappedbox#1#2% \box<n> \unvbox<n>
-  {#1#2}
-
-\def\moveboxontogrid#1#2#3% will become obsolete, but it needs checking
-  {}
+% \def\moveboxontogrid#1#2#3% will become obsolete, but it needs checking
+%   {}
 
 %D Helper:
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 43e99e1d7..125cb7966 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 bbba0e977..0abbf34eb 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi
index 8b94eb832..3e57a857b 100644
--- a/tex/context/base/mkiv/strc-flt.mkvi
+++ b/tex/context/base/mkiv/strc-flt.mkvi
@@ -1624,7 +1624,7 @@
        \setbox\b_strc_floats_caption\hbox % text
          {\floatcaptionparameter\c!command{\box\b_strc_floats_caption}}%
        \strc_floats_set_caption_dimensions\b_strc_floats_caption
-       \moveboxontogrid\b_strc_floats_caption{\floatcaptionparameter\c!grid}\d_strc_floats_caption_height
+      %\moveboxontogrid\b_strc_floats_caption{\floatcaptionparameter\c!grid}\d_strc_floats_caption_height
       %\page_backgrounds_add_local_to_box\b_strc_floats_caption
        \strc_floats_build_box
      \fi
@@ -2340,7 +2340,7 @@
      \strc_floats_check_caption_content
      \strc_floats_prepare_side_caption
      \setbox\b_strc_floats_caption\hbox{\floatcaptionparameter\c!command{\box\b_strc_floats_caption}}% \hpack ?
-     \moveboxontogrid\b_strc_floats_caption{\floatcaptionparameter\c!grid}\d_strc_floats_caption_height
+    %\moveboxontogrid\b_strc_floats_caption{\floatcaptionparameter\c!grid}\d_strc_floats_caption_height
     %\page_backgrounds_add_local_to_box\b_strc_floats_caption
      \strc_floats_build_side_box
    \fi
diff --git a/tex/context/base/mkiv/strc-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index bc2fc53eb..2605967c6 100644
--- a/tex/context/base/mkiv/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
@@ -952,13 +952,25 @@
 \setupnotes
   [\c!width=\v!auto]
 
+% \def\strc_notes_set_width
+%   {\edef\p_width{\noteparameter\c!width}%
+%    \ifx\p_width\v!auto
+%      \setnoteparameter\c!width{\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi}%
+%    \else\ifx\p_width\empty
+%      \setnoteparameter\c!width{\hsize}%
+%    \fi\fi}
+
 \def\strc_notes_set_width
-  {\edef\p_width{\noteparameter\c!width}%
-   \ifx\p_width\v!auto
-     \setnoteparameter\c!width{\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi}%
-   \else\ifx\p_width\empty
-     \setnoteparameter\c!width{\hsize}%
-   \fi\fi}
+  {\ifinsidemulticolumns
+     \setnoteparameter\c!width{\makeupwidth}%
+   \else
+     \edef\p_width{\noteparameter\c!width}%
+     \ifx\p_width\v!auto
+       \setnoteparameter\c!width{\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi}%
+     \else\ifx\p_width\empty
+       \setnoteparameter\c!width{\hsize}%
+     \fi\fi
+  \fi}
 
 \appendtoks
     \strc_notes_set_width
@@ -1112,12 +1124,21 @@
      \c_strc_notes_columns\plusone
    \fi}
 
+% \def\strc_notes_set_location_page
+%   {\setfalse\c_strc_notes_delayed
+%    \strc_notes_set_distance
+%    \strc_notes_set_columns
+%    \page_inserts_set_location\currentnoteinsertion\v!page % \setupinsertion[\currentnote][\c!location=\v!page]%
+%    \global\count\currentnoteinsertionnumber\numexpr\plusthousand/\c_strc_notes_columns\relax
+%    \global\dimen\currentnoteinsertionnumber\ifnotelimit\dimexpr\noteparameter\c!height*\c_strc_notes_columns\relax\else\maxdimen\fi
+%    \global\skip \currentnoteinsertionnumber\s_strc_notes_distance\relax}
+
 \def\strc_notes_set_location_page
   {\setfalse\c_strc_notes_delayed
    \strc_notes_set_distance
    \strc_notes_set_columns
    \page_inserts_set_location\currentnoteinsertion\v!page % \setupinsertion[\currentnote][\c!location=\v!page]%
-   \global\count\currentnoteinsertionnumber\numexpr\plusthousand/\c_strc_notes_columns\relax
+   \global\count\currentnoteinsertionnumber\numexpr(\plusthousand/\c_strc_notes_columns)*\nofmulticolumns\relax
    \global\dimen\currentnoteinsertionnumber\ifnotelimit\dimexpr\noteparameter\c!height*\c_strc_notes_columns\relax\else\maxdimen\fi
    \global\skip \currentnoteinsertionnumber\s_strc_notes_distance}
 
@@ -2043,4 +2064,3 @@
 % \stoptext
 
 \protect \endinput
-
diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index e07dc1aaf..ccec1c829 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -214,6 +214,7 @@
 		<cd:variable name='flushouter' value='lijnbuiten'/>
 		<cd:variable name='flushright' value='lijnrechts'/>
 		<cd:variable name='followingpage' value='opvolgendepagina'/>
+		<cd:variable name='font' value='font'/>
 		<cd:variable name='footer' value='voet'/>
 		<cd:variable name='footnote' value='voetnoot'/>
 		<cd:variable name='force' value='forceer'/>
@@ -838,6 +839,7 @@
 		<cd:constant name='focusin' value='focusin'/>
 		<cd:constant name='focusoffset' value='focusoffset'/>
 		<cd:constant name='focusout' value='focusuit'/>
+		<cd:constant name='font' value='font'/>
 		<cd:constant name='footer' value='voet'/>
 		<cd:constant name='footerdistance' value='voetafstand'/>
 		<cd:constant name='footerstate' value='voetstatus'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 26b5e38bf..cd5f82135 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-27 16:21
+-- merge date  : 2020-07-28 23:01
 
 do -- begin closure to overcome local limits and interference