Fix some more inappropriate \grammarterm uses.

Author: jensmaurer

source/basic.tex

@@ -4365,13 +4365,12 @@
 \pnum
 \indextext{alignment!extended}%
 \indextext{alignment!new-extended}%
-\indextext{over-aligned type}%
-\indextext{type!over-aligned}%
+\indextext{over-aligned type|see{type, over-aligned}}%
 An \defn{extended alignment} is represented by an alignment
 greater than \tcode{alignof(std::max_align_t)}. It is \impldef{support for extended alignments}
 whether any extended alignments are supported and the contexts in which they are
 supported~(\ref{dcl.align}). A type having an extended alignment
-requirement is an \grammarterm{over-aligned type}. \begin{note}
+requirement is an \defnx{over-aligned type}{type!over-aligned}. \begin{note}
 Every over-aligned type is or contains a class type
 to which extended alignment applies (possibly through a non-static data member).
 \end{note}

source/derived.tex

@@ -228,9 +228,9 @@
 \pnum
 \indextext{base class!virtual}%
 A base class specifier that does not contain the keyword
-\tcode{virtual}, specifies a \grammarterm{non-virtual} base class. A base
-class specifier that contains the keyword \tcode{virtual}, specifies a
-\term{virtual} base class. For each distinct occurrence of a
+\tcode{virtual} specifies a \defnx{non-virtual base class}{base class!non-virtual}. A base
+class specifier that contains the keyword \tcode{virtual} specifies a
+\defnx{virtual base class}{base class!virtual}. For each distinct occurrence of a
 non-virtual base class in the class lattice of the most derived class,
 the most derived object~(\ref{intro.object}) shall contain a
 corresponding distinct base class subobject of that type. For each

source/overloading.tex

@@ -10,7 +10,7 @@
 \indextext{function, overloaded|see{overloading}}%
 When two or more different declarations are specified for a single name
 in the same scope, that name is said to be
-\grammarterm{overloaded}.
+\defnx{overloaded}{overloading}.
 By extension, two declarations in the same scope that declare the same name
 but with different types are called
 \term{overloaded declarations}.

source/special.tex

@@ -213,7 +213,7 @@
 
 \pnum
 A default constructor is
-trivial
+\defnx{trivial}{constructor!default!trivial}
 if it is not user-provided and if:
 
 \begin{itemize}
@@ -233,7 +233,7 @@
 \end{itemize}
 
 Otherwise, the default constructor is
-\grammarterm{non-trivial}.
+\defnx{non-trivial}{constructor!default!non-trivial}.
 
 \pnum
 \indextext{constructor!implicitly defined}%
@@ -1006,7 +1006,6 @@
 \pnum
 \indextext{generated destructor|see{destructor, default}}%
 \indextext{destructor!default}%
-\indextext{destructor!non-trivial}%
 If a class has no user-declared
 destructor, a destructor is implicitly
 declared as defaulted~(\ref{dcl.fct.def}).
@@ -1045,7 +1044,7 @@
 \end{itemize}
 
 Otherwise, the destructor is
-\grammarterm{non-trivial}.
+\defnx{non-trivial}{destructor!non-trivial}.
 
 \pnum
 \indextext{destructor!implicitly defined}%
@@ -2672,8 +2671,9 @@
 the constructor selected to copy/move that member is trivial;
 \end{itemize}
 
+\indextext{constructor!move!non-trivial}%
 otherwise the copy/move constructor is
-\grammarterm{non-trivial}.
+\defnx{non-trivial}{constructor!copy!nontrivial}.
 
 \pnum
 \indextext{constructor!copy!implicitly defined}%
@@ -2989,8 +2989,9 @@
 the assignment operator selected to copy/move that member is trivial;
 \end{itemize}
 
+\indextext{assignment operator!move!non-trivial}%
 otherwise the copy/move assignment operator is
-\grammarterm{non-trivial}.
+\defnx{non-trivial}{assignment operator!copy!non-trivial}.
 
 \pnum
 \indextext{assignment operator!copy!implicitly defined}%

source/templates.tex

@@ -217,9 +217,9 @@
 and template
 \grammarterm{template-argument}{s}
 are treated as types for descriptive purposes, the terms
-\grammarterm{non-type parameter}
+\term{non-type parameter}
 and
-\grammarterm{non-type argument}
+\term{non-type argument}
 are used to refer to non-type, non-template parameters and arguments.}
 \grammarterm{parameter-declaration}.
 A \grammarterm{template-parameter} of the form