Move \opt out of \grammarterm (#1554)

Author: timsong-cpp

source/declarations.tex

@@ -1969,7 +1969,7 @@
 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
@@ -2473,7 +2473,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}.

source/declarators.tex

@@ -432,7 +432,7 @@
 
 where
 \tcode{T}
-is of the form \grammarterm{attribute-specifier-seq\opt}
+is of the form \grammarterm{attribute-specifier-seq}\opt{}
 \grammarterm{decl-specifier-seq}
 and
 \tcode{D}
@@ -474,7 +474,7 @@
 
 \pnum
 In a declaration
-\grammarterm{attribute-specifier-seq\opt}
+\grammarterm{attribute-specifier-seq}\opt{}
 \tcode{T}
 \tcode{D}
 where
@@ -1258,7 +1258,7 @@
 \tcode{noexcept}\opt
 function of
 (\grammarterm{parameter-declaration-clause} )
-\grammarterm{cv-qualifier-seq\opt} \grammarterm{ref-qualifier\opt}
+\grammarterm{cv-qualifier-seq}\opt{} \grammarterm{ref-qualifier}\opt{}
 returning \tcode{T}'',
 where the optional \tcode{noexcept} is present
 if and only if

source/expressions.tex

@@ -1916,7 +1916,7 @@
 
 \item Otherwise, if \tcode{E1.E2} refers to a non-static member
 function and the type of \tcode{E2} is ``function of
-parameter-type-list \cvqual{cv} \grammarterm{ref-qualifier\opt} returning \tcode{T}'', then
+parameter-type-list \cvqual{cv} \grammarterm{ref-qualifier}\opt{} returning \tcode{T}'', then
 \tcode{E1.E2} is a prvalue. The expression designates a
 non-static member function. The expression can be used only as the
 left-hand operand of a member function call~(\ref{class.mfct}).

source/iostreams.tex

@@ -10113,8 +10113,8 @@
 A sequence of elements that identify
 the location of a file within a filesystem.
 The elements are the
-\grammarterm{root-name\opt},
-\grammarterm{root-directory\opt},
+\grammarterm{root-name}\opt{},
+\grammarterm{root-directory}\opt{},
 and an optional sequence of filenames.
 The maximum number of elements in the sequence is operating system dependent.