1 files changed, 26 insertions, 5 deletions
diff --git a/tex/context/base/mkxl/strc-reg.mkxl b/tex/context/base/mkxl/strc-reg.mkxl
index afe3d27a0..464ac4eb1 100644
--- a/tex/context/base/mkxl/strc-reg.mkxl
+++ b/tex/context/base/mkxl/strc-reg.mkxl
@@ -792,6 +792,25 @@
   {\doifelsefiledefined{#1}{}{\usefile[#1][#2]}%
    \clf_useregister{#1}{#2}{#3}{#4}}
 
+% \permanent\protected\tolerant\def\useregister[#1]#*[#2]#*[#3]#*[#4]%  tag file class prefix
+%   {\begingroup
+%    \doifelsefiledefined{#1}{}{\usefile[#1][#2]}%
+%    \ifhastok={#4}%
+%      \getdummyparameters[\c!prefix=#1,\c!label=#1,#4]%
+%    \else
+%      \getdummyparameters[\c!prefix=#4,\c!label=#4]%
+%    \fi
+%    \clf_useregister
+%      {#1}
+%      {
+%         filename {#2}
+%         class    {#3}
+%         prefix   {\dummyparameter\c!prefix}
+%         label    {\dummyparameter\c!label}
+%      }
+%    \relax
+%    \endgroup}
+
 %D Character rendering (sections):
 
 \installcorenamespace{registerindicator}
@@ -1123,15 +1142,16 @@
 % todo: adapt \strc_references_goto_internal to take an extra argument, the ref
 
 \permanent\protected\def\withregisterpagecommand#1#2#3#4% #1:processor #2:internal #3:realpage #4:page
-  {\ifcase#3\relax
-     {\tt [entry\space not\space flushed]}%
+  {\begingroup
+   \ifcase#3\relax
+     \tt [entry\space not\space flushed]%
    \else
      \def\currentregisterpageindex{#2}%
      \def\currentregisterrealpage{#3}%
      \ifchknum\currentregisterpageindex\or
        \lettonothing\currentregisterpageprefix
      \else
-       \def\currentregisterpageprefix{\clf_registerprefix{\currentregisterpageindex}}%
+       \def\currentregisterpageprefix{\clf_registerlabel{\currentregisterpageindex}}%
      \fi
      \iflocation
        \ifempty\currentregisterpageprefix
@@ -1144,7 +1164,8 @@
        \setlocationattributes
      \fi
      \applyprocessor{#1}{\currentregisterpageprefix\registerparameter\c!pagecommand{#4}}%
-   \fi}
+   \fi
+   \endgroup}
 
 \lettonothing\m_current_register
 
@@ -1281,7 +1302,7 @@
    \ifchknum\currentregisterseeindex\or
      \lettonothing\currentregisterpageprefix
    \else
-     \def\currentregisterpageprefix{\clf_registerprefix{\currentregisterseeindex}}%
+     \def\currentregisterpageprefix{\clf_registerlabel{\currentregisterseeindex}}%
    \fi
    \iflocation
      \ifempty\currentregisterpageprefix