Remove \xspace

source/access.tex

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

source/algorithms.tex

@@ -4,7 +4,7 @@
 \rSec1[algorithms.general]{General}
 
 \pnum
-This Clause describes components that \Cpp programs may use to perform
+This Clause describes components that \Cpp{} programs may use to perform
 algorithmic operations on containers\iref{containers} and other sequences.
 
 \pnum
@@ -1226,7 +1226,7 @@
 \rSec1[algorithms.parallel]{Parallel algorithms}
 
 \pnum
-This section describes components that \Cpp programs may use to perform
+This section describes components that \Cpp{} programs may use to perform
 operations on containers and other sequences in parallel.
 
 \rSec2[algorithms.parallel.defns]{Terms and definitions}
@@ -4407,10 +4407,10 @@
 The resulting range shall not overlap with either of the original ranges.
 
 \pnum
-\effects\ Copies all the elements of the two ranges \range{first1}{last1} and
+\effects Copies all the elements of the two ranges \range{first1}{last1} and
 \range{first2}{last2} into the range \range{result}{result_last}, where \tcode{result_last}
 is \tcode{result + (last1 - first1) + (last2 - first2)}, such that the resulting range satisfies
-\tcode{is_sorted(result, result_last)} or \tcode{is_sorted(result, result_last, comp)}, respectively.
+\tcode{is_sorted(result, result_last)} or \tcode{is_sorted(\brk{}result, result_last, comp)}, respectively.
 
 \pnum
 \returns

source/back.tex

@@ -35,7 +35,7 @@ \chapter{Bibliography}
 \input{xrefdelta}
 \renewcommand{\glossaryname}{Cross references from ISO \CppXVII}
 \renewcommand{\preglossaryhook}{All section labels from
-ISO \CppXVII (ISO/IEC 14882:2017, \doccite{Programming Languages --- \Cpp})
+ISO \CppXVII{} (ISO/IEC 14882:2017, \doccite{Programming Languages --- \Cpp{}})
 are present in this document, with the exceptions described below.\\}
 \renewcommand{\leftmark}{\glossaryname}
 {

source/basic.tex

@@ -4,11 +4,11 @@
 \gramSec[gram.basic]{Basic concepts}
 
 \pnum
-\begin{note} This Clause presents the basic concepts of the \Cpp language.
+\begin{note} This Clause presents the basic concepts of the \Cpp{} language.
 It explains the difference between an object and a
 name and how they relate to the value categories for expressions.
 It introduces the concepts of a
-declaration and a definition and presents \Cpp's
+declaration and a definition and presents \Cpp{}'s
 notion of type, scope, linkage, and
 storage duration. The mechanisms for starting and
 terminating a program are discussed. Finally, this Clause presents the
@@ -206,7 +206,7 @@
 \pnum
 \begin{note}
 \indextext{implementation-generated}%
-In some circumstances, \Cpp implementations implicitly define the
+In some circumstances, \Cpp{} implementations implicitly define the
 default constructor\iref{class.ctor},
 copy constructor\iref{class.copy},
 move constructor\iref{class.copy},
@@ -687,7 +687,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
@@ -1664,7 +1664,7 @@
 \grammarterm{qualified-id} of the form:
 
 \begin{ncbnf}
-nested-name-specifier\opt class-name \terminal{::} \terminal{\tilde} class-name
+\opt{nested-name-specifier} class-name \terminal{::} \terminal{\tilde} class-name
 \end{ncbnf}
 
 the second \grammarterm{class-name} is looked up in the same scope as the
@@ -2024,7 +2024,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
@@ -2039,7 +2039,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
@@ -2205,7 +2205,7 @@
 
 \begin{bnf}
 \nontermdef{translation-unit}\br
-    declaration-seq\opt
+    \opt{declaration-seq}
 \end{bnf}
 
 \pnum
@@ -2429,7 +2429,7 @@
 identity does not require a diagnostic.
 
 \pnum
-\begin{note} Linkage to non-\Cpp declarations can be achieved using a
+\begin{note} Linkage to non-\Cpp{} declarations can be achieved using a
 \grammarterm{linkage-specification}\iref{dcl.link}. \end{note}%
 \indextext{linkage|)}
 
@@ -2455,7 +2455,7 @@
 
 \pnum
 An implementation shall not predefine the \tcode{main} function. This
-function shall not be overloaded.  Its type shall have \Cpp language linkage
+function shall not be overloaded.  Its type shall have \Cpp{} language linkage
 and it shall have a declared return type of type
 \tcode{int}, but otherwise its type is \impldef{parameters to \tcode{main}}.
 \indextext{\idxcode{main} function!implementation-defined parameters to}%
@@ -2479,7 +2479,7 @@
 \tcode{argv[0]} through \tcode{argv[argc-1]} as pointers to the initial
 characters of null-terminated multibyte strings (\ntmbs{}s)\iref{multibyte.strings}
 and \tcode{argv[0]} shall be the pointer to
-the initial character of a \ntmbs that represents the name used to
+the initial character of a \ntmbs{} that represents the name used to
 invoke the program or \tcode{""}. The value of \tcode{argc} shall be
 non-negative. The value of \tcode{argv[argc]} shall be 0. \begin{note} It
 is recommended that any further (optional) parameters be added after
@@ -2952,7 +2952,7 @@
 \indextext{\idxcode{new}}%
 \grammarterm{new-expression}{s}\iref{expr.new}, and destroyed using
 \indextext{\idxcode{delete}}%
-\grammarterm{delete-expression}{s}\iref{expr.delete}. A \Cpp implementation
+\grammarterm{delete-expression}{s}\iref{expr.delete}. A \Cpp{} implementation
 provides access to, and management of, dynamic storage via the global
 \defn{allocation functions} \tcode{operator new} and \tcode{operator
 new[]} and the global \defn{deallocation functions} \tcode{operator
@@ -2965,7 +2965,7 @@
 \pnum
 The library provides default definitions for the global allocation and
 deallocation functions. Some global allocation and deallocation
-functions are replaceable\iref{new.delete}. A \Cpp program shall
+functions are replaceable\iref{new.delete}. A \Cpp{} program shall
 provide at most one definition of a replaceable allocation or
 deallocation function. Any such function definition replaces the default
 version provided in the library\iref{replacement.functions}. The
@@ -3011,7 +3011,7 @@
 class\iref{class.free}.
 
 \pnum
-Any allocation and/or deallocation functions defined in a \Cpp program,
+Any allocation and/or deallocation functions defined in a \Cpp{} program,
 including the default versions in the library, shall conform to the
 semantics specified in~\ref{basic.stc.dynamic.allocation}
 and~\ref{basic.stc.dynamic.deallocation}.
@@ -3059,7 +3059,7 @@
 returned as a request for zero size is undefined.\footnote{The intent is
 to have \tcode{operator new()} implementable by
 calling \tcode{std::malloc()} or \tcode{std::calloc()}, so the rules are
-substantially the same. \Cpp differs from C in requiring a zero request
+substantially the same. \Cpp{} differs from C in requiring a zero request
 to return a non-null pointer.}
 
 \pnum
@@ -3082,7 +3082,7 @@
 A global allocation function is only called as the result of a new
 expression\iref{expr.new}, or called directly using the function call
 syntax\iref{expr.call}, or called indirectly through calls to the
-functions in the \Cpp standard library. \begin{note} In particular, a
+functions in the \Cpp{} standard library. \begin{note} In particular, a
 global allocation function is not called to allocate storage for objects
 with static storage duration\iref{basic.stc.static}, for objects or references
 with thread storage duration\iref{basic.stc.thread}, for objects of
@@ -3165,12 +3165,12 @@
 A pointer value is a \defn{safely-derived pointer} to a dynamic object only if it
 has an object pointer type and it is one of the following:
 \begin{itemize}
-\item the value returned by a call to the \Cpp standard library implementation of
+\item the value returned by a call to the \Cpp{} standard library implementation of
 \tcode{::operator new(std::\brk{}size_t)} or
 \tcode{::operator new(std::size_t, std::align_val_t)}%
 ;\footnote{This section does not impose restrictions
 on indirection through pointers to memory not allocated by \tcode{::operator new}. This
-maintains the ability of many \Cpp implementations to use binary libraries and
+maintains the ability of many \Cpp{} implementations to use binary libraries and
 components written in other languages. In particular, this applies to C binaries,
 because indirection through pointers to memory allocated by \tcode{std::malloc} is not restricted.}
 
@@ -3578,7 +3578,7 @@
 a set of bits in the object representation that determines a
 \defn{value}, which is one discrete element of an
 \impldef{values of a trivially copyable type} set of values.\footnote{The
-intent is that the memory model of \Cpp is compatible
+intent is that the memory model of \Cpp{} is compatible
 with that of ISO/IEC 9899 Programming Language C.}
 
 \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}
@@ -441,13 +441,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
@@ -465,10 +465,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}
@@ -1314,7 +1314,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}%