Released v1.99.1.

[ucwmac.git] / ucw-ref.tex

diff --git a/ucw-ref.tex b/ucw-ref.tex
index 66b63724a135b67fddda08c89bfcb74fca2d4ed9..37f3721eb286062d4feaab92da60069862c982de 100644 (file)
--- a/ucw-ref.tex
+++ b/ucw-ref.tex
@@ -2,9 +2,8 @@
 % Written by Martin Mares <mj@ucw.cz> in 2018 and placed into public domain
 % -------------------------------------------------------------------------
 
-% Should clickable links be produced?
-\newif\ifclickable
-\clickabletrue
+\ucwdefmodule{ref}
+\ucwmodule{link}
 
 % We maintain a collection of objects. Each object has:
 %    - type (namespace -- e.g., chapter)
@@ -23,7 +22,7 @@
 \def\delayedwriteid#1#2{\write\ids{\string\iddef{#1}{#2}{\refcurrentfile}}}
 
 % Used in auxiliary files
-\def\iddef#1#2#3{\ifcsname id:#1\endcsname\immediate\write16{*** Warning: Identifier #1 re-defined ***}\else
+\def\iddef#1#2#3{\ifcsname id:#1\endcsname\ucwwarn{Identifier #1 re-defined}\else
 \expandafter\def\csname id:#1\endcsname{#2}%
 \expandafter\def\csname ff:#1\endcsname{#3}%
 \fi}
@@ -47,9 +46,7 @@
        \else
                \edef\currentid{#1\optarg}%
                \writeid{\currentid}{#2}%
-               \ifclickable
-                       \pdfdest name {\currentid} xyz\relax
-               \fi
+               \destpos{\currentid}%
        \fi
 }
 
@@ -60,41 +57,13 @@
        {\ifx\bo\undefined\bf\else\bo\fi ??}%
        \immediate\write16{*** Warning: Reference #1 undefined ***}%
 \else
-       \ifclickable
-               \pdfstartlink\commonlinkargs goto name {#1#2}\relax
-       \fi
-       #3{\csname id:#1#2\endcsname}%
-       \ifclickable
-               \pdfendlink\relax
-       \fi
+       \link{#1#2}{#3{\csname id:#1#2\endcsname}}%
 \fi
 }
 
-% Common style of all clickable links
-\pdflinkmargin=1pt
-\def\commonlinkargs{height \the\dimexpr\ht\strutbox-0.5pt\relax depth \the\dimexpr\dp\strutbox-0.5pt\relax attr {/C [0 0 0.5] /Border [0 0 2]}}
-
 % Typeset a link to identifier #2 of type #1
 \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}\ifclickable\pdfdest name {page#1} fit\relax\fi}
+\def\pageid#1{\delayedwriteid{page#1}{\the\count0}\destpage{page#1}}
 \def\pageref{\ref{page}}
-
-% Typeset a reference to the given page number (used in tables of contents and indices,
-% where we know the page number from other sources).
-\def\pagelink#1{\ifclickable\pdfstartlink\commonlinkargs goto page #1 {/Fit}\relax #1\pdfendlink\else #1\fi}
-
-% Typeset a clickable URL
-% Currently, all weird characters must be properly escaped.
-\def\url#1{%
-       \leavevmode
-       \ifclickable
-               \pdfstartlink\commonlinkargs user {/Subtype/Link /A << /Type/Action /S/URI /URI(#1) >>}\relax
-       \fi
-       \xurl #1^^X%
-       \ifclickable
-               \pdfendlink\relax
-       \fi
-}
-\def\xurl#1:#2#3^^X{{\I #1:#2\ifx#2/\kern-0.1em\fi#3}}