manual fixes for \opt{} removal

Author: jensmaurer

source/declarations.tex

@@ -1282,7 +1282,7 @@
 a type to be deduced~(\ref{dcl.spec.auto}).
 \indextext{deduction!class template arguments}%
 A \grammarterm{type-specifier} of the form
-\tcode{typename}\opt{} \grammarterm{nested-name-specifier}\opt{} \grammarterm{template-name}
+\opt{\tcode{typename}} \opt{\grammarterm{nested-name-specifier}} \grammarterm{template-name}
 is a placeholder for
 a deduced class type~(\ref{dcl.type.class.deduct}).
 The \grammarterm{template-name} shall name a class template

source/declarators.tex

@@ -1253,7 +1253,7 @@
 \tcode{D}
 is
 ``\placeholder{derived-declarator-type-list}
-\tcode{noexcept}\opt{}
+\opt{\tcode{noexcept}}
 function of
 (\grammarterm{parameter-declaration-clause})
 \opt{\grammarterm{cv-qualifier-seq}} \opt{\grammarterm{ref-qualifier}}
@@ -1291,10 +1291,10 @@
 \tcode{D}
 is
 ``\placeholder{derived-declarator-type-list}
-\tcode{noexcept}\opt{}
+\opt{\tcode{noexcept}}
 function of
 (\grammarterm{parameter-declaration-clause})
-\grammarterm{cv-qualifier-seq}\opt{} \grammarterm{ref-qualifier}\opt{}
+\opt{\grammarterm{cv-qualifier-seq}} \opt{\grammarterm{ref-qualifier}}
 returning \tcode{U}'',
 where \tcode{U} is the type specified by
 the \grammarterm{trailing-return-type}, and
@@ -2424,7 +2424,7 @@
 
 \begin{bnf}
 \nontermdef{braced-init-list}\br
-    \terminal{\{} initializer-list \terminal{,\opt{}} \terminal{\}}\br
+    \terminal{\{} initializer-list \opt{\terminal{,}} \terminal{\}}\br
     \terminal{\{} \terminal{\}}
 \end{bnf}
 

source/expressions.tex

@@ -960,8 +960,8 @@
 
 \begin{bnf}
 \nontermdef{capture-list}\br
-    capture \terminal{...\opt{}}\br
-    capture-list \terminal{,} capture \terminal{...\opt{}}
+    capture \opt{\terminal{...}}\br
+    capture-list \terminal{,} capture \opt{\terminal{...}}
 \end{bnf}
 
 \begin{bnf}

source/iostreams.tex

@@ -10678,8 +10678,8 @@
 
 \begin{ncbnf}
 \nontermdef{directory-separator}\br
-    preferred-separator directory-separator\opt\br
-    fallback-separator directory-separator\opt
+    preferred-separator \opt{directory-separator}\br
+    fallback-separator \opt{directory-separator}
 \end{ncbnf}
 
 \begin{ncbnf}