[index] Fix some bad collation and confusing index entries.

Fixes cplusplus#677, fixes cplusplus#678.

source/macros.tex

@@ -227,7 +227,7 @@
 %% Double underscore
 \newcommand{\ungap}{\kern.5pt}
 \newcommand{\unun}{\_\ungap\_}
-\newcommand{\xname}[1]{\unun\ungap#1}
+\newcommand{\xname}[1]{\tcode{\unun\ungap#1}}
 \newcommand{\mname}[1]{\tcode{\unun\ungap#1\ungap\unun}}
 
 %% Ranges

source/preprocessor.tex

@@ -180,7 +180,7 @@
 \end{codeblock}
 
 the sequence of preprocessing tokens on the second line is \textit{not}
-a preprocessing directive, because it does not begin with a \# at the start of
+a preprocessing directive, because it does not begin with a \tcode{\#} at the start of
 translation phase 4, even though it will do so after the macro \tcode{EMPTY}
 has been replaced.\exitexample
 
@@ -206,13 +206,13 @@
     h-pp-tokens h-preprocessing-token
 \end{ncbnf}
 
-\indextext{\idxcode{__has_include}}%
+\indextext{__has_include@\xname{has_include}}%
 \begin{ncbnf}
 \nontermdef{has-include-expression}\br
-    \terminal{__has_include ( <} h-char-sequence \terminal{> )}\br
-    \terminal{__has_include ( "} q-char-sequence \terminal{" )}\br
-    \terminal{__has_include (}   string-literal  \terminal{)}\br
-    \terminal{__has_include ( <} h-pp-tokens     \terminal{> )}
+    \terminal{\xname{has_include} ( <} h-char-sequence \terminal{> )}\br
+    \terminal{\xname{has_include} ( "} q-char-sequence \terminal{" )}\br
+    \terminal{\xname{has_include} (}   string-literal  \terminal{)}\br
+    \terminal{\xname{has_include} ( <} h-pp-tokens     \terminal{> )}
 \end{ncbnf}
 
 \pnum
@@ -260,8 +260,8 @@
 \pnum
 The \tcode{\#ifdef} and \tcode{\#ifndef} directives, and
 the \tcode{defined} conditional inclusion operator,
-shall treat \tcode{__has_include} as if it were the name of a defined macro.
-The identifier \tcode{__has_include} shall not appear
+shall treat \xname{has_include} as if it were the name of a defined macro.
+The identifier \xname{has_include} shall not appear
 in any context not mentioned in this section.
 
 \pnum
@@ -442,7 +442,6 @@
 that can be processed by the implementation.
 
 \pnum
-\indextext{\idxcode{<...>}|see{preprocessing directive, header}}%
 A preprocessing directive of the form
 
 \begin{ncsimplebnf}
@@ -465,7 +464,6 @@
 is \impldef{search locations for \tcode{<>} header}.
 
 \pnum
-\indextext{\idxcode{\"{}...\"{}}|see{preprocessing directives, source-file inclusion}}%
 A preprocessing directive of the form
 
 \begin{ncsimplebnf}
@@ -625,7 +623,7 @@
 preprocessing token that terminates the invocation.
 
 \pnum
-\indextext{\xname{VA_ARGS}@\mname{VA_ARGS}}%
+\indextext{__VA_ARGS__@\mname{VA_ARGS}}%
 The identifier \mname{VA_ARGS} shall occur only in the replacement-list
 of a function-like macro that uses the ellipsis notation in the parameters.
 
@@ -1238,9 +1236,9 @@
 
 \begin{description}
 
-\indextext{\idxcode{\unun cplusplus}}%
-\item \tcode{\xname{cplusplus}}\\
-The name \tcode{\,\xname{cplusplus}} is defined
+\indextext{__cplusplus@\xname{cplusplus}}%
+\item \xname{cplusplus}\\
+The name \xname{cplusplus} is defined
 to the value
 \tcode{\cppver}
 when
@@ -1250,7 +1248,7 @@
 Non-conforming compilers should use a value with at most
 five decimal digits.}
 
-\indextext{\xname{DATE}@\mname{DATE}}%
+\indextext{__DATE__@\mname{DATE}}%
 \item \mname{DATE}\\
 The date of translation of the source file:
 a character string literal of the form
@@ -1266,25 +1264,25 @@
 an \impldef{text of \mname{DATE} when date of translation is not available} valid date
 shall be supplied.
 
-\indextext{\xname{FILE}@\mname{FILE}}%
+\indextext{__FILE__@\mname{FILE}}%
 \item \mname{FILE}\\
 The presumed name of the current source file (a character string
 literal).%
 \footnote{The presumed source file name can be changed by the \tcode{\#line} directive.}
 
-\indextext{\xname{LINE}@\mname{LINE}}%
+\indextext{__LINE__@\mname{LINE}}%
 \item \mname{LINE}\\
 The presumed line number (within the current source file) of the current source line
 (an integer literal).%
 \footnote{The presumed line number can be changed by the \tcode{\#line} directive.}
 
-\indextext{\xname{STDC_HOSTED}@\mname{STDC_HOSTED}}%
-\indextext{\xname{STDC_HOSTED}@\mname{STDC_HOSTED}!implementation-defined}%
+\indextext{__STDC_HOSTED__@\mname{STDC_HOSTED}}%
+\indextext{__STDC_HOSTED__@\mname{STDC_HOSTED}!implementation-defined}%
 \item \mname{STDC_HOSTED}\\
 The integer literal \tcode{1} if the implementation is a hosted
 implementation or the integer literal \tcode{0} if it is not.
 
-\indextext{\xname{TIME}@\mname{TIME}}%
+\indextext{__TIME__@\mname{TIME}}%
 \item \mname{TIME}\\
 The time of translation of the source file:
 a character string literal of the form
@@ -1300,27 +1298,27 @@
 The following macro names are conditionally defined by the implementation:
 
 \begin{description}
-  \indextext{\xname{STDC}@\mname{STDC}}%
-  \indextext{\xname{STDC}@\mname{STDC}!implementation-defined}%
+\indextext{__STDC__@\mname{STDC}}%
+\indextext{__STDC__@\mname{STDC}!implementation-defined}%
 \item \mname{STDC}\\
 Whether \mname{STDC} is predefined and if so, what its value is,
 are \impldef{definition and meaning of \mname{STDC}}.
 
-\indextext{\xname{STDC_MB_MIGHT_NEQ_WC}@\mname{STDC_MB_MIGHT_NEQ_WC}}%
-\indextext{\xname{STDC_MB_MIGHT_NEQ_WC}@\mname{STDC_MB_MIGHT_NEQ_WC}!implementation-defined}%
+\indextext{__STDC_MB_MIGHT_NEQ_WC__@\mname{STDC_MB_MIGHT_NEQ_WC}}%
+\indextext{__STDC_MB_MIGHT_NEQ_WC__@\mname{STDC_MB_MIGHT_NEQ_WC}!implementation-defined}%
 \item \mname{STDC_MB_MIGHT_NEQ_WC}\\
 The integer literal \tcode{1}, intended to indicate that, in the encoding for
 \tcode{wchar_t}, a member of the basic character set need not have a code value equal to
 its value when used as the lone character in an ordinary character literal.
 
-\indextext{\xname{STDC_VERSION}@\mname{STDC_VERSION}}%
-\indextext{\xname{STDC_VERSION}@\mname{STDC_VERSION}!implementation-defined}%
+\indextext{__STDC_VERSION__@\mname{STDC_VERSION}}%
+\indextext{__STDC_VERSION__@\mname{STDC_VERSION}!implementation-defined}%
 \item \mname{STDC_VERSION}\\
 Whether \mname{STDC_VERSION} is predefined and if so, what its value is,
 are \impldef{definition and meaning of \mname{STDC_VERSION}}.
 
-\indextext{\xname{STDC_ISO_10646}@\mname{STDC_ISO_10646}}%
-\indextext{\xname{STDC_ISO_10646}@\mname{STDC_ISO_10646}!implementation-defined}%
+\indextext{__STDC_ISO_10646__@\mname{STDC_ISO_10646}}%
+\indextext{__STDC_ISO_10646__@\mname{STDC_ISO_10646}!implementation-defined}%
 \item \mname{STDC_ISO_10646}\\
 An integer literal of the form \tcode{yyyymmL} (for example,
 \tcode{199712L}).
@@ -1330,14 +1328,14 @@
 the characters that are defined by ISO/IEC 10646, along with
 all amendments and technical corrigenda as of the specified year and month.
 
-\indextext{\xname{STDCPP_STRICT_POINTER_SAFETY}@\mname{STDCPP_STRICT_POINTER_SAFETY}}%
-\indextext{\xname{STDCPP_STRICT_POINTER_SAFETY}@\mname{STDCPP_STRICT_POINTER_SAFETY}!implementation-defined}%
+\indextext{__STDCPP_STRICT_POINTER_SAFETY__@\mname{STDCPP_STRICT_POINTER_SAFETY}}%
+\indextext{__STDCPP_STRICT_POINTER_SAFETY__@\mname{STDCPP_STRICT_POINTER_SAFETY}!implementation-defined}%
 \item \mname{STDCPP_STRICT_POINTER_SAFETY}\\
 Defined, and has the value integer literal 1, if and only if the implementation
 has strict pointer safety~(\ref{basic.stc.dynamic.safety}).
 
-\indextext{\xname{STDCPP_THREADS}@\mname{STDCPP_THREADS}}%
-\indextext{\xname{STDCPP_THREADS}@\mname{STDCPP_THREADS}!implementation-defined}%
+\indextext{__STDCPP_THREADS__@\mname{STDCPP_THREADS}}%
+\indextext{__STDCPP_THREADS__@\mname{STDCPP_THREADS}!implementation-defined}%
 \item \mname{STDCPP_THREADS}\\
 Defined, and has the value integer literal 1, if and only if a program
 can have more than one thread of execution~(\ref{intro.multithread}).

source/special.tex

@@ -7,7 +7,7 @@
 \indextext{special~member~function|see{constructor, destructor, inline function,
 user-defined conversion, virtual function}}%
 \indextext{\idxcode{X(X\&)}|see{copy~constructor}}%
-\indextext{\~@\tcode{\tilde}|see{destructor}}%
+\indextext{~@\tcode{\tilde}|see{destructor}}%
 \indextext{assignment!copy|see{assignment operator, copy}}%
 \indextext{assignment!move|see{assignment operator, move}}%
 \indextext{implicitly-declared~default~constructor|see{constructor, default}}

source/support.tex

@@ -3335,7 +3335,7 @@
 \tcode{<csignal>} (signal handling),
 \tcode{<cstdalign> (alignment),}
 \tcode{<cstdarg>} (variable arguments),
-\tcode{<cstdbool>} (\tcode{\xname{bool_true_false_are_defined}}).
+\tcode{<cstdbool>} (\xname{bool_true_false_are_defined}).
 \tcode{<cstdlib>} (runtime environment \tcode{getenv(), system()}),
 and
 \tcode{<ctime>} (system clock \tcode{clock(), time()})