Wrap keywords with \keyword{...}

Author: ilazaric

source/declarations.tex

@@ -6815,16 +6815,16 @@
 \bnfindent \placeholder{promise-type} \exposid{promise} \placeholder{promise-constructor-arguments} \terminal{;}\br
 % FIXME: \bnfindent \exposid{promise}\terminal{.get_return_object()} \terminal{;}
 % ... except that it's not a discarded-value expression
-\bnfindent \terminal{try} \terminal{\{}\br
-\bnfindent\bnfindent \terminal{co_await} \terminal{\exposid{promise}.initial_suspend()} \terminal{;}\br
+\bnfindent \keyword{try} \terminal{\{}\br
+\bnfindent\bnfindent \keyword{co_await} \terminal{\exposid{promise}.initial_suspend()} \terminal{;}\br
 \bnfindent\bnfindent function-body\br
-\bnfindent \terminal{\} catch ( ... ) \{}\br
-\bnfindent\bnfindent \terminal{if (!\exposid{initial-await-resume-called})}\br
-\bnfindent\bnfindent\bnfindent \terminal{throw} \terminal{;}\br
+\bnfindent \terminal{\}} \keyword{catch} \terminal{( ... ) \{}\br
+\bnfindent\bnfindent \keyword{if} \terminal{(!\exposid{initial-await-resume-called})}\br
+\bnfindent\bnfindent\bnfindent \keyword{throw} \terminal{;}\br
 \bnfindent\bnfindent \terminal{\exposid{promise}.unhandled_exception()} \terminal{;}\br
 \bnfindent \terminal{\}}\br
 \exposid{final-suspend} \terminal{:}\br
-\bnfindent \terminal{co_await} \terminal{\exposid{promise}.final_suspend()} \terminal{;}\br
+\bnfindent \keyword{co_await} \terminal{\exposid{promise}.final_suspend()} \terminal{;}\br
 \terminal{\}}
 \end{ncsimplebnf}
 where

source/expressions.tex

@@ -322,7 +322,7 @@
 If a program invokes
 a defaulted copy/move constructor or copy/move assignment operator
 for a union of type \tcode{U} with a glvalue argument
-that does not denote an object of type \cv{}~\keyword{U} within its lifetime,
+that does not denote an object of type \cv{}~\tcode{U} within its lifetime,
 the behavior is undefined.
 \begin{note}
 In C, an entire object of structure type can be accessed, e.g., using assignment.
@@ -2352,7 +2352,7 @@
     identifier \opt{\terminal{...}}\br
     \terminal{\&} identifier \opt{\terminal{...}}\br
     \keyword{this}\br
-    \terminal{*} \terminal{this}
+    \terminal{*} \keyword{this}
 \end{bnf}
 
 \begin{bnf}
@@ -3204,8 +3204,8 @@
     typename-specifier \terminal{(} \opt{expression-list} \terminal{)}\br
     simple-type-specifier braced-init-list\br
     typename-specifier braced-init-list\br
-    postfix-expression \terminal{.} \opt{\terminal{template}} id-expression\br
-    postfix-expression \terminal{->} \opt{\terminal{template}} id-expression\br
+    postfix-expression \terminal{.} \opt{\keyword{template}} id-expression\br
+    postfix-expression \terminal{->} \opt{\keyword{template}} id-expression\br
     postfix-expression \terminal{++}\br
     postfix-expression \terminal{--}\br
     \keyword{dynamic_cast} \terminal{<} type-id \terminal{>} \terminal{(} expression \terminal{)}\br
@@ -4882,7 +4882,7 @@
 
 \begin{bnf}
 \nontermdef{await-expression}\br
-    \terminal{co_await} cast-expression
+    \keyword{co_await} cast-expression
 \end{bnf}
 
 \pnum
@@ -7199,8 +7199,8 @@
 
 \begin{bnf}
   \nontermdef{yield-expression}\br
-  \terminal{co_yield} assignment-expression\br
-  \terminal{co_yield} braced-init-list
+  \keyword{co_yield} assignment-expression\br
+  \keyword{co_yield} braced-init-list
 \end{bnf}
 
 \pnum

source/lex.tex

@@ -1679,7 +1679,7 @@
 \topline
 \lhdr{\grammarterm{floating-point-suffix}} & \rhdr{type} \\ \capsep
 none & \keyword{double} \\
-\tcode{f} or \tcode{F} & \keyword {float} \\
+\tcode{f} or \tcode{F} & \keyword{float} \\
 \tcode{l} or \tcode{L} & \keyword{long} \keyword{double} \\
 \tcode{f16} or \tcode{F16} & \tcode{std::float16_t} \\
 \tcode{f32} or \tcode{F32} & \tcode{std::float32_t} \\
@@ -2068,8 +2068,8 @@
 \indextext{literal!boolean}%
 \begin{bnf}
 \nontermdef{boolean-literal}\br
-    \terminal{false}\br
-    \terminal{true}
+    \keyword{false}\br
+    \keyword{true}
 \end{bnf}
 
 \pnum
@@ -2082,7 +2082,7 @@
 \indextext{literal!pointer}%
 \begin{bnf}
 \nontermdef{pointer-literal}\br
-    \terminal{nullptr}
+    \keyword{nullptr}
 \end{bnf}
 
 \pnum

source/overloading.tex

@@ -563,7 +563,7 @@
 and having the form
 \begin{ncbnf}
 \terminal{R} \placeholder{call-function} \terminal{(} conversion-type-id \ %
-\terminal{F, P$_1$ a$_1$, $\dotsc$, P$_n$ a$_n$)} \terminal{\{ return F (a$_1$, $\dotsc$, a$_n$); \}}
+\terminal{F, P$_1$ a$_1$, $\dotsc$, P$_n$ a$_n$)} \terminal{\{} \keyword{return} \terminal{F (a$_1$, $\dotsc$, a$_n$); \}}
 \end{ncbnf}
 is also considered as a candidate function.
 Similarly, surrogate
@@ -3283,7 +3283,7 @@
 %% Ed. note: character protrusion would misalign various operators.
 \microtypesetup{protrusion=false}\obeyspaces
 \nontermdef{operator} \textnormal{one of}\br
-    \terminal{new      delete   new[]    delete[] co_await (\rlap{\,)}        [\rlap{\,]}        ->       ->*}\br
+    \terminal{\keyword{new}   \keyword{delete}  \keyword{new}[]   \keyword{delete}[]        \keyword{co_await}    (\rlap{\,)}    [\rlap{\,]}    ->    ->*}\br
     \terminal{\~        !        +        -        *        /        \%        \caret{}        \&}\br
     \terminal{|        =        +=       -=       *=       /=       \%=       \caret{}=       \&=}\br
     \terminal{|=       ==       !=       <        >        <=       >=       <=>      \&\&}\br

source/preprocessor.tex

@@ -713,7 +713,7 @@
 whether the \tcode{\#include} preprocessing directive
 is instead replaced by an \tcode{import} directive\iref{cpp.import} of the form
 \begin{ncbnf}
-\terminal{import} header-name \terminal{;} new-line
+\keyword{import} header-name \terminal{;} new-line
 \end{ncbnf}
 
 \pnum

source/statements.tex

@@ -976,7 +976,7 @@
 
 \begin{bnf}
 \nontermdef{coroutine-return-statement}\br
-    \terminal{co_return} \opt{expr-or-braced-init-list} \terminal{;}
+    \keyword{co_return} \opt{expr-or-braced-init-list} \terminal{;}
 \end{bnf}
 
 \pnum
@@ -996,7 +996,7 @@
 promise object\iref{dcl.fct.def.coroutine}.
 A \keyword{co_return} statement is equivalent to:
 \begin{ncsimplebnf}
-\terminal{\{} S\terminal{;} \terminal{goto} \exposid{final-suspend}\terminal{;} \terminal{\}}
+\terminal{\{} S\terminal{;} \keyword{goto} \exposid{final-suspend}\terminal{;} \terminal{\}}
 \end{ncsimplebnf}
 where \exposid{final-suspend} is the exposition-only label
 defined in \ref{dcl.fct.def.coroutine}

source/templates.tex

@@ -4515,7 +4515,7 @@
 \begin{bnf}
 \nontermdef{typename-specifier}\br
   \keyword{typename} nested-name-specifier identifier\br
-  \keyword{typename} nested-name-specifier \opt{\terminal{template}} simple-template-id
+  \keyword{typename} nested-name-specifier \opt{\keyword{template}} simple-template-id
 \end{bnf}
 
 \pnum