X-Git-Url: https://git.distorted.org.uk/~mdw/mdwtools/blobdiff_plain/39bf771aebd339019d1f11c0c0f60d30aab4ddc4..8bc5bdd2f1f9636e1d68bde249d07242c6b29732:/mdwref.dtx?ds=sidebyside

diff --git a/mdwref.dtx b/mdwref.dtx
index f1da45c..e6e20c8 100644
--- a/mdwref.dtx
+++ b/mdwref.dtx
@@ -1,17 +1,7 @@
-% \begin{meta-comment}
-%
-% $Id: mdwref.dtx,v 1.3 2003/11/10 14:43:48 mdw Exp $
-%
-% Slightly fancy cross-referencing stuff
-%
-% (c) 2007 Mark Wooding
-%
-% \end{meta-comment}
-%
 % \begin{meta-comment} <general public licence>
 %%
 %% mdwref package -- slightly fancy cross-referencing stuff
-%% Copyright (c) 2007 Mark Wooding
+%% Copyright (c) 2007, 2019 Mark Wooding
 %%
 %% This program is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU General Public License as published by
@@ -103,6 +93,18 @@
 %\newcommand{\Xref}[1]{\xref[\toupper]{#1}}
 % \end{listing}
 %
+% \DescribeMacro\formatxref
+% The reference itself is typeset by calling
+% \syntax{"\\formatxref{"<mangle>"}{"<string>"}{"<label>"}"}, which can do as
+% it pleases: the \<mangle> token is from the |\xref| invocation; the
+% \<string> is category of thing being referred to (as established by
+% |\defxref| below); and \<label> is the label, again from |\xref| .  The
+% default behaviour is to print
+% \syntax{<mangle>"{"<string>"}~\\ref{"<label>"}"}, but this can be
+% overridden.
+% (Not quite true: in fact, the default does something better if
+% \package{hyperref} is detected, but the idea is basically the same.)
+%
 % All that remains is to define the strings to be typeset for various kinds
 % of labels.
 % \DescribeMacro\defxref
@@ -158,6 +160,16 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\formatxref}
+% Output a cross-reference in the right way.
+%    \begin{macrocode}
+\def\formatxref#1#2#3{%
+  \ifx\hyperref\@@undefined #1{#2}~\ref{#3}%
+  \else \hyperref[#3]{#1{#2}~\ref*{#3}}\fi%
+}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\xref}
 % We're meant to typeset a reference.  The first job is to see whether
 % there's an optional argument.  If so, grab it; otherwise |\relax| will do.
@@ -183,9 +195,9 @@
     \ifx\@tempa\relax%
       \PackageError{xref}{Unknown ref kind `#2'}%
     \else%
-      \toks@{#1}\toks\tw@\expandafter{\@tempa}%
-      \edef\next@{\the\toks@{\the\toks\tw@}}%
-      \next@~\ref{#2:#3}%
+      \toks@\expandafter{\@tempa}%
+      \edef\next@##1{##1{\the\toks@}}%
+      \next@{\formatxref{#1}}{#2:#3}%
     \fi%
   \fi%
 }