[macros,class] Define \defnadj and use it experimentally

Author: jensmaurer

source/classes.tex

@@ -127,8 +127,7 @@
 \end{note}
 
 \pnum
-\indextext{trivially copyable class|see{class, trivially copyable}}%
-A \defnx{trivially copyable class}{class!trivially copyable} is a class:
+A \defnadj{trivially copyable}{class} is a class:
 
 \begin{itemize}
 \item where each copy constructor, move constructor, copy assignment operator,
@@ -140,17 +139,15 @@
 \end{itemize}
 
 \pnum
-\indextext{trivial class|see{class, trivial}}%
-A \defnx{trivial class}{class!trivial} is a class that is trivially copyable and
+A \defnadj{trivial}{class} is a class that is trivially copyable and
 has one or more default constructors\iref{class.ctor},
 all of which are either trivial or deleted and
 at least one of which is not deleted.
 \begin{note} In particular, a trivially copyable or trivial class does not have
 virtual functions or virtual base classes.\end{note}
 
 \pnum
-\indextext{standard-layout|see{class, standard-layout}}%
-A class \tcode{S} is a \defnx{standard-layout class}{class!standard-layout} if it:
+A class \tcode{S} is a \defnadj{standard-layout}{class} if it:
 \begin{itemize}
 \item has no non-static data members of type non-standard-layout class
 (or array of such types) or reference,

source/macros.tex

@@ -181,8 +181,6 @@
 
 % Code and definitions embedded in text.
 \newcommand{\tcode}[1]{\CodeStylex{#1}}
-\newcommand{\defnx}[2]{\indexdefn{#2}\textit{#1}}
-\newcommand{\defn}[1]{\defnx{#1}{#1}}
 \newcommand{\term}[1]{\textit{#1}}
 \newcommand{\gterm}[1]{\GrammarStylex{#1}}
 \newcommand{\fakegrammarterm}[1]{\gterm{#1}}
@@ -193,6 +191,14 @@
 \newcommand{\defnxname}[1]{\indextext{\idxxname{#1}}\xname{#1}}
 \newcommand{\defnlibxname}[1]{\indexlibrary{\idxxname{#1}}\xname{#1}}
 
+% Non-compound defined term.
+\newcommand{\defn}[1]{\defnx{#1}{#1}}
+% Defined term with different index entry.
+\newcommand{\defnx}[2]{\indexdefn{#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}}
+
 %%--------------------------------------------------
 %% allow line break if needed for justification
 \newcommand{\brk}{\discretionary{}{}{}}