1 files changed, 31 insertions, 15 deletions
diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv
index 9cb135fdf..3fa673d24 100644
--- a/tex/context/base/strc-reg.mkiv
+++ b/tex/context/base/strc-reg.mkiv
@@ -354,7 +354,7 @@
 \def\strc_registers_finish_entry_indeed#1#2#3% register data userdata
   {\begingroup
    \edef\currentregister{#1}%
-   \setupcurrentregister[\c!entries=,\c!label=,\c!keys=,\c!alternative=,#2]%
+   \setupcurrentregister[\c!entries=,\c!label=,\c!keys=,\c!alternative=,#2]% todo: fast setter
    \edef\currentregisterlabel    {\registerparameter\c!label}%
    \edef\currentregisterexpansion{\registerparameter\c!expansion}%
    \edef\currentregisterownnumber{\registerparameter\c!ownnumber}%
@@ -644,17 +644,19 @@
 
 % a = <before> <goodbreak> <character> <par> <after> <nobreak>
 
-\setvalue{\??registerindicator a}#1%
+\def\strc_registers_indicator_a#1#2%
   {\registerparameter\c!before
    % bugged, why does leftskip gets set: \vskip\lineheight\goodbreak\vskip-\lineheight
+   \typo_injectors_check_register
    \begingroup
    \useregisterstyleandcolor\c!style\c!color
    \dontleavehmode
+   \typo_injectors_mark_register
    \strut
    \iflocation
      \dosetdirectpagereference{\currentregister:\v!section:#1}%
    \fi
-   \registerparameter\c!command{#1}%
+   \registerparameter\c!command{#2}%
    \endgroup
    \blank[\v!samepage]%
    \registerparameter\c!after
@@ -663,26 +665,43 @@
 
 % b = <goodbreak> <before> <character> <after> <nobreak>
 
-\setvalue{\??registerindicator b}#1% will be shared with a
+\def\strc_registers_indicator_b#1#2%
   {\registerparameter\c!before
+   \typo_injectors_check_register
    \begingroup
    \useregisterstyleandcolor\c!style\c!color
    \dontleavehmode
+   \typo_injectors_mark_register
    \strut
    \iflocation
      \dosetdirectpagereference{\currentregister:\v!section:#1}%
    \fi
-   \registerparameter\c!command{#1}%
+   \registerparameter\c!command{#2}%
    \endgroup
    \registerparameter\c!after
    \nobreak}
 
-\setvalue{\??registerindicator A}#1{\getvalue{\??registerindicator a}{\WORD{#1}}}
-\setvalue{\??registerindicator B}#1{\getvalue{\??registerindicator b}{\WORD{#1}}}
+\setvalue{\??registerindicator a}#1{\strc_registers_indicator_a{#1}{#1}}
+\setvalue{\??registerindicator A}#1{\strc_registers_indicator_a{#1}{\WORD{#1}}}
+\setvalue{\??registerindicator b}#1{\strc_registers_indicator_b{#1}{#1}}
+\setvalue{\??registerindicator B}#1{\strc_registers_indicator_b{#1}{\WORD{#1}}}
 
 %D The following macros are the interface to the rendering. These are
 %D generated by \LUA. This might change.
 
+% \showinjector
+% \setinjector[register][2][\column]
+%
+% \starttext
+%     first  \index{first}
+%     second \index{second}
+%     third  \index{third}
+%     fourth \index{fourth}
+%     \placeregister[index]
+% \stoptext
+
+\doinstallinjector\v!register
+
 %D Beware, we get funny side effects when a dangling \index precedes an
 %D placeindex as then flushing takes place inside the index. Took me hours
 %D to notice that.
@@ -729,11 +748,13 @@
    \endgroup}
 
 \unexpanded\def\startregisterentry#1% todo: level
-  {\begingroup
+  {\typo_injectors_check_register
+   \begingroup
    \dostarttagged\t!registerentry\empty
    \global\setconstant\c_strc_registers_page_state\zerocount
    \hangindent\d_strc_registers_hangindent
-   \hangafter \c_strc_registers_hangafter}
+   \hangafter \c_strc_registers_hangafter
+   \typo_injectors_mark_register}
 
 \unexpanded\def\stopregisterentry
   {\endgraf
@@ -814,12 +835,8 @@
    \dostoptagged
    \dostoptagged}
 
-\let\strc_register_injector_process\relax
-\let\strc_register_injector_show   \relax
-
 \unexpanded\def\defaultregisterentry#1#2#3#4% #1:processor #2:internal #3:seeindex #4:word
   {\def\currentregisterpageindex{#2}%
-   \strc_register_injector_process
    \iflocation
      \def\currentregisterseeindex{#3}%
      \doifelse{\registerparameter\c!interaction}\v!text
@@ -834,7 +851,6 @@
   {\dostarttagged\t!registercontent\empty
    \ifx\currentregisterseeindex\empty \else
      \dontleavehmode
-     \strc_register_injector_show
      \dosetdirectpagereference{seeindex:\currentregisterseeindex}% maybe some day we will support an area
    \fi
    \applyprocessor{#1}{\registerparameter\c!textcommand{\limitedregisterentry{\registerparameter\c!deeptextcommand{#2}}}}%
@@ -919,7 +935,7 @@
    \def\registeronepage  {\registerpagebuttonsymbol\gobblefourarguments}%
    \def\registerpagerange{\registerpagebuttonsymbol\gobblesevenarguments}}
 
-\def\setregisterpagerendering
+\unexpanded\def\setregisterpagerendering
   {\doifelse{\registerparameter\c!pagenumber}\v!no
      {\let \currentregisterpagesymbol\v!none}
      {\edef\currentregisterpagesymbol{\registerparameter\c!symbol}}%