(alx-0014r6-B) Refactor syntax of embed directives

Signed-off-by: Alejandro Colomar <[email protected]>

Author: alejandro-colomar

source/preprocessor.tex

@@ -49,7 +49,7 @@
 \nontermdef{control-line}\br
     include-directive\br
     pp-import\br
-    \terminal{\# embed \ } pp-tokens new-line\br
+    embed-directive\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
@@ -127,47 +127,6 @@
     preprocessing-token \opt{pp-tokens}
 \end{bnf}
 
-\begin{bnf}
-\nontermdef{embed-parameter-seq}\br
-    embed-parameter \opt{embed-parameter-seq}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{embed-parameter}\br
-    embed-standard-parameter\br
-    embed-prefixed-parameter
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{embed-standard-parameter}\br
-    \terminal{limit} \terminal{(} pp-balanced-token-seq \terminal{)}\br
-    \terminal{prefix} \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}\br
-    \terminal{suffix} \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}\br
-    \terminal{if_empty} \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{embed-prefixed-parameter}\br
-    identifier :: identifier\br
-    identifier :: identifier \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{pp-balanced-token-seq}\br
-    pp-balanced-token \opt{pp-balanced-token-seq}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{pp-balanced-token}\br
-    \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}\br
-    \terminal{[} \opt{pp-balanced-token-seq} \terminal{]}\br
-    \terminal{\{} \opt{pp-balanced-token-seq} \terminal{\}}\br
-    \textnormal{any} pp-token \textnormal{except:}\br
-    \bnfindent\textnormal{parenthesis (\unicode{0028}{left parenthesis} and \unicode{0029}{right parenthesis}),}\br
-    \bnfindent\textnormal{bracket (\unicode{005b}{left square bracket} and \unicode{005d}{right square bracket}), or}\br
-    \bnfindent\textnormal{brace (\unicode{007b}{left curly bracket} and \unicode{007d}{right curly bracket}).}
-\end{bnf}
-
 \begin{bnf}
 \nontermdef{new-line}\br
     \descr{the new-line character}
@@ -850,6 +809,52 @@
 \indextext{preprocessing directive!embed a resource}
 \indextext{\idxcode{\#embed}}%
 
+\begin{bnf}
+\nontermdef{embed-directive}\br
+    \terminal{\# embed \ } pp-tokens new-line\br
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{embed-parameter-seq}\br
+    embed-parameter \opt{embed-parameter-seq}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{embed-parameter}\br
+    embed-standard-parameter\br
+    embed-prefixed-parameter
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{embed-standard-parameter}\br
+    \terminal{limit} \terminal{(} pp-balanced-token-seq \terminal{)}\br
+    \terminal{prefix} \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}\br
+    \terminal{suffix} \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}\br
+    \terminal{if_empty} \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{embed-prefixed-parameter}\br
+    identifier :: identifier\br
+    identifier :: identifier \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{pp-balanced-token-seq}\br
+    pp-balanced-token \opt{pp-balanced-token-seq}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{pp-balanced-token}\br
+    \terminal{(} \opt{pp-balanced-token-seq} \terminal{)}\br
+    \terminal{[} \opt{pp-balanced-token-seq} \terminal{]}\br
+    \terminal{\{} \opt{pp-balanced-token-seq} \terminal{\}}\br
+    \textnormal{any} pp-token \textnormal{except:}\br
+    \bnfindent\textnormal{parenthesis (\unicode{0028}{left parenthesis} and \unicode{0029}{right parenthesis}),}\br
+    \bnfindent\textnormal{bracket (\unicode{005b}{left square bracket} and \unicode{005d}{right square bracket}), or}\br
+    \bnfindent\textnormal{brace (\unicode{007b}{left curly bracket} and \unicode{007d}{right curly bracket}).}
+\end{bnf}
+
 \rSec2[cpp.embed.gen]{General}
 
 \pnum