From 9b23d5ac337532f330a32ee974f96bcb27dab6d8 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 2 Mar 2023 12:27:19 +0000 Subject: [PATCH 1/2] [temp.expl.spec] Use normal spacing after "etc." within a sentence --- source/templates.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/templates.tex b/source/templates.tex index c726e771ff..726f43c550 100644 --- a/source/templates.tex +++ b/source/templates.tex @@ -6436,7 +6436,7 @@ The definition of an explicitly specialized class is unrelated to the definition of a generated specialization. That is, its members need -not have the same names, types, etc. as the members of a generated +not have the same names, types, etc.\ as the members of a generated specialization. Members of an explicitly specialized class template are defined in the same manner as members of normal classes, and From 8ee01ea0fd9d0dcfe054494dd2e8ea9bd0544ab2 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 2 Mar 2023 12:58:40 +0000 Subject: [PATCH 2/2] Consistent comma after e.g. and i.e. (again) --- source/basic.tex | 2 +- source/containers.tex | 2 +- source/declarations.tex | 2 +- source/expressions.tex | 4 ++-- source/styles.tex | 2 +- source/support.tex | 3 +-- source/tables.tex | 2 +- source/templates.tex | 2 +- source/time.tex | 6 +++--- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/source/basic.tex b/source/basic.tex index bd155ed606..f4b5675a63 100644 --- a/source/basic.tex +++ b/source/basic.tex @@ -993,7 +993,7 @@ \begin{note} Overload resolution can consider potentially conflicting declarations found in multiple scopes -(e.g. via \grammarterm{using-directive}s or for operator functions), +(e.g., via \grammarterm{using-directive}s or for operator functions), in which case it is often ambiguous. \end{note} \begin{example} diff --git a/source/containers.tex b/source/containers.tex index 7f199142f6..6097a629b3 100644 --- a/source/containers.tex +++ b/source/containers.tex @@ -497,7 +497,7 @@ \pnum \returns \tcode{distance(c.begin(), c.end())}, -i.e. the number of elements in the container. +i.e., the number of elements in the container. \pnum \complexity diff --git a/source/declarations.tex b/source/declarations.tex index a63c317a72..1ae9060b62 100644 --- a/source/declarations.tex +++ b/source/declarations.tex @@ -6300,7 +6300,7 @@ is implicitly defined at the point where it is explicitly defaulted; if such a function is implicitly defined as deleted, the program is ill-formed. A non-user-provided defaulted function -(i.e. implicitly declared or explicitly defaulted in the class) +(i.e., implicitly declared or explicitly defaulted in the class) that is not defined as deleted is implicitly defined when it is odr-used\iref{basic.def.odr} or needed for constant evaluation\iref{expr.const}. \begin{note} diff --git a/source/expressions.tex b/source/expressions.tex index 67edaeebf1..cf18e4e946 100644 --- a/source/expressions.tex +++ b/source/expressions.tex @@ -321,7 +321,7 @@ that does not denote an object of type \cv{}~\keyword{U} within its lifetime, the behavior is undefined. \begin{note} -In C, an entire object of structure type can be accessed, e.g. using assignment. +In C, an entire object of structure type can be accessed, e.g., using assignment. By contrast, \Cpp{} has no notion of accessing an object of class type through an lvalue of class type. \end{note} @@ -7262,7 +7262,7 @@ \pnum \begin{note} In contexts where the comma token is given special meaning -(e.g. function calls\iref{expr.call}, +(e.g., function calls\iref{expr.call}, subscript expressions\iref{expr.sub}, lists of initializers\iref{dcl.init}, or \grammarterm{template-argument-list}{s}\iref{temp.names}), diff --git a/source/styles.tex b/source/styles.tex index a5dd6c9ee9..02e91267c0 100644 --- a/source/styles.tex +++ b/source/styles.tex @@ -262,7 +262,7 @@ \ifvmode\else\par\fi\lst@emptylinepenalty \vskip\parskip \vskip\baselineskip - % \lsthk@EveryLine has \lst@parshape, i.e. \parshape, which causes an \hbox + % \lsthk@EveryLine has \lst@parshape, i.e., \parshape, which causes an \hbox % \lsthk@EveryPar increments line counters; \refstepcounter balloons the PDF \global\advance\lst@newlines\m@ne \lst@newlinetrue} diff --git a/source/support.tex b/source/support.tex index f39273e2f3..9285a64420 100644 --- a/source/support.tex +++ b/source/support.tex @@ -1155,8 +1155,7 @@ For integer types, specifies the base of the representation. \begin{footnote} -Distinguishes types with bases other than 2 (e.g. -BCD). +Distinguishes types with bases other than 2 (e.g., BCD). \end{footnote} \pnum diff --git a/source/tables.tex b/source/tables.tex index b5c14fa689..c1f20586f0 100644 --- a/source/tables.tex +++ b/source/tables.tex @@ -63,7 +63,7 @@ % General Usage: TITLE is the title of the table, XREF is the % cross-reference for the table. LAYOUT is a sequence of column -% type specifiers (e.g. cp{1.0}c), without '|' for the left edge +% type specifiers (e.g., cp{1.0}c), without '|' for the left edge % or right edge. % usage: \begin{floattablebase}{TITLE}{XREF}{LAYOUT}{PLACEMENT} diff --git a/source/templates.tex b/source/templates.tex index 726f43c550..d7c32df3ad 100644 --- a/source/templates.tex +++ b/source/templates.tex @@ -2840,7 +2840,7 @@ \begin{itemize} \item % Note: "\space" used below because " " inside tcode adds too much whitespace; -% one could optionally use mathfont inside tcode, e.g. "\tcode{($ $}". +% one could optionally use mathfont inside tcode, e.g., "\tcode{($ $}". \tcode{(}\space \tcode{((}$\mathtt{E}_1$ \placeholder{op} $\mathtt{E}_2$\tcode{)} diff --git a/source/time.tex b/source/time.tex index 04f414aba6..b17abd952d 100644 --- a/source/time.tex +++ b/source/time.tex @@ -10560,7 +10560,7 @@ to format as a \tcode{weekday}. \end{example} However, if a flag refers to a ``time of day'' -(e.g. \tcode{\%H}, \tcode{\%I}, \tcode{\%p}, etc.), +(e.g., \tcode{\%H}, \tcode{\%I}, \tcode{\%p}, etc.), then a specialization of \tcode{duration} is interpreted as the time of day elapsed since midnight. @@ -11174,7 +11174,7 @@ A \tcode{duration} cannot represent a \tcode{weekday}. \end{example} However, if a flag refers to a ``time of day'' -(e.g. \tcode{\%H}, \tcode{\%I}, \tcode{\%p}, etc.), +(e.g., \tcode{\%H}, \tcode{\%I}, \tcode{\%p}, etc.), then a specialization of \tcode{duration} is parsed as the time of day elapsed since midnight. @@ -11401,7 +11401,7 @@ \tcode{\%y} & The last two decimal digits of the year. If the century is not otherwise specified -(e.g. with \tcode{\%C}), +(e.g., with \tcode{\%C}), values in the range \crange{69}{99} are presumed to refer to the years 1969 to 1999, and values in the range \crange{00}{68}