13 files changed, 74 insertions, 20 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 4696ef82d..9e160f8a5 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.03.28 14:31}
+\newcontextversion{2020.03.30 13:25}
 
 %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 67825f040..e7bef3b85 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.03.28 14:31}
+\edef\contextversion{2020.03.30 13:25}
 
 %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 de8778e45..89fe3e80c 100644
--- a/tex/context/base/mkii/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
@@ -907,7 +907,10 @@
 \setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{motcle}
 \setinterfaceconstant{label}{etiquette}
+\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 1a9e445f8..94532ba65 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.03.28 14:31}
+\newcontextversion{2020.03.30 13:25}
 
 %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 81451a832..3d3a283aa 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.03.28 14:31}
+\edef\contextversion{2020.03.30 13:25}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 9bfa4f862..713359122 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.03.28 14:31}
+\edef\contextversion{2020.03.30 13:25}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/mlib-svg.lua b/tex/context/base/mkiv/mlib-svg.lua
index 9fd1da44e..2a1b476ae 100644
--- a/tex/context/base/mkiv/mlib-svg.lua
+++ b/tex/context/base/mkiv/mlib-svg.lua
@@ -520,13 +520,18 @@ local colorcomponents, withcolor, thecolor, usedcolors  do
 
     local p_splitcolor =
         P("#") * C(p_hexdigit*p_hexdigit)^1 / function(r,g,b)
-            return "rgb",
-                tonumber(r or 0, 16) / 255 or 0,
-                tonumber(g or 0, 16) / 255 or 0,
-                tonumber(b or 0, 16) / 255 or 0
+            if not r then
+                return "gray", 0
+            elseif not (g and b) then
+                return "gray", tonumber(r or "0", 16) / 255 or 0
+            else
+                return "rgb",
+                    tonumber(r or "0", 16) / 255 or 0,
+                    tonumber(g or "0", 16) / 255 or 0,
+                    tonumber(b or "0", 16) / 255 or 0
+            end
         end
-        +
-        P("rgb") * p_a
+      + P("rgb") * p_a
       * p_left * (p_fraction + p_separator)^-3 * (p_absolute  + p_separator)^0 * p_right / function(r,g,b,a)
             return "rgb", r or 0, g or 0, b or 0, a or false
         end
diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index 1e22aaa86..174a50cc6 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -8602,6 +8602,18 @@ return {
   ["labeloffset"]={
    ["en"]="labeloffset",
   },
+  ["labelalternative"]={
+    ["en"]="labelalternative",
+    ["nl"]="labelvariant",
+  },
+  ["labelstyle"]={
+    ["en"]="labelstyle",
+    ["nl"]="labelletter",
+  },
+  ["labelcolor"]={
+    ["en"]="labelcolor",
+    ["nl"]="labelkleur",
+  },
   ["language"]={
    ["en"]="language",
   },
diff --git a/tex/context/base/mkiv/pack-rul.mkxl b/tex/context/base/mkiv/pack-rul.mkxl
index 2bd768bd0..8131c3fc5 100644
--- a/tex/context/base/mkiv/pack-rul.mkxl
+++ b/tex/context/base/mkiv/pack-rul.mkxl
@@ -247,7 +247,7 @@
      \s!depth \d_framed_target_dp
    \relax}
 
-\def\ntg-context@ntg.nllled_box_radius
+\def\pack_framed_filled_box_radius
   {\edef\p_framed_backgroundradius{\framedparameter\c!backgroundradius}%
    \ifzeropt\dimexpr\p_framed_backgroundradius\relax % just in case of .x\bodyfontsize
      \pack_framed_filled_box_normal
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 1705970ae..5602a9210 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 3e12e0677..ad08f813a 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-ref.lua b/tex/context/base/mkiv/strc-ref.lua
index c85b3338a..fb4d22807 100644
--- a/tex/context/base/mkiv/strc-ref.lua
+++ b/tex/context/base/mkiv/strc-ref.lua
@@ -2615,6 +2615,17 @@ implement {
 -- }
 
 implement {
+    name    = "askedreference",
+    public  = true,
+    actions = function()
+        local actions = references.currentset
+        if actions then
+            context("[p=%s,r=%s]",actions.prefix or "",actions.reference)
+        end
+    end
+}
+
+implement {
     name    = "referencerealpage",
     actions = function()
         local actions = references.currentset
diff --git a/tex/context/base/mkiv/strc-ref.mkvi b/tex/context/base/mkiv/strc-ref.mkvi
index e774117fa..42327686b 100644
--- a/tex/context/base/mkiv/strc-ref.mkvi
+++ b/tex/context/base/mkiv/strc-ref.mkvi
@@ -737,6 +737,29 @@
 \def\dummyreference{{\tttf ??}}
 \def\emptyreference{{\tttf !!}}
 
+\installtextracker
+  {structures.referencing.show}
+  {\let\strc_references_dummy\strc_references_dummy_yes}
+  {\let\strc_references_dummy\strc_references_dummy_nop}
+
+\def\strc_references_dummy_nop
+  {\dummyreference}
+
+\def\strc_references_dummy_yes
+  {\dummyreference
+   \margindata
+     [\referencingparameter\c!labelalternative]% alternative?
+     [\c!style=\referencingparameter\c!labelstyle,
+      \c!color=\referencingparameter\c!labelcolor]
+     {\askedreference}}
+
+\let\strc_references_dummy\strc_references_dummy_nop
+
+\setupreferencing
+  [\c!labelalternative=\v!inleft,
+         \c!labelcolor=darkred,
+         \c!labelstyle=\smallinfofont]
+
 %D To prevent repetitive messages concerning a reference being defined, we set such
 %D an unknown reference to an empty one after the first encounter.
 %D
@@ -971,9 +994,9 @@
 
 \def\strc_references_get_reference[#key][#label]% #key = number page title text default realpage ...
   {\ifsecondargument
-     \doifelsereferencefound{#label}{\clf_filterreference{#key}}\dummyreference
+     \doifelsereferencefound{#label}{\clf_filterreference{#key}}\strc_references_dummy
    \else
-     \dummyreference
+     \strc_references_dummy
    \fi}
 
 \let\ref\getreference
@@ -1143,12 +1166,12 @@
 
 \unexpanded\def\atpage[#label]% todo
   {\doifcheckedpagestate{#label}%
-     {\goto{\labeltext \v!precedingpage      }[#label]}%
-     {\goto{\labeltext \v!hencefore          }[#label]}%
+     {\goto{\labeltext\v!precedingpage}[#label]}%
+     {\goto{\labeltext\v!hencefore}[#label]}%
      {\ignorespaces}%
-     {\goto{\labeltext \v!hereafter          }[#label]}%
-     {\goto{\labeltext \v!followingpage      }[#label]}%
-     {\goto{\labeltexts\v!page\dummyreference}[#label]}}
+     {\goto{\labeltext\v!hereafter}[#label]}%
+     {\goto{\labeltext\v!followingpage}[#label]}%
+     {\goto{\labeltexts\v!page\strc_references_dummy}[#label]}}
 
 % Someone requested this but in retrospect didn't need it so we keep it as example.
 % Beware: a node is injected which is why we add ignorespaces!
@@ -1262,7 +1285,7 @@
    % inefficient: double resolve
    \doifelsereferencefound{#label} % we need to resolve the text
      {\goto{\referencesequence}[#label]}
-     {\let\currentreferencecontent\dummyreference
+     {\let\currentreferencecontent\strc_references_dummy
       \goto{\referencesequence}[#label]}%
    \strc_references_stop_goto}