[various] Remove \obeyspaces, and spell out spaces explicitly.

This allows us to switch to a simpler grammar extraction implementation.

Author: tkoeppe

source/declarations.tex

@@ -2430,7 +2430,7 @@
 \end{bnf}
 
 \begin{bnf}
-\microtypesetup{protrusion=false}\obeyspaces
+\microtypesetup{protrusion=false}
 \nontermdef{ptr-operator}\br
     \terminal{*} \opt{attribute-specifier-seq} \opt{cv-qualifier-seq}\br
     \terminal{\&} \opt{attribute-specifier-seq}\br
@@ -9274,7 +9274,7 @@
 \end{bnf}
 
 \begin{bnf}
-\microtypesetup{protrusion=false}\obeyspaces
+\microtypesetup{protrusion=false}
 \nontermdef{balanced-token}\br
     \terminal{(} \opt{balanced-token-seq} \terminal{)}\br
     \terminal{[} \opt{balanced-token-seq} \terminal{]}\br

source/expressions.tex

@@ -3136,7 +3136,7 @@
 \end{bnf}
 
 \begin{bnf}
-\microtypesetup{protrusion=false}\obeyspaces
+\microtypesetup{protrusion=false}
 \nontermdef{requirement-body}\br
     \terminal{\{} requirement-seq \terminal{\}}
 \end{bnf}

source/lex.tex

@@ -635,7 +635,7 @@
 
 \indextext{header!name|(}%
 \begin{bnf}
-\microtypesetup{protrusion=false}\obeyspaces
+\microtypesetup{protrusion=false}
 \nontermdef{header-name}\br
     \terminal{<} h-char-sequence \terminal{>}\br
     \terminal{"} q-char-sequence \terminal{"}
@@ -735,23 +735,23 @@
 
 \begin{bnf}
 %% Ed. note: character protrusion would misalign various operators.
-\microtypesetup{protrusion=false}\obeyspaces
+\microtypesetup{protrusion=false}
 \nontermdef{preprocessing-operator} \textnormal{one of}\br
-    \terminal{\#        \#\#       \%:       \%:\%:}
+    \terminal{\# \ \ \ \ \ \ \ \#\# \ \ \ \ \ \ \%: \ \ \ \ \ \ \%:\%:}
 \end{bnf}
 
 \begin{bnf}
-\microtypesetup{protrusion=false}\obeyspaces
+\microtypesetup{protrusion=false}
 \nontermdef{operator-or-punctuator} \textnormal{one of}\br
-    \terminal{\{        \}        [        ]        (        )}\br
-    \terminal{<\%       \%>       <:       :>       ;        :        ...}\br
-    \terminal{?        ::       .        .*       ->       ->*      \~}\br
-    \terminal{!        +        -        *        /        \%        \caret{}        \&        |}\br
-    \terminal{=        +=       -=       *=       /=       \%=       \caret{}=       \&=       |=}\br
-    \terminal{==       !=       <        >        <=       >=       <=>      \&\&       ||}\br
-    \terminal{<<       >>       <<=      >>=      ++       --       ,}\br
-    \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}}
+    \terminal{\{ \ \ \ \ \ \ \ \} \ \ \ \ \ \ \ [ \ \ \ \ \ \ \ ] \ \ \ \ \ \ \ ( \ \ \ \ \ \ \ )}\br
+    \terminal{<\% \ \ \ \ \ \ \%> \ \ \ \ \ \ <: \ \ \ \ \ \ :> \ \ \ \ \ \ ; \ \ \ \ \ \ \ : \ \ \ \ \ \ \ ...}\br
+    \terminal{? \ \ \ \ \ \ \ :: \ \ \ \ \ \ . \ \ \ \ \ \ \ .* \ \ \ \ \ \ -> \ \ \ \ \ \ ->* \ \ \ \ \ \~}\br
+    \terminal{! \ \ \ \ \ \ \ + \ \ \ \ \ \ \ - \ \ \ \ \ \ \ * \ \ \ \ \ \ \ / \ \ \ \ \ \ \ \% \ \ \ \ \ \ \ \caret{} \ \ \ \ \ \ \ \& \ \ \ \ \ \ \ |}\br
+    \terminal{= \ \ \ \ \ \ \ += \ \ \ \ \ \ -= \ \ \ \ \ \ *= \ \ \ \ \ \ /= \ \ \ \ \ \ \%= \ \ \ \ \ \ \caret{}= \ \ \ \ \ \ \&= \ \ \ \ \ \ |=}\br
+    \terminal{== \ \ \ \ \ \ != \ \ \ \ \ \ < \ \ \ \ \ \ \ > \ \ \ \ \ \ \ <= \ \ \ \ \ \ >= \ \ \ \ \ \ <=> \ \ \ \ \ \&\& \ \ \ \ \ \ ||}\br
+    \terminal{<< \ \ \ \ \ \ >> \ \ \ \ \ \ <<= \ \ \ \ \ >>= \ \ \ \ \ ++ \ \ \ \ \ \ -- \ \ \ \ \ \ ,}\br
+    \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

source/overloading.tex

@@ -3307,13 +3307,13 @@
 
 \begin{bnf}
 %% Ed. note: character protrusion would misalign various operators.
-\microtypesetup{protrusion=false}\obeyspaces
+\microtypesetup{protrusion=false}
 \nontermdef{operator} \textnormal{one of}\br
-    \terminal{new      delete   new[]    delete[] co_await (\rlap{\,)}        [\rlap{\,]}        ->       ->*}\br
-    \terminal{\~        !        +        -        *        /        \%        \caret{}        \&}\br
-    \terminal{|        =        +=       -=       *=       /=       \%=       \caret{}=       \&=}\br
-    \terminal{|=       ==       !=       <        >        <=       >=       <=>      \&\&}\br
-    \terminal{||       <<       >>       <<=      >>=      ++       --       ,}\br
+    \terminal{new \ \ \ \ \ delete \ \ new[] \ \ \ delete[] co_await (\rlap{\,)} \ \ \ \ \ \ \ [\rlap{\,]} \ \ \ \ \ \ \ -> \ \ \ \ \ \ ->*}\br
+    \terminal{\~ \ \ \ \ \ \ \ ! \ \ \ \ \ \ \ + \ \ \ \ \ \ \ - \ \ \ \ \ \ \ * \ \ \ \ \ \ \ / \ \ \ \ \ \ \ \% \ \ \ \ \ \ \ \caret{} \ \ \ \ \ \ \ \&}\br
+    \terminal{| \ \ \ \ \ \ \ = \ \ \ \ \ \ \ += \ \ \ \ \ \ -= \ \ \ \ \ \ *= \ \ \ \ \ \ /= \ \ \ \ \ \ \%= \ \ \ \ \ \ \caret{}= \ \ \ \ \ \ \&=}\br
+    \terminal{|= \ \ \ \ \ \ == \ \ \ \ \ \ != \ \ \ \ \ \ < \ \ \ \ \ \ \ > \ \ \ \ \ \ \ <= \ \ \ \ \ \ >= \ \ \ \ \ \ <=> \ \ \ \ \ \&\&}\br
+    \terminal{|| \ \ \ \ \ \ << \ \ \ \ \ \ >> \ \ \ \ \ \ <<= \ \ \ \ \ >>= \ \ \ \ \ ++ \ \ \ \ \ \ -- \ \ \ \ \ \ ,}\br
 \end{bnf}
 \begin{note}
 The operators
@@ -3331,17 +3331,17 @@
 
 \pnum
 Both the unary and binary forms of
-\begin{ncsimplebnf}\obeyspaces
-\terminal{+      -      *      \&}
+\begin{ncsimplebnf}
+\terminal{+ \ \ \ \ \ - \ \ \ \ \ * \ \ \ \ \ \&}
 \end{ncsimplebnf}
 can be overloaded.
 
 \pnum
 \begin{note}
 \indextext{restriction!operator overloading}%
 The following operators cannot be overloaded:
-\begin{ncsimplebnf}\obeyspaces
-\terminal{.      .*     ::     ?:}
+\begin{ncsimplebnf}
+\terminal{. \ \ \ \ \ .* \ \ \ \ :: \ \ \ \ ?:}
 \end{ncsimplebnf}
 nor can the preprocessing symbols
 \tcode{\#}\iref{cpp.stringize}

source/preprocessor.tex

@@ -45,18 +45,18 @@
     \terminal{\#} conditionally-supported-directive
 \end{bnf}
 
-\begin{bnf}\obeyspaces
+\begin{bnf}
 \nontermdef{control-line}\br
     \terminal{\# include} pp-tokens new-line\br
     pp-import\br
-    \terminal{\# embed  } pp-tokens new-line\br
+    \terminal{\# embed \ } pp-tokens new-line\br
     \terminal{\# define } identifier replacement-list new-line\br
     \terminal{\# define } identifier lparen \opt{identifier-list} \terminal{)} replacement-list new-line\br
     \terminal{\# define } identifier lparen \terminal{... )} replacement-list new-line\br
     \terminal{\# define } identifier lparen identifier-list \terminal{, ... )} replacement-list new-line\br
-    \terminal{\# undef  } identifier new-line\br
-    \terminal{\# line   } pp-tokens new-line\br
-    \terminal{\# error  } \opt{pp-tokens} new-line\br
+    \terminal{\# undef \ } identifier new-line\br
+    \terminal{\# line \ \ } pp-tokens new-line\br
+    \terminal{\# error \ } \opt{pp-tokens} new-line\br
     \terminal{\# warning} \opt{pp-tokens} new-line\br
     \terminal{\# pragma } \opt{pp-tokens} new-line\br
     \terminal{\# }new-line
@@ -67,10 +67,10 @@
     if-group \opt{elif-groups} \opt{else-group} endif-line
 \end{bnf}
 
-\begin{bnf}\obeyspaces
+\begin{bnf}
 \nontermdef{if-group}\br
-    \terminal{\# if     } constant-expression new-line \opt{group}\br
-    \terminal{\# ifdef  } identifier new-line \opt{group}\br
+    \terminal{\# if \ \ \ \ } constant-expression new-line \opt{group}\br
+    \terminal{\# ifdef \ } identifier new-line \opt{group}\br
     \terminal{\# ifndef } identifier new-line \opt{group}
 \end{bnf}
 
@@ -79,21 +79,21 @@
     elif-group \opt{elif-groups}
 \end{bnf}
 
-\begin{bnf}\obeyspaces
+\begin{bnf}
 \nontermdef{elif-group}\br
-    \terminal{\# elif    } constant-expression new-line \opt{group}\br
+    \terminal{\# elif \ \ \ } constant-expression new-line \opt{group}\br
     \terminal{\# elifdef } identifier new-line \opt{group}\br
     \terminal{\# elifndef} identifier new-line \opt{group}
 \end{bnf}
 
-\begin{bnf}\obeyspaces
+\begin{bnf}
 \nontermdef{else-group}\br
-    \terminal{\# else   } new-line \opt{group}
+    \terminal{\# else \ \ } new-line \opt{group}
 \end{bnf}
 
-\begin{bnf}\obeyspaces
+\begin{bnf}
 \nontermdef{endif-line}\br
-    \terminal{\# endif  } new-line
+    \terminal{\# endif \ } new-line
 \end{bnf}
 
 \begin{bnf}
@@ -508,11 +508,11 @@
 
 \pnum
 Preprocessing directives of the forms
-\begin{ncsimplebnf}\obeyspaces
+\begin{ncsimplebnf}
 \indextext{\idxcode{\#if}}%
-\terminal{\# if     } constant-expression new-line \opt{group}\br
+\terminal{\# if \ \ \ \ } constant-expression new-line \opt{group}\br
 \indextext{\idxcode{\#elif}}%
-\terminal{\# elif   } constant-expression new-line \opt{group}
+\terminal{\# elif \ \ } constant-expression new-line \opt{group}
 \end{ncsimplebnf}
 check whether the controlling constant expression evaluates to nonzero.
 
@@ -585,10 +585,10 @@
 
 \pnum
 Preprocessing directives of the forms
-\begin{ncsimplebnf}\obeyspaces
-\terminal{\# ifdef   } identifier new-line \opt{group}\br
+\begin{ncsimplebnf}
+\terminal{\# ifdef \ \ } identifier new-line \opt{group}\br
 \indextext{\idxcode{\#ifdef}}%
-\terminal{\# ifndef  } identifier new-line \opt{group}\br
+\terminal{\# ifndef \ } identifier new-line \opt{group}\br
 \indextext{\idxcode{\#ifndef}}%
 \terminal{\# elifdef } identifier new-line \opt{group}\br
 \indextext{\idxcode{\#elifdef}}%