[macros] Add \termref

Author: jensmaurer

source/macros.tex

@@ -239,7 +239,15 @@
 \newcommand{\defnlibxname}[1]{\indexlibrary{\idxxname{#1}}\xname{#1}}
 
 % term.* labels
-\newcommand{\termlabel}[1]{\label{term.#1}}
+\makeatletter
+% define a label such that \titleref yields the name of the term
+\newcommand{\termlabel}[2]{\@bsphack\begingroup%
+  \protected@edef\@currentlabel{\protect\M@TitleReference
+      {\@currentlabel}{#1}}%
+  \MNR@label{term.#2}%
+  \endgroup \@esphack}%
+\makeatother
+
 % convert space-separated phrase to dot-separated label name
 \newcommand{\newtermlabelx}[1]{%
 {% remove all formatting instructions
@@ -251,8 +259,9 @@
   \let\oldconcept\oldconceptname%
   \renewcommand{\ntbs}{ntbs}%
   \renewcommand{\ntmbs}{ntmbs}%
+  \edef\title{#1}%
   \StrSubstitute{#1}{ }{.}[\temp]%
-  \termlabel{\temp}%
+  \termlabel{\title}{\temp}%
 }}
 
 % Non-compound defined term.
@@ -377,6 +386,14 @@
 %% Inline non-parenthesized figure reference (override memoir's \fref)
 \renewcommand{\fref}[1]{\hyperref[fig:#1]{\figurerefname \nolinebreak[3] \ref*{fig:#1}}}
 
+%% Inline reference to a defined term
+\newcommand{\termrefx}[2]{\hyperref[term.#2]{#1}\iref{term.#2}}
+\newcommand{\termref}[1]{\begingroup%
+\StrSubstitute{#1}{ }{.}[\temp]%
+\titleref{term.\temp}\iref{term.\temp}%
+\endgroup%
+}
+
 %% NTBS, etc.
 \verbtocs{\StrTextsmaller}|\textsmaller[1]{|
 \verbtocs{\StrTextsc}|\textsc{|