2020-04-27 22:24:00

13 files changed, 72 insertions, 20 deletions

diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf
index eee341375..beb37fb7d 100644
--- a/doc/context/documents/general/manuals/luametatex.pdf
+++ b/doc/context/documents/general/manuals/luametatex.pdf
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 16acecc38..f93813247 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.04.26 19:53}
+\newcontextversion{2020.04.27 22:21}
 
 %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 1d2501c7b..5a809b7b8 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.04.26 19:53}
+\edef\contextversion{2020.04.27 22:21}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 219e59dd8..e43843bae 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -907,7 +907,10 @@
 \setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{keyword}
 \setinterfaceconstant{label}{eticheta}
+\setinterfaceconstant{labelalternative}{labelalternative}
+\setinterfaceconstant{labelcolor}{labelcolor}
 \setinterfaceconstant{labeloffset}{labeloffset}
+\setinterfaceconstant{labelstyle}{labelstyle}
 \setinterfaceconstant{language}{language}
 \setinterfaceconstant{last}{last}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index f97f5b90f..529130815 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.04.26 19:53}
+\newcontextversion{2020.04.27 22:21}
 
 %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 b600b8c94..25557437b 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.04.26 19:53}
+\edef\contextversion{2020.04.27 22:21}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index da99d2af5..2fb25036b 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.04.26 19:53}
+\edef\contextversion{2020.04.27 22:21}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/math-fen.mkiv b/tex/context/base/mkiv/math-fen.mkiv
index 6c6724bf5..cf95e6a8e 100644
--- a/tex/context/base/mkiv/math-fen.mkiv
+++ b/tex/context/base/mkiv/math-fen.mkiv
@@ -65,9 +65,39 @@
 
 % we need the direct use of \Udelimiter because of { etc
 
+%D So we can do:
+%D
+%D \starttyping
+%D $ a + \fenced[bar][size=1]   {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][size=2]   {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][size=3]   {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][size=4]   {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][size=big] {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][size=Big] {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][size=bigg]{\frac {b} {c}} + d $
+%D $ a + \fenced[bar][size=Bigg]{\frac {b} {c}} + d $
+%D $ a + \fenced[bar][factor=1] {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][factor=2] {\frac {b} {c}} + d $
+%D $ a + \fenced[bar][factor=4] {\frac {b} {c}} + d $
+%D $ a + \fenced[bar]           {\frac {b} {c}} + d $
+%D \stoptyping
+
 \newconditional\c_math_fenced_mirror \settrue \c_math_fenced_mirror
 \newconditional\c_math_fenced_sized  \setfalse\c_math_fenced_sized
 
+\installcorenamespace {mathfencesize}
+
+\setvalue{\??mathfencesize  big}{1}
+\setvalue{\??mathfencesize  Big}{2}
+\setvalue{\??mathfencesize bigg}{3}
+\setvalue{\??mathfencesize Bigg}{4}
+
+\def\math_fenced_force_size#1#2%
+  {\attribute\mathsizeattribute\numexpr
+     #1*\plushundred
+    +\ifcsname\??mathfencesize#2\endcsname\lastnamedcs\else#2\fi
+   \relax}
+
 \unexpanded\def\math_fenced_inject#1#2#3#4%
   {\ifx#1\empty
      #2.%
@@ -200,9 +230,6 @@
    \edef\currentmathfence{#1}%
    \dosingleempty\math_fenced_fenced_indeed}
 
-\def\math_fenced_force_size#1#2%
-  {\attribute\mathsizeattribute\numexpr#1*\plushundred+#2\relax}
-
 % \unexpanded\def\math_fenced_fenced_indeed[#1]#2%
 %   {\iffirstargument\setupcurrentmathfence[#1]\fi
 %    \math_fenced_fenced_common
@@ -635,6 +662,11 @@
 
 \installcorenamespace{mathbig}
 
+\setvalue{\??mathbig1}{0.85}
+\setvalue{\??mathbig2}{1.15}
+\setvalue{\??mathbig3}{1.45}
+\setvalue{\??mathbig4}{1.75}
+
 \unexpanded\def\choosemathbig#1#2% so we accept \big{||} as well
   {{\naturalhbox\bgroup
       \startimath
@@ -644,13 +676,32 @@
           \math_fenced_force_size\bigmathdelimitervariant{#1}\relax
           \math_fenced_step#2\relax
         \else
-          \math_fenced_step#2{\vpack to\csname\??mathbig\number#1\endcsname\bodyfontsize{}}%
+          \math_fenced_step#2{\vpack to\csname\??mathbig#1\endcsname\bodyfontsize{}}%
         \fi
         \nulldelimiterspace\zeropoint\relax
         \mathsurround\zeropoint
       \stopimath
     \egroup}}
 
+% needs testing:
+%
+% \unexpanded\def\choosemathbig#1#2% so we accept \big{||} as well
+%   {{\naturalhbox\bgroup
+%       \startimath
+%         \ifcase\bigmathdelimitermethod
+%           \Uvextensible#2\relax
+%         \or
+%           \math_fenced_force_size\bigmathdelimitervariant{#1}\relax
+%           \Uvextensible#2\relax
+%         \else
+%           \scratchdimen.5\dimexpr\csname\??mathbig\number#1\endcsname\bodyfontsize+1.1\exheight\relax
+%           \Uvextensible\s!axis \s!depth \scratchdimen \s!height \scratchdimen #2\relax
+%         \fi
+%         \nulldelimiterspace\zeropoint\relax
+%         \mathsurround\zeropoint
+%       \stopimath
+%     \egroup}}
+
 \def\math_fenced_step#1#2%
   {\setfalse\c_math_fenced_unknown
    \setfalse\c_math_fenced_done
@@ -675,15 +726,10 @@
    \math_fenced_step#2\relax
    \endgroup}
 
-\setvalue{\??mathbig1}{0.85}
-\setvalue{\??mathbig2}{1.15}
-\setvalue{\??mathbig3}{1.45}
-\setvalue{\??mathbig4}{1.75}
-
-\definemathcommand [big]  {\choosemathbig\plusone  }
-\definemathcommand [Big]  {\choosemathbig\plustwo  }
-\definemathcommand [bigg] {\choosemathbig\plusthree}
-\definemathcommand [Bigg] {\choosemathbig\plusfour }
+\definemathcommand [big]  {\choosemathbig1}
+\definemathcommand [Big]  {\choosemathbig2}
+\definemathcommand [bigg] {\choosemathbig3}
+\definemathcommand [Bigg] {\choosemathbig4}
 
 \definemathcommand [bigl]  [open]  [one] {\big}
 \definemathcommand [bigm]  [rel]   [one] {\big}
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 35750fc43..3420f73af 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 095e10a1a..769c98b57 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/trac-deb.lua b/tex/context/base/mkiv/trac-deb.lua
index ca6f01c58..2d4e81dd7 100644
--- a/tex/context/base/mkiv/trac-deb.lua
+++ b/tex/context/base/mkiv/trac-deb.lua
@@ -281,7 +281,7 @@ function tracers.printerror(specification)
                     report_nl()
                     tex.show_context()
                 end
-                if lastluaerror and lastluaerror ~= "" then
+                if lastluaerror and not match(lastluaerror,"^%s*[%?]*%s*$") then
                     print("\nlua error:\n\n",lastluaerror,"\n")
                     quitonerror = true
                 end
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index 0bde14e86..8e1770d05 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -913,7 +913,10 @@
 		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='keyword'/>
 		<cd:constant name='label' value='eticheta'/>
+		<cd:constant name='labelalternative' value='labelalternative'/>
+		<cd:constant name='labelcolor' value='labelcolor'/>
 		<cd:constant name='labeloffset' value='labeloffset'/>
+		<cd:constant name='labelstyle' value='labelstyle'/>
 		<cd:constant name='language' value='language'/>
 		<cd:constant name='last' value='last'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 4a1456f88..6fbe6f388 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-04-26 19:53
+-- merge date  : 2020-04-27 22:21
 
 do -- begin closure to overcome local limits and interference