Replace \opt with \opt{}

Author: jensmaurer

source/access.tex

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

source/basic.tex

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

source/classes.tex

@@ -34,13 +34,13 @@
 
 \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 attribute-specifier-seq\opt{} class-head-name class-virt-specifier\opt{} base-clause\opt{}\br
+    class-key attribute-specifier-seq\opt{} base-clause\opt{}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{class-head-name}\br
-    nested-name-specifier\opt class-name
+    nested-name-specifier\opt{} class-name
 \end{bnf}
 
 \begin{bnf}
@@ -445,13 +445,13 @@
 
 \begin{bnf}
 \nontermdef{member-specification}\br
-    member-declaration member-specification\opt\br
-    access-specifier \terminal{:} member-specification\opt
+    member-declaration member-specification\opt{}\br
+    access-specifier \terminal{:} member-specification\opt{}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{member-declaration}\br
-    attribute-specifier-seq\opt decl-specifier-seq\opt member-declarator-list\opt{} \terminal{;}\br
+    attribute-specifier-seq\opt{} decl-specifier-seq\opt{} member-declarator-list\opt{} \terminal{;}\br
     function-definition\br
     using-declaration\br
     static_assert-declaration\br
@@ -469,9 +469,9 @@
 
 \begin{bnf}
 \nontermdef{member-declarator}\br
-    declarator virt-specifier-seq\opt pure-specifier\opt\br
-    declarator brace-or-equal-initializer\opt\br
-    identifier\opt attribute-specifier-seq\opt{} \terminal{:} constant-expression
+    declarator virt-specifier-seq\opt{} pure-specifier\opt{}\br
+    declarator brace-or-equal-initializer\opt{}\br
+    identifier\opt{} attribute-specifier-seq\opt{} \terminal{:} constant-expression
 \end{bnf}
 
 \begin{bnf}
@@ -1294,7 +1294,7 @@
 A \grammarterm{member-declarator} of the form
 
 \begin{ncbnftab}
-identifier\opt  attribute-specifier-seq\opt{} \terminal{:} constant-expression
+identifier\opt{}  attribute-specifier-seq\opt{} \terminal{:} constant-expression
 \end{ncbnftab}
 
 \indextext{\idxcode{:}!bit-field declaration}%

source/declarations.tex

@@ -45,7 +45,7 @@
 
 \begin{bnf}
 \nontermdef{nodeclspec-function-declaration}\br
-    attribute-specifier-seq\opt declarator \terminal{;}
+    attribute-specifier-seq\opt{} declarator \terminal{;}
 \end{bnf}
 
 \begin{bnf}
@@ -57,7 +57,7 @@
 \nontermdef{simple-declaration}\br
     decl-specifier-seq init-declarator-list\opt{} \terminal{;}\br
     attribute-specifier-seq decl-specifier-seq init-declarator-list \terminal{;}\br
-    attribute-specifier-seq\opt decl-specifier-seq ref-qualifier\opt{} \terminal{[} identifier-list \terminal{]} initializer \terminal{;}
+    attribute-specifier-seq\opt{} decl-specifier-seq ref-qualifier\opt{} \terminal{[} identifier-list \terminal{]} initializer \terminal{;}
 \end{bnf}
 
 \begin{bnf}
@@ -93,7 +93,7 @@
 \grammarterm{nodeclspec-function-declaration} of the form
 
 \begin{ncsimplebnf}
-attribute-specifier-seq\opt decl-specifier-seq\opt init-declarator-list\opt{} \terminal{;}
+attribute-specifier-seq\opt{} decl-specifier-seq\opt{} init-declarator-list\opt{} \terminal{;}
 \end{ncsimplebnf}
 
 is divided into three parts.
@@ -258,7 +258,7 @@
 
 \begin{bnf}
 \nontermdef{decl-specifier-seq}\br
-    decl-specifier attribute-specifier-seq\opt\br
+    decl-specifier attribute-specifier-seq\opt{}\br
     decl-specifier decl-specifier-seq
 \end{bnf}
 
@@ -1042,7 +1042,7 @@
 
 \begin{bnf}
 \nontermdef{type-specifier-seq}\br
-    type-specifier attribute-specifier-seq\opt\br
+    type-specifier attribute-specifier-seq\opt{}\br
     type-specifier type-specifier-seq
 \end{bnf}
 
@@ -1055,7 +1055,7 @@
 
 \begin{bnf}
 \nontermdef{defining-type-specifier-seq}\br
-  defining-type-specifier attribute-specifier-seq\opt\br
+  defining-type-specifier attribute-specifier-seq\opt{}\br
   defining-type-specifier defining-type-specifier-seq
 \end{bnf}
 
@@ -1232,9 +1232,9 @@
 
 \begin{bnf}
 \nontermdef{simple-type-specifier}\br
-    nested-name-specifier\opt type-name\br
+    nested-name-specifier\opt{} type-name\br
     nested-name-specifier \terminal{template} simple-template-id\br
-    nested-name-specifier\opt template-name\br
+    nested-name-specifier\opt{} template-name\br
     \terminal{char}\br
     \terminal{char16_t}\br
     \terminal{char32_t}\br
@@ -1468,10 +1468,10 @@
 
 \begin{bnf}
 \nontermdef{elaborated-type-specifier}\br
-    class-key attribute-specifier-seq\opt nested-name-specifier\opt identifier\br
+    class-key attribute-specifier-seq\opt{} nested-name-specifier\opt{} identifier\br
     class-key simple-template-id\br
-    class-key nested-name-specifier \terminal{template}\opt simple-template-id\br
-    \terminal{enum} nested-name-specifier\opt identifier
+    class-key nested-name-specifier \terminal{template}\opt{} simple-template-id\br
+    \terminal{enum} nested-name-specifier\opt{} identifier
 \end{bnf}
 
 \pnum
@@ -1486,11 +1486,11 @@
 forms:
 
 \begin{ncsimplebnf}
-class-key attribute-specifier-seq\opt identifier \terminal{;}\br
-\terminal{friend} class-key \terminal{::\opt} identifier \terminal{;}\br
-\terminal{friend} class-key \terminal{::\opt} simple-template-id \terminal{;}\br
+class-key attribute-specifier-seq\opt{} identifier \terminal{;}\br
+\terminal{friend} class-key \terminal{::\opt{}} identifier \terminal{;}\br
+\terminal{friend} class-key \terminal{::\opt{}} simple-template-id \terminal{;}\br
 \terminal{friend} class-key nested-name-specifier identifier \terminal{;}\br
-\terminal{friend} class-key nested-name-specifier \terminal{template\opt} simple-template-id \terminal{;}
+\terminal{friend} class-key nested-name-specifier \terminal{template\opt{}} simple-template-id \terminal{;}
 \end{ncsimplebnf}
 
 In the first case, the \grammarterm{attribute-specifier-seq}, if any, appertains
@@ -1927,17 +1927,17 @@
 
 \begin{bnf}
 \nontermdef{enum-head}\br
-    enum-key attribute-specifier-seq\opt enum-head-name\opt enum-base\opt
+    enum-key attribute-specifier-seq\opt{} enum-head-name\opt{} enum-base\opt{}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{enum-head-name}\br
-    nested-name-specifier\opt identifier
+    nested-name-specifier\opt{} identifier
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{opaque-enum-declaration}\br
-    enum-key attribute-specifier-seq\opt nested-name-specifier\opt identifier enum-base\opt{} \terminal{;}
+    enum-key attribute-specifier-seq\opt{} nested-name-specifier\opt{} identifier enum-base\opt{} \terminal{;}
 \end{bnf}
 
 \begin{bnf}
@@ -1966,15 +1966,15 @@
 
 \begin{bnf}
 \nontermdef{enumerator}\br
-    identifier attribute-specifier-seq\opt
+    identifier attribute-specifier-seq\opt{}
 \end{bnf}
 
 The optional \grammarterm{attribute-specifier-seq} in the \grammarterm{enum-head} and
 the \grammarterm{opaque-enum-declaration} appertains to the enumeration; the attributes
 in that \grammarterm{attribute-specifier-seq} are thereafter considered attributes of the
 enumeration whenever it is named.
 A \tcode{:} following
-``\tcode{enum} \grammarterm{nested-name-specifier\opt} \grammarterm{identifier}''
+``\tcode{enum} \grammarterm{nested-name-specifier\opt{}} \grammarterm{identifier}''
 within the \grammarterm{decl-specifier-seq} of a \grammarterm{member-declaration}
 is parsed as part of an \grammarterm{enum-base}.
 \begin{note} This resolves a potential ambiguity between the declaration of an enumeration
@@ -2275,12 +2275,12 @@
 
 \begin{bnf}
 \nontermdef{named-namespace-definition}\br
-        \terminal{inline\opt} \terminal{namespace} attribute-specifier-seq\opt identifier \terminal{\{} namespace-body \terminal{\}}
+        \terminal{inline\opt{}} \terminal{namespace} attribute-specifier-seq\opt{} identifier \terminal{\{} namespace-body \terminal{\}}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{unnamed-namespace-definition}\br
-        \terminal{inline\opt} \terminal{namespace} attribute-specifier-seq\opt{} \terminal{\{} namespace-body \terminal{\}}
+        \terminal{inline\opt{}} \terminal{namespace} attribute-specifier-seq\opt{} \terminal{\{} namespace-body \terminal{\}}
 \end{bnf}
 
 \begin{bnf}
@@ -2296,7 +2296,7 @@
 
 \begin{bnf}
 \nontermdef{namespace-body}\br
-        declaration-seq\opt
+        declaration-seq\opt{}
 \end{bnf}
 
 \pnum
@@ -2478,7 +2478,7 @@
 whose \grammarterm{class-head-name} (Clause \ref{class}) or
 \grammarterm{enum-head-name}~(\ref{dcl.enum}) is an \grammarterm{identifier}, or
 whose \grammarterm{elaborated-type-specifier} is of the form \grammarterm{class-key}
-\grammarterm{attribute-specifier-seq\opt} \grammarterm{identifier}~(\ref{dcl.type.elab}), or
+\grammarterm{attribute-specifier-seq\opt{}} \grammarterm{identifier}~(\ref{dcl.type.elab}), or
 that is an \grammarterm{opaque-enum-declaration},
 declares (or redeclares) its \grammarterm{unqualified-id} or
 \grammarterm{identifier} as a member of \tcode{N}.
@@ -2607,7 +2607,7 @@
 
 \begin{bnf}
 \nontermdef{qualified-namespace-specifier}\br
-    nested-name-specifier\opt namespace-name
+    nested-name-specifier\opt{} namespace-name
 \end{bnf}
 
 \pnum
@@ -2647,13 +2647,13 @@
 
 \begin{bnf}
 \nontermdef{using-declarator-list}\br
-    using-declarator \terminal{...}\opt\br
-    using-declarator-list \terminal{,} using-declarator \terminal{...}\opt
+    using-declarator \terminal{...}\opt{}\br
+    using-declarator-list \terminal{,} using-declarator \terminal{...}\opt{}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{using-declarator}\br
-    \terminal{typename\opt} nested-name-specifier unqualified-id
+    \terminal{typename\opt{}} nested-name-specifier unqualified-id
 \end{bnf}
 
 \pnum
@@ -3122,7 +3122,7 @@
 
 \begin{bnf}
 \nontermdef{using-directive}\br
-    attribute-specifier-seq\opt{} \terminal{using  namespace} nested-name-specifier\opt namespace-name \terminal{;}
+    attribute-specifier-seq\opt{} \terminal{using  namespace} nested-name-specifier\opt{} namespace-name \terminal{;}
 \end{bnf}
 
 \pnum
@@ -3595,7 +3595,7 @@
 
 \begin{bnf}
 \nontermdef{attribute-specifier-seq}\br
-  attribute-specifier-seq\opt attribute-specifier
+  attribute-specifier-seq\opt{} attribute-specifier
 \end{bnf}
 
 \begin{bnf}
@@ -3617,15 +3617,15 @@
 
 \begin{bnf}
 \nontermdef{attribute-list}\br
-  attribute\opt\br
-  attribute-list \terminal{,} attribute\opt\br
+  attribute\opt{}\br
+  attribute-list \terminal{,} attribute\opt{}\br
   attribute \terminal{...}\br
   attribute-list \terminal{,} attribute \terminal{...}
 \end{bnf}
 
 \begin{bnf}
 \nontermdef{attribute}\br
-    attribute-token attribute-argument-clause\opt
+    attribute-token attribute-argument-clause\opt{}
 \end{bnf}
 
 \begin{bnf}