manual fixes for \opt{} removal

Author: jensmaurer

source/declarations.tex

@@ -1289,7 +1289,7 @@
 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
 and shall appear only as a \grammarterm{decl-specifier}
 in the \grammarterm{decl-specifier-seq}

source/declarators.tex

@@ -1262,7 +1262,7 @@
 \tcode{D}
 is
 ``\placeholder{derived-declarator-type-list}
-\tcode{noexcept}\opt{}
+\opt{\tcode{noexcept}}
 function of
 (\grammarterm{parameter-declaration-clause} )
 \grammarterm{\opt{cv-qualifier-seq}} \grammarterm{\opt{ref-qualifier}}
@@ -1300,10 +1300,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
@@ -2431,7 +2431,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

@@ -616,8 +616,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}