[cpp] Replace \term with \defn

and adjust indexing.

Author: jensmaurer

source/preprocessor.tex

@@ -1,10 +1,10 @@
 %!TEX root = std.tex
 \rSec0[cpp]{Preprocessing directives}%
-\indextext{preprocessing directives|(}
+\indextext{preprocessing directive|(}
 
-\indextext{compiler control line|see{preprocessing directives}}%
-\indextext{control line|see{preprocessing directives}}%
-\indextext{directive, preprocessing|see{preprocessing directives}}
+\indextext{compiler control line|see{preprocessing directive}}%
+\indextext{control line|see{preprocessing directive}}%
+\indextext{directive, preprocessing|see{preprocessing directive}}
 
 \gramSec[gram.cpp]{Preprocessing directives}
 
@@ -163,7 +163,7 @@
 include other source files,
 and replace macros.
 These capabilities are called
-\term{preprocessing},
+\defn{preprocessing},
 because conceptually they occur
 before translation of the resulting translation unit.
 
@@ -379,11 +379,11 @@
 Their conditions are equivalent to
 \tcode{\#if}
 \tcode{defined}
-\term{identifier}
+\grammarterm{identifier}
 and
 \tcode{\#if}
 \tcode{!defined}
-\term{identifier}
+\grammarterm{identifier}
 respectively.
 
 \pnum
@@ -440,8 +440,8 @@
 \end{example}
 
 \rSec1[cpp.include]{Source file inclusion}
-\indextext{preprocessing directives!header inclusion}
-\indextext{preprocessing directives!source-file inclusion}
+\indextext{preprocessing directive!header inclusion}
+\indextext{preprocessing directive!source-file inclusion}
 \indextext{inclusion!source file|see{preprocessing directives, source-file inclusion}}%
 \indextext{\idxcode{\#include}}%
 
@@ -583,7 +583,7 @@
 \rSec1[cpp.replace]{Macro replacement}%
 \indextext{macro!replacement|(}%
 \indextext{replacement!macro|see{macro, replacement}}%
-\indextext{preprocessing directives!macro replacement|see{macro, replacement}}
+\indextext{preprocessing directive!macro replacement|see{macro, replacement}}
 
 \pnum
 \indextext{macro!replacement list}%
@@ -644,9 +644,8 @@
 The identifier immediately following the
 \tcode{define}
 is called the
-\indextext{macro!name}%
 \indextext{name!macro|see{macro, name}}%
-\term{macro name}.
+\defnx{macro name}{macro!name}.
 There is one name space for macro names.
 Any white-space characters preceding or following the
 replacement list of preprocessing tokens are not considered
@@ -735,7 +734,7 @@
 If there is a \tcode{...} immediately preceding the \tcode{)} in the
 function-like macro
 definition, then the trailing arguments (if any), including any separating comma preprocessing
-tokens, are merged to form a single item: the \term{variable arguments}. The number of
+tokens, are merged to form a single item: the \defn{variable arguments}. The number of
 arguments so combined is such that, following merger, the number of arguments is
 either equal to or
 one more than the number of parameters in the macro definition (excluding the
@@ -1177,7 +1176,7 @@
 \indextext{macro!replacement|)}
 
 \rSec1[cpp.line]{Line control}%
-\indextext{preprocessing directives!line control}%
+\indextext{preprocessing directive!line control}%
 \indextext{\idxcode{\#line}|see{preprocessing directives, line control}}
 
 \pnum
@@ -1188,7 +1187,7 @@
 
 \pnum
 The
-\term{line number}
+\defn{line number}
 of the current source line is one greater than
 the number of new-line characters read or introduced
 in translation phase 1\iref{lex.phases}
@@ -1239,7 +1238,7 @@
 otherwise, the result is processed as appropriate.
 
 \rSec1[cpp.error]{Error directive}%
-\indextext{preprocessing directives!error}%
+\indextext{preprocessing directive!error}%
 \indextext{\idxcode{\#error}|see{preprocessing directives, error}}
 
 \pnum
@@ -1254,7 +1253,7 @@
 and renders the program ill-formed.
 
 \rSec1[cpp.pragma]{Pragma directive}%
-\indextext{preprocessing directives!pragma}%
+\indextext{preprocessing directive!pragma}%
 \indextext{\idxcode{\#pragma}|see{preprocessing directives, pragma}}
 
 \pnum
@@ -1271,7 +1270,7 @@
 Any pragma that is not recognized by the implementation is ignored.
 
 \rSec1[cpp.null]{Null directive}%
-\indextext{preprocessing directives!null}
+\indextext{preprocessing directive!null}
 
 \pnum
 A preprocessing directive of the form
@@ -1430,7 +1429,7 @@
 \terminal{_Pragma} \terminal{(} string-literal \terminal{)}
 \end{ncbnf}
 
-is processed as follows: The string literal is \term{destringized}
+is processed as follows: The string literal is \defnx{destringized}{destringization}
 by deleting the \tcode{L} prefix, if present, deleting the leading and trailing
 double-quotes, replacing each escape sequence \tcode{\textbackslash"} by a double-quote, and
 replacing each escape sequence \tcode{\textbackslash\textbackslash} by a single
@@ -1457,4 +1456,4 @@
 LISTING( ..\listing.dir )
 \end{codeblock}
 \end{example}%
-\indextext{preprocessing directives|)}
+\indextext{preprocessing directive|)}