[lex] Use \keyword for alternative tokens.

Author: jensmaurer

source/lex.tex

@@ -404,9 +404,9 @@
 
 \pnum
 The \grammarterm{import-keyword} is produced
-by processing an \tcode{import} directive\iref{cpp.import},
+by processing an \keyword{import} directive\iref{cpp.import},
 the \grammarterm{module-keyword} is produced
-by preprocessing a \tcode{module} directive\iref{cpp.module}, and
+by preprocessing a \keyword{module} directive\iref{cpp.module}, and
 the \grammarterm{export-keyword} is produced
 by preprocessing either of the previous two directives.
 \begin{note}
@@ -464,22 +464,22 @@
 
 \begin{tokentable}{Alternative tokens}{lex.digraph}{Alternative}{Primary}
 \tcode{<\%}             &   \tcode{\{}         &
-\tcode{and}             &   \tcode{\&\&}       &
-\tcode{and_eq}          &   \tcode{\&=}        \\ \rowsep
+\keyword{and}           &   \tcode{\&\&}       &
+\keyword{and_eq}        &   \tcode{\&=}        \\ \rowsep
 \tcode{\%>}             &   \tcode{\}}         &
-\tcode{bitor}           &   \tcode{|}          &
-\tcode{or_eq}           &   \tcode{|=}         \\ \rowsep
+\keyword{bitor}         &   \tcode{|}          &
+\keyword{or_eq}         &   \tcode{|=}         \\ \rowsep
 \tcode{<:}              &   \tcode{[}          &
-\tcode{or}              &   \tcode{||}         &
-\tcode{xor_eq}          &   \tcode{\caret=}    \\ \rowsep
+\keyword{or}            &   \tcode{||}         &
+\keyword{xor_eq}        &   \tcode{\caret=}    \\ \rowsep
 \tcode{:>}              &   \tcode{]}          &
-\tcode{xor}             &   \tcode{\caret}     &
-\tcode{not}             &   \tcode{!}          \\ \rowsep
+\keyword{xor}           &   \tcode{\caret}     &
+\keyword{not}           &   \tcode{!}          \\ \rowsep
 \tcode{\%:}             &   \tcode{\#}         &
-\tcode{compl}           &   \tcode{\~}         &
-\tcode{not_eq}          &   \tcode{!=}         \\ \rowsep
+\keyword{compl}         &   \tcode{\~}         &
+\keyword{not_eq}        &   \tcode{!=}         \\ \rowsep
 \tcode{\%:\%:}          &   \tcode{\#\#}       &
-\tcode{bitand}          &   \tcode{\&}         &
+\keyword{bitand}        &   \tcode{\&}         &
                         &                      \\
 \end{tokentable}%
 \indextext{token!alternative|)}
@@ -941,8 +941,8 @@
     \terminal{=        +=       -=       *=       /=       \%=       \caret{}=       \&=       |=}\br
     \terminal{==       !=       <        >        <=       >=       <=>      \&\&       ||}\br
     \terminal{<<       >>       <<=      >>=      ++       --       ,}\br
-    \terminal{and      or       xor      not      bitand   bitor    compl}\br
-    \terminal{and_eq   or_eq    xor_eq   not_eq}
+    \terminal{\keyword{and}      \keyword{or}       \keyword{xor}      \keyword{not}      \keyword{bitand}   \keyword{bitor}    \keyword{compl}}\br
+    \terminal{\keyword{and_eq}   \keyword{or_eq}    \keyword{xor_eq}   \keyword{not_eq}}
 \end{bnf}
 
 Each \grammarterm{operator-or-punctuator} is converted to a single token