Use \opt{arg} instead of suffix \opt{}

Author: jensmaurer

source/access.tex

@@ -195,7 +195,7 @@
 (\ref{class.derived}):
 
 \begin{ncbnftab}
-access-specifier \terminal{:} member-specification\opt{}
+access-specifier \terminal{:} \opt{member-specification}
 \end{ncbnftab}
 
 An

source/basic.tex

@@ -776,7 +776,7 @@
 \item for a declaration of the form
 
 \begin{ncbnf}
-class-key attribute-specifier-seq\opt{} identifier \terminal{;}
+class-key \opt{attribute-specifier-seq} identifier \terminal{;}
 \end{ncbnf}
 
 the \grammarterm{identifier} is declared to be a
@@ -1775,7 +1775,7 @@
 \grammarterm{qualified-id} of the form:
 
 \begin{ncbnf}
-nested-name-specifier\opt{} class-name \terminal{::} \terminal{\~} class-name
+\opt{nested-name-specifier} class-name \terminal{::} \terminal{\~} class-name
 \end{ncbnf}
 
 the second \grammarterm{class-name} is looked up in the same scope as the
@@ -2135,7 +2135,7 @@
 following form:
 
 \begin{ncbnf}
-class-key attribute-specifier-seq\opt{} identifier \terminal{;}
+class-key \opt{attribute-specifier-seq} identifier \terminal{;}
 \end{ncbnf}
 
 the \grammarterm{identifier} is looked up according
@@ -2150,7 +2150,7 @@
 form:
 
 \begin{ncbnf}
-class-key attribute-specifier-seq\opt{} identifier \terminal{;}
+class-key \opt{attribute-specifier-seq} identifier \terminal{;}
 \end{ncbnf}
 
 the \grammarterm{elaborated-type-specifier} is a declaration that
@@ -2316,7 +2316,7 @@
 
 \begin{bnf}
 \nontermdef{translation-unit}\br
-    declaration-seq\opt{}
+    \opt{declaration-seq}
 \end{bnf}
 
 \pnum

source/classes.tex

@@ -29,18 +29,18 @@
 
 \begin{bnf}
 \nontermdef{class-specifier}\br
-    class-head \terminal{\{} member-specification\opt{} \terminal{\}}
+    class-head \terminal{\{} \opt{member-specification} \terminal{\}}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{class-head}\br
-    class-key attribute-specifier-seq\opt{} class-head-name class-virt-specifier\opt{} base-clause\opt{}\br
-    class-key attribute-specifier-seq\opt{} base-clause\opt{}
+    class-key \opt{attribute-specifier-seq} class-head-name \opt{class-virt-specifier} \opt{base-clause}\br
+    class-key \opt{attribute-specifier-seq} \opt{base-clause}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{class-head-name}\br
-    nested-name-specifier\opt{} class-name
+    \opt{nested-name-specifier} class-name
 \end{bnf}
 
 \begin{bnf}
@@ -431,13 +431,13 @@
 
 \begin{bnf}
 \nontermdef{member-specification}\br
-    member-declaration member-specification\opt{}\br
-    access-specifier \terminal{:} member-specification\opt{}
+    member-declaration \opt{member-specification}\br
+    access-specifier \terminal{:} \opt{member-specification}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{member-declaration}\br
-    attribute-specifier-seq\opt{} decl-specifier-seq\opt{} member-declarator-list\opt{} \terminal{;}\br
+    \opt{attribute-specifier-seq} \opt{decl-specifier-seq} \opt{member-declarator-list} \terminal{;}\br
     function-definition\br
     using-declaration\br
     static_assert-declaration\br
@@ -455,10 +455,10 @@
 
 \begin{bnf}
 \nontermdef{member-declarator}\br
-    declarator virt-specifier-seq\opt{} pure-specifier\opt{}\br
+    declarator \opt{virt-specifier-seq} \opt{pure-specifier}\br
     declarator requires-clause\br
-    declarator brace-or-equal-initializer\opt{}\br
-    identifier\opt{} attribute-specifier-seq\opt{} \terminal{:} constant-expression brace-or-equal-initializer\opt{}
+    declarator \opt{brace-or-equal-initializer}\br
+    \opt{identifier} \opt{attribute-specifier-seq} \terminal{:} constant-expression \opt{brace-or-equal-initializer}
 \end{bnf}
 
 \begin{bnf}
@@ -1304,7 +1304,7 @@
 A \grammarterm{member-declarator} of the form
 
 \begin{ncbnftab}
-identifier\opt{} attribute-specifier-seq\opt{} \terminal{:} constant-expression brace-or-equal-initializer\opt{}
+\opt{identifier} \opt{attribute-specifier-seq} \terminal{:} constant-expression \opt{brace-or-equal-initializer}
 \end{ncbnftab}
 
 \indextext{\idxcode{:}!bit-field declaration}%