[lex.operators] Dissolve bnfkeytab; use simple spaces for alignment.

Author: tkoeppe

source/lex.tex

@@ -792,18 +792,20 @@
 preprocessing tokens which are used in the syntax of the preprocessor or
 are converted into tokens for operators and punctuators:
 
-\begin{bnfkeywordtab}
+\begin{bnf}
+%% Ed. note: character protrusion would misalign various operators.
+\microtypesetup{protrusion=false}\obeyspaces
 \nontermdef{preprocessing-op-or-punc} \textnormal{one of}\br
-\>\{ \>\} \>[ \>] \>\# \>\#\# \>( \>)\br
-\><: \>:> \><\% \>\%> \>\%: \>\%:\%: \>; \>: \>.{..}\br
-\>new \>delete \>? \>:: \>. \>.* \>-> \>->* \>\~\br
-\>! \>+ \>- \>* \>/ \>\% \>\caret \>\& \>|\br
-\>= \>+= \>-= \>*= \>/= \>\%= \>\caret= \>\&= \>|=\br
-\>== \>!= \>< \>> \><= \>>= \><=> \>\&\& \>||\br
-\><< \>>> \><<= \>>>= \>++ \>-{-} \>,\br
-\>and \>or \>xor \>not \>bitand \>bitor \>compl\br
-\>and_eq \>or_eq \>xor_eq \>not_eq
-\end{bnfkeywordtab}
+\terminal{\{        \}        [        ]        \#        \#\#       (        )}\br
+\terminal{<:       :>       <\%       \%>       \%:       \%:\%:     ;        :        ...}\br
+\terminal{new      delete   ?        ::       .        .*       ->       ->*      \~}\br
+\terminal{!        +        -        *        /        \%        \caret{}        \&        |}\br
+\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}
+\end{bnf}
 
 Each \grammarterm{preprocessing-op-or-punc} is converted to a single token
 in translation phase 7\iref{lex.phases}.%