diff options
author | Hans Hagen <pragma@wxs.nl> | 2010-10-10 14:25:00 +0200 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2010-10-10 14:25:00 +0200 |
commit | 1b2a17ebfd56124803e8d0168c2755cb073ff425 (patch) | |
tree | 5cb2721788834bf63282ed75762fcae17e5719ea /tex/context/base/strc-reg.mkiv | |
parent | e34ee22d154fbde65af2d2c6283e0049b41dee8b (diff) | |
download | context-1b2a17ebfd56124803e8d0168c2755cb073ff425.tar.gz |
beta 2010.10.10 14:25
Diffstat (limited to 'tex/context/base/strc-reg.mkiv')
-rw-r--r-- | tex/context/base/strc-reg.mkiv | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv index e1719bbc9..88c9dcca5 100644 --- a/tex/context/base/strc-reg.mkiv +++ b/tex/context/base/strc-reg.mkiv @@ -730,25 +730,43 @@ \dostoptagged \dostoptagged} -\def\registeroneword#1#2#3% content +\def\registeroneword#1#2#3% #1:internal #2:seeindex #3:word {\registerpageseparator + \def\currentregisterpageindex{#1}% \dostarttagged\t!registersee\empty - \registerseeword{#3}% + \iflocation + \def\currentregisterseeindex{#2}% + \else + \let\currentregisterseeindex\empty + \fi + \ifx\currentregisterseeindex\empty + \registerseeword{#3}% + \else +[>\currentregisterseeindex]% + \registerseeword{\goto{#3}[seeindex:\currentregisterseeindex]}% + \fi \dostoptagged} \def\doapplyregisterentrycommand#1% {\dostarttagged\t!registerentry\empty + \ifx\currentregisterseeindex\empty \else + \dontleavehmode +[<\currentregisterseeindex]% + \pagereference[seeindex:\currentregisterseeindex]% maybe some day we will support an area + \fi \registerparameter\c!textcommand{\limitedregisterentry{\registerparameter\c!deeptextcommand{#1}}}% \dostoptagged} -\def\defaultregisterentry#1#2% #1 is pageref +\def\defaultregisterentry#1#2#3% #1:internal #2:seeindex #3:word {\def\currentregisterpageindex{#1}% \iflocation + \def\currentregisterseeindex{#2}% \doifelse{\registerparameter\c!interaction}\v!text - {\directgoto{\setlocationcolor\??ia\doapplyregisterentrycommand{#2}}[internal(#1)]} - {\doapplyregisterentrycommand{#2}}% + {\directgoto{\setlocationcolor\??ia\doapplyregisterentrycommand{#3}}[internal(#1)]} + {\doapplyregisterentrycommand{#3}}% \else - \doapplyregisterentrycommand{#2}% + \let\currentregisterseeindex\empty + \doapplyregisterentrycommand{#3}% \fi} \def\defaultregisterseeword#1% |