[macros] Introduce 'term.*' labels

Author: jensmaurer

source/macros.tex

@@ -237,16 +237,33 @@
 \newcommand{\defnxname}[1]{\indextext{\idxxname{#1}}\xname{#1}}
 \newcommand{\defnlibxname}[1]{\indexlibrary{\idxxname{#1}}\xname{#1}}
 
+% term.* labels
+\newcommand{\termlabel}[1]{\label{term.\temp}}
+% convert space-separated phrase to dot-separated label name
+\newcommand{\newtermlabelx}[1]{%
+{% remove all formatting instructions
+  \let\idxcode=\nocode%
+  \let\tcode=\nocode%
+  \let\idxgram=\nocode%
+  \let\fakegrammarterm=\nocode%
+  \let\Cpp=\idxCpp%
+  \let\oldconcept\oldconceptname%
+  \renewcommand{\ntbs}{ntbs}%
+  \renewcommand{\ntmbs}{ntmbs}%
+  \StrSubstitute{#1}{ }{.}[\temp]%
+  \termlabel{\temp}%
+}}
+
 % Non-compound defined term.
 \newcommand{\defn}[1]{\defnx{#1}{#1}}
 % Defined term with different index entry.
-\newcommand{\defnx}[2]{\indexdefn{#2}\textit{#1}}
+\newcommand{\defnx}[2]{\indexdefn{#2}\newtermlabelx{#2}\textit{#1}}
 % Compound defined term with 'see' for primary term.
 % Usage: \defnadj{trivial}{class}
-\newcommand{\defnadj}[2]{\indextext{#1 #2|see{#2, #1}}\indexdefn{#2!#1}\textit{#1 #2}}
+\newcommand{\defnadj}[2]{\defnadjx{#1}{#2}{#2}}
 % Compound defined term with a different form for the primary noun.
 % Usage: \defnadjx{scalar}{types}{type}
-\newcommand{\defnadjx}[3]{\indextext{#1 #3|see{#3, #1}}\indexdefn{#3!#1}\textit{#1 #2}}
+\newcommand{\defnadjx}[3]{\indextext{#1 #3|see{#3, #1}}\indexdefn{#3!#1}\newtermlabelx{#1 #3}\textit{#1 #2}}
 
 %%--------------------------------------------------
 %% allow line break if needed for justification

source/utilities.tex

@@ -10319,7 +10319,7 @@
 \pnum
 For the purposes of subclause \ref{smartptr},
 a pointer type \tcode{Y*} is said to be
-\defnx{compatible with}{compatible with!\idxcode{shared_ptr}}
+\defnx{compatible with}{compatible with!\idxcode{\detokenize{shared_ptr}}}
 a pointer type \tcode{T*} when either
 \tcode{Y*} is convertible to \tcode{T*} or
 \tcode{Y} is \tcode{U[N]} and \tcode{T} is \cv{}~\tcode{U[]}.