[macros, back] Put all mentions of \grammarterm into the grammar index; adjust introductory text for index of grammar productions. (#1858)

Author: tkoeppe

source/back.tex

@@ -55,9 +55,9 @@ \chapter{Bibliography}
 
 \clearpage
 \renewcommand{\indexname}{Index of grammar productions}
-\renewcommand{\preindexhook}{The first page number for each entry is the page in the
-general text where the grammar production is defined. The second page number is the
-corresponding page in the Grammar summary\iref{gram}.\\}
+\renewcommand{\preindexhook}{The first bold page number for each entry is the page in the
+general text where the grammar production is defined. The second bold page number is the
+corresponding page in the Grammar summary\iref{gram}. Other page numbers refer to pages where the grammar production is mentioned in the general text.\\}
 \renewcommand{\leftmark}{\indexname}
 {
 \raggedright

source/classes.tex

@@ -22,9 +22,9 @@
     simple-template-id
 \end{bnf}
 
-\grammarterm{Class-specifier}{s} and
-\grammarterm{elaborated-type-specifier}{s}\iref{dcl.type.elab} are used to
-make \grammarterm{class-name}{s}. An object of a class consists of a
+A \grammarterm{class-specifier} or
+an \grammarterm{elaborated-type-specifier}\iref{dcl.type.elab} is used to
+make a \grammarterm{class-name}. An object of a class consists of a
 (possibly empty) sequence of members and base class objects.
 
 \begin{bnf}

source/declarators.tex

@@ -102,9 +102,10 @@
 shall not be present when the declarator does not declare a
 function\iref{dcl.fct}.
 %
+\indextext{trailing requires-clause@trailing \textit{requires-clause}|see{\textit{requires-clause}, trailing}}%
 When present after a declarator, the \grammarterm{requires-clause}
-is called the \defnx{trailing \grammarterm{requires-clause}{}}{%
-trailing requires-clause@trailing \grammarterm{requires-clause}}.
+is called the \defnx{trailing \grammarterm{requires-clause}}{%
+\idxgram{requires-clause}!trailing}.
 The trailing \grammarterm{requires-clause} introduces the
 \grammarterm{constraint-expression} that results from interpreting
 its \grammarterm{constraint-logical-or-expression} as a

source/expressions.tex

@@ -4004,11 +4004,10 @@
 padding necessary to align the allocated objects within the allocated memory.
 
 \pnum
-\indextext{placement syntax!\idxcode{new}}%
-\indextext{new-expression@\grammarterm{new-expression}!placement}%
+\indextext{placement new-expression@placement \gterm{new-expression}|see{\gterm{new-expression}, placement}}%
 The \grammarterm{new-placement} syntax is used to supply additional
 arguments to an allocation function; such an expression is called
-a \defnx{placement \grammarterm{new-expression}}{placement new-expression@placement \grammarterm{new-expression}}{.}
+a \defnx{placement \grammarterm{new-expression}}{\idxgram{new-expression}!placement}.
 
 \pnum
 Overload resolution is

source/macros.tex

@@ -141,19 +141,21 @@
 \let\BreakableUnderscore\textunderscore%
 \edef\x{#1}%
 \let\tcode\otcode%
-\let\grammarterm\ogrammarterm%
+\let\grammarterm\gterm%
 \let\mname\omname%
 \let\Cpp\oCpp%
 \let\BreakableUnderscore\oBreakableUnderscore%
 \index[impldefindex]{\x@#1}%
+\let\grammarterm\ogrammarterm%
 \let\textup\otextup%
 }
 
-% These three commands use the "cooked" \indeximpldef command to emit index
+\newcommand{\indexdefn}[1]{\indextext{#1}}
+\newcommand{\idxbfpage}[1]{\textbf{\hyperpage{#1}}}
+\newcommand{\indexgrammar}[1]{\indextext{#1}\indexgram{#1|idxbfpage}}
+% This command uses the "cooked" \indeximpldef command to emit index
 % entries; thus they only work for simple index entries that do not contain
 % special indexing instructions.
-\newcommand{\indexdefn}[1]{\indextext{#1}}
-\newcommand{\indexgrammar}[1]{\indextext{#1}\indexgram{#1}}
 \newcommand{\impldef}[1]{\indeximpldef{#1}implementation-defined}
 % \impldefplain passes the argument directly to the index, allowing you to
 % use special indexing instructions (!, @, |).
@@ -162,7 +164,7 @@
 % appearance
 \newcommand{\idxcode}[1]{#1@\tcode{#1}}
 \newcommand{\idxhdr}[1]{#1@\tcode{<#1>}}
-\newcommand{\idxgram}[1]{#1@\textit{#1}}
+\newcommand{\idxgram}[1]{#1@\gterm{#1}}
 
 % class member library index
 \newcommand{\indexlibrarymember}[2]{\indexlibrary{\idxcode{#1}!\idxcode{#2}}\indexlibrary{\idxcode{#2}!\idxcode{#1}}}
@@ -172,14 +174,19 @@
 \newcommand{\CodeStyle}{\ttfamily}
 \newcommand{\CodeStylex}[1]{\texttt{#1}}
 
+% General grammar style
+\newcommand{\GrammarStyle}{\itfamily}
+\newcommand{\GrammarStylex}[1]{\textit{#1}}
+
 % Code and definitions embedded in text.
 \newcommand{\tcode}[1]{\CodeStylex{#1}}
 \newcommand{\techterm}[1]{\textit{#1}}
 \newcommand{\defnx}[2]{\indexdefn{#2}\textit{#1}}
 \newcommand{\defn}[1]{\defnx{#1}{#1}}
 \newcommand{\term}[1]{\textit{#1}}
-\newcommand{\grammarterm}[1]{\textit{#1}}
-\newcommand{\grammartermnc}[1]{\textit{#1}\nocorr}
+\newcommand{\gterm}[1]{\GrammarStylex{#1}}
+\newcommand{\grammarterm}[1]{\indexgram{\idxgram{#1}}\gterm{#1}}
+\newcommand{\grammartermnc}[1]{\indexgram{\idxgram{#1}}\gterm{#1}\nocorr}
 \newcommand{\placeholder}[1]{\textit{#1}}
 \newcommand{\placeholdernc}[1]{\textit{#1\nocorr}}
 
@@ -194,9 +201,7 @@
 \newcommand{\CppXI}{\Cpp{} 2011}
 \newcommand{\CppXIV}{\Cpp{} 2014}
 \newcommand{\CppXVII}{\Cpp{} 2017}
-\newcommand{\opt}[1]{\ifthenelse{\equal{#1}{}}
-    {\PackageError{main}{argument must not be empty}{}}
-    {#1\ensuremath{_\mathit{opt}}}}
+\newcommand{\opt}[1]{#1\ensuremath{_\mathit{opt}}}
 \newcommand{\dcr}{-{-}}
 \newcommand{\bigoh}[1]{\ensuremath{\mathscr{O}(#1)}}
 
@@ -356,7 +361,7 @@
  \renewcommand{\tcode}[1]{\textup{\CodeStylex{##1}}}
  \renewcommand{\techterm}[1]{\textit{\CodeStylex{##1}}}
  \renewcommand{\term}[1]{\textit{##1}}
- \renewcommand{\grammarterm}[1]{\textit{##1}}
+ \renewcommand{\grammarterm}[1]{\gterm{##1}}
 }
 
 \lstnewenvironment{codeblock}{\CodeBlockSetup}{}