ucw-ref: Fixed bug in \pageid

[ucwmac.git] / ucw-ref.tex

diff --git a/ucw-ref.tex b/ucw-ref.tex
index 37f3721eb286062d4feaab92da60069862c982de..8cdbc609d6f865c80db06ad876f7cb80bf9fb954 100644 (file)
--- a/ucw-ref.tex
+++ b/ucw-ref.tex
@@ -44,7 +44,7 @@
        \ifx\optarg\relax
                \let\currentid\relax
        \else
-               \edef\currentid{#1\optarg}%
+               \edef\currentid{#1:\optarg}%
                \writeid{\currentid}{#2}%
                \destpos{\currentid}%
        \fi
@@ -53,11 +53,11 @@
 % A low-level interface for typesetting references: produces a clickable link
 % to the identifier #2 of type #1 with a label translated by macro #3 (use \relax
 % for no translation).
-\def\reflink#1#2#3{\expandafter\ifx\csname id:#1#2\endcsname\relax
+\def\reflink#1#2#3{\expandafter\ifx\csname id:#1:#2\endcsname\relax
        {\ifx\bo\undefined\bf\else\bo\fi ??}%
-       \immediate\write16{*** Warning: Reference #1 undefined ***}%
+       \immediate\write16{*** Warning: Reference #1:#2 undefined ***}%
 \else
-       \link{#1#2}{#3{\csname id:#1#2\endcsname}}%
+       \link{#1:#2}{#3{\csname id:#1:#2\endcsname}}%
 \fi
 }
 
@@ -65,5 +65,5 @@
 \def\ref#1#2{\reflink{#1}{#2}\relax}
 
 % Define an identifier of type page pointing to the current page
-\def\pageid#1{\delayedwriteid{page#1}{\the\count0}\destpage{page#1}}
+\def\pageid#1{\delayedwriteid{page:#1}{\the\count0}\destpage{page:#1}}
 \def\pageref{\ref{page}}