2021-03-01 15:36:00

6 files changed, 10 insertions, 4 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index c984f50cf..229feff8a 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{2021.02.27 19:27}
+\newcontextversion{2021.03.01 15: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 e2afeb0d4..796f686fc 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{2021.02.27 19:27}
+\edef\contextversion{2021.03.01 15:33}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/data-env.lua b/tex/context/base/mkiv/data-env.lua
index 53f0c27cc..3b10d89b8 100644
--- a/tex/context/base/mkiv/data-env.lua
+++ b/tex/context/base/mkiv/data-env.lua
@@ -94,7 +94,9 @@ local relations = allocate { -- todo: handlers also here
         mp = {
             names    = { "mp" },
             variable = 'MPINPUTS',
-            suffixes = { 'mp', 'mpvi', 'mpiv', 'mpxl', 'mpii' },
+            suffixes = CONTEXTLMTXMODE > 0
+                and { 'mp', 'mpxl', 'mpvi', 'mpiv', 'mpii' }
+                or  { 'mp',         'mpvi', 'mpiv', 'mpii' },
             usertype = true,
         },
         tex = {
diff --git a/tex/context/base/mkiv/publ-ini.mkiv b/tex/context/base/mkiv/publ-ini.mkiv
index ef2c5cbda..dfed53c73 100644
--- a/tex/context/base/mkiv/publ-ini.mkiv
+++ b/tex/context/base/mkiv/publ-ini.mkiv
@@ -396,6 +396,10 @@
 
 \let\btxsetup\fastsetup
 
+% This fails when we check field values:
+
+\let\btxrawfield\btxfield
+
 \def\btxfield      #1{\dostarttagged\t!pubfld{#1}\clf_btxfield {\currentbtxdataset}{\currentbtxtag}{#1}\dostoptagged}
 \def\btxdetail     #1{\dostarttagged\t!pubfld{#1}\clf_btxdetail{\currentbtxdataset}{\currentbtxtag}{#1}\dostoptagged}
 \def\btxflush      #1{\dostarttagged\t!pubfld{#1}\clf_btxflush {\currentbtxdataset}{\currentbtxtag}{#1}\dostoptagged}
@@ -681,7 +685,7 @@
    \dostarttagged\t!publication\empty
    \dotagpublication\currentbtxdataset\currentbtxtag
    \redoconvertfont % see (**) in strc-lst, this will become an configuration option
-   \edef\currentbtxcategory{\btxfield{category}}%
+   \edef\currentbtxcategory{\btxrawfield{category}}%
    \ignorespaces
    \ifconditional\c_btx_list_texts
      \dostarttagged\t!listtext\s!left
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 0b1992890..58cd21876 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 b52a1d01d..4241ea0a2 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf