Skip to content

Commit 48a88f4

Browse files
committed
Use 'subclause', not 'section'.
The ISO Directives, Part 2, prescribe the term 'subclause'. Fixes #307.
1 parent e030dc8 commit 48a88f4

22 files changed

+100
-100
lines changed

source/algorithms.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@
12261226
\rSec1[algorithms.parallel]{Parallel algorithms}
12271227

12281228
\pnum
1229-
This section describes components that \Cpp programs may use to perform
1229+
This subclause describes components that \Cpp programs may use to perform
12301230
operations on containers and other sequences in parallel.
12311231

12321232
\rSec2[algorithms.parallel.defns]{Terms and definitions}
@@ -3928,7 +3928,7 @@
39283928
\rSec2[alg.binary.search]{Binary search}
39293929

39303930
\pnum
3931-
All of the algorithms in this section are versions of binary search
3931+
All of the algorithms in this subclause are versions of binary search
39323932
and assume that the sequence being searched is partitioned with respect to
39333933
an expression formed by binding the search key to an argument of the
39343934
implied or explicit comparison function.
@@ -4487,7 +4487,7 @@
44874487
\rSec2[alg.set.operations]{Set operations on sorted structures}
44884488

44894489
\pnum
4490-
This section defines all the basic set operations on sorted structures.
4490+
This subclause defines all the basic set operations on sorted structures.
44914491
They also work with
44924492
\tcode{multiset}s~(\ref{multiset})
44934493
containing multiple copies of equivalent elements.

source/atomics.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@
14151415
\rSec1[atomics.fences]{Fences}
14161416

14171417
\pnum
1418-
This section introduces synchronization primitives called \term{fences}. Fences can have
1418+
This subclause introduces synchronization primitives called \term{fences}. Fences can have
14191419
acquire semantics, release semantics, or both. A fence with acquire semantics is called
14201420
an \term{acquire fence}. A fence with release semantics is called a \term{release
14211421
fence}.

source/back.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
\clearpage
99
\renewcommand{\glossaryname}{Cross references}
10-
\renewcommand{\preglossaryhook}{This annex lists each section label and the
11-
corresponding section number and page number, in alphabetical order by label.\\}
10+
\renewcommand{\preglossaryhook}{This annex lists each subclause label and the
11+
corresponding subclause number and page number, in alphabetical order by label.\\}
1212
\twocolglossary
1313
\renewcommand{\leftmark}{\glossaryname}
1414
{
@@ -19,7 +19,7 @@
1919
\clearpage
2020
\input{xrefdelta}
2121
\renewcommand{\glossaryname}{Cross references from ISO \CppXIV}
22-
\renewcommand{\preglossaryhook}{All section labels from
22+
\renewcommand{\preglossaryhook}{All subclause labels from
2323
ISO \CppXIV (ISO/IEC 14882:2014, \doccite{Programming Languages --- \Cpp})
2424
are present in this document, with the exceptions described below.\\}
2525
\renewcommand{\leftmark}{\glossaryname}
@@ -56,7 +56,7 @@
5656
}
5757

5858
\clearpage
59-
\renewcommand{\preindexhook}{The entries in this section are rough descriptions; exact
59+
\renewcommand{\preindexhook}{The entries in this subclause are rough descriptions; exact
6060
specifications are at the indicated page in the general text.\\}
6161
\renewcommand{\indexname}{Index of implementation-defined behavior}
6262
\renewcommand{\leftmark}{\indexname}

source/basic.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3161,7 +3161,7 @@
31613161
\item the value returned by a call to the \Cpp standard library implementation of
31623162
\tcode{::operator new(std::\brk{}size_t)} or
31633163
\tcode{::operator new(std::size_t, std::align_val_t)}%
3164-
;\footnote{This section does not impose restrictions
3164+
;\footnote{This subclause does not impose restrictions
31653165
on indirection through pointers to memory not allocated by \tcode{::operator new}. This
31663166
maintains the ability of many \Cpp implementations to use binary libraries and
31673167
components written in other languages. In particular, this applies to C binaries,
@@ -3489,7 +3489,7 @@
34893489
\end{example}
34903490

34913491
\pnum
3492-
In this section, ``before'' and ``after'' refer to the ``happens before''
3492+
In this subclause, ``before'' and ``after'' refer to the ``happens before''
34933493
relation~(\ref{intro.multithread}). \begin{note} Therefore, undefined behavior results
34943494
if an object that is being constructed in one thread is referenced from another
34953495
thread without adequate synchronization. \end{note}%
@@ -3814,7 +3814,7 @@
38143814
unsigned integer types are collectively called the
38153815
\defnx{extended integer types}{extended integer type}.
38163816
The signed and unsigned integer types shall satisfy
3817-
the constraints given in the C standard, section 5.2.4.2.1.
3817+
the constraints given in the C standard, subclause 5.2.4.2.1.
38183818

38193819
\pnum
38203820
\indextext{arithmetic!\idxcode{unsigned}}%

source/containers.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7631,7 +7631,7 @@
76317631
An \tcode{unordered_map} satisfies all of the requirements of a container, of an unordered associative container, and of an allocator-aware container (Table~\ref{tab:containers.allocatoraware}). It provides the operations described in the preceding requirements table for unique keys; that is, an \tcode{unordered_map} supports the \tcode{a_uniq} operations in that table, not the \tcode{a_eq} operations. For an \tcode{unordered_map<Key, T>} the \tcode{key type} is \tcode{Key}, the mapped type is \tcode{T}, and the value type is \tcode{pair<const Key, T>}.
76327632

76337633
\pnum
7634-
This section only describes operations on \tcode{unordered_map} that
7634+
This subclause only describes operations on \tcode{unordered_map} that
76357635
are not described in one of the requirement tables, or for which there
76367636
is additional semantic information.
76377637

@@ -8198,7 +8198,7 @@
81988198
mapped type is \tcode{T}, and the value type is \tcode{pair<const Key, T>}.
81998199

82008200
\pnum
8201-
This section only describes operations on \tcode{unordered_multimap}
8201+
This subclause only describes operations on \tcode{unordered_multimap}
82028202
that are not described in one of the requirement tables, or for which
82038203
there is additional semantic information.
82048204

@@ -8549,7 +8549,7 @@
85498549
An \tcode{unordered_set} satisfies all of the requirements of a container, of an unordered associative container, and of an allocator-aware container (Table~\ref{tab:containers.allocatoraware}). It provides the operations described in the preceding requirements table for unique keys; that is, an \tcode{unordered_set} supports the \tcode{a_uniq} operations in that table, not the \tcode{a_eq} operations. For an \tcode{unordered_set<Key>} the \tcode{key type} and the value type are both \tcode{Key}. The \tcode{iterator} and \tcode{const_iterator} types are both constant iterator types. It is unspecified whether they are the same type.
85508550

85518551
\pnum
8552-
This section only describes operations on \tcode{unordered_set} that
8552+
This subclause only describes operations on \tcode{unordered_set} that
85538553
are not described in one of the requirement tables, or for which there
85548554
is additional semantic information.
85558555

@@ -8859,7 +8859,7 @@
88598859
constant iterator types. It is unspecified whether they are the same type.
88608860

88618861
\pnum
8862-
This section only describes operations on \tcode{unordered_multiset} that
8862+
This subclause only describes operations on \tcode{unordered_multiset} that
88638863
are not described in one of the requirement tables, or for which there
88648864
is additional semantic information.
88658865

source/declarations.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@
977977
point of call is to be preferred to the usual function call mechanism.
978978
An implementation is not required to perform this inline substitution at
979979
the point of call; however, even if this inline substitution is omitted,
980-
the other rules for inline functions specified in this section shall
980+
the other rules for inline functions specified in this subclause shall
981981
still be respected.
982982

983983
\pnum
@@ -1110,7 +1110,7 @@
11101110
Clause~\ref{class},
11111111
and
11121112
\ref{temp.res}, respectively. The remaining
1113-
\grammarterm{type-specifier}{s} are discussed in the rest of this section.
1113+
\grammarterm{type-specifier}{s} are discussed in the rest of this subclause.
11141114
\end{note}
11151115

11161116
\rSec3[dcl.type.cv]{The \grammarterm{cv-qualifier}{s}}%
@@ -1620,7 +1620,7 @@
16201620

16211621
\pnum
16221622
A program that uses \tcode{auto} or \tcode{decltype(auto)} in a context not
1623-
explicitly allowed in this section is ill-formed.
1623+
explicitly allowed in this subclause is ill-formed.
16241624

16251625
\pnum
16261626
If the \grammarterm{init-declarator-list} contains more than one

source/declarators.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2966,7 +2966,7 @@
29662966
to convert the expression, the program is ill-formed.
29672967
\begin{note} If an \grammarterm{initializer-clause} is itself an initializer list,
29682968
the element is list-initialized, which will result in a recursive application
2969-
of the rules in this section if the element is an aggregate. \end{note}
2969+
of the rules in this subclause if the element is an aggregate. \end{note}
29702970
\begin{example}
29712971
\begin{codeblock}
29722972
struct A {
@@ -3792,7 +3792,7 @@
37923792

37933793
\item Otherwise, if \tcode{T} is a character array and the initializer list has a
37943794
single element that is an appropriately-typed string literal~(\ref{dcl.init.string}),
3795-
initialization is performed as described in that section.
3795+
initialization is performed as described in that subclause.
37963796

37973797
\item Otherwise, if \tcode{T} is an aggregate, aggregate initialization is
37983798
performed~(\ref{dcl.init.aggr}).

source/exceptions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
\end{example}
181181

182182
\pnum
183-
In this section, ``before'' and ``after'' refer to the
183+
In this subclause, ``before'' and ``after'' refer to the
184184
``sequenced before'' relation~(\ref{intro.execution}).
185185

186186
\rSec1[except.throw]{Throwing an exception}%
@@ -362,7 +362,7 @@
362362
\indextext{unwinding!stack}%
363363
As control passes from the point where an exception is thrown
364364
to a handler,
365-
destructors are invoked by a process, specified in this section, called
365+
destructors are invoked by a process, specified in this subclause, called
366366
\defn{stack unwinding}.
367367

368368
\pnum

source/expressions.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@
17661766
it is replaced by the return type
17671767
of the function selected by overload resolution
17681768
for class template deduction~(\ref{over.match.class.deduct})
1769-
for the remainder of this section.
1769+
for the remainder of this subclause.
17701770

17711771
\pnum
17721772
If the initializer is a parenthesized single expression,
@@ -2262,7 +2262,7 @@
22622262
the result refers to the object or the specified base class subobject
22632263
thereof; otherwise, the lvalue-to-rvalue conversion~(\ref{conv.lval})
22642264
is applied to the bit-field and the resulting prvalue is used as the
2265-
\grammarterm{expression} of the \tcode{static_cast} for the remainder of this section.
2265+
\grammarterm{expression} of the \tcode{static_cast} for the remainder of this subclause.
22662266
If \tcode{T2} is an inaccessible (Clause~\ref{class.access}) or
22672267
ambiguous~(\ref{class.member.lookup}) base class of \tcode{T1},
22682268
a program that necessitates such a cast is ill-formed.
@@ -2604,7 +2604,7 @@
26042604

26052605
\pnum
26062606
\begin{note}
2607-
Subject to the restrictions in this section, an expression may be cast
2607+
Subject to the restrictions in this subclause, an expression may be cast
26082608
to its own type using a \tcode{const_cast} operator.
26092609
\end{note}
26102610

@@ -3592,7 +3592,7 @@
35923592
If the operand has a class type, the operand is converted to a pointer
35933593
type by calling the above-mentioned conversion function, and the
35943594
converted operand is used in place of the original operand for the
3595-
remainder of this section.
3595+
remainder of this subclause.
35963596
\indextext{object!delete}%
35973597
In the first alternative
35983598
(\term{delete object}), the value of the operand of \tcode{delete} may
@@ -4582,7 +4582,7 @@
45824582
of the same value category and
45834583
of types \cvqual{cv1} \tcode{T} and \cvqual{cv2} \tcode{T}, respectively,
45844584
the operands are considered to be of type \cvqual{cv} \tcode{T}
4585-
for the remainder of this section,
4585+
for the remainder of this subclause,
45864586
where \cvqual{cv} is the union of \cvqual{cv1} and \cvqual{cv2}.
45874587

45884588
\pnum
@@ -4639,7 +4639,7 @@
46394639
Otherwise, if exactly one conversion sequence can be formed,
46404640
that conversion is applied to the chosen operand
46414641
and the converted operand is used in place of the original operand for
4642-
the remainder of this section.
4642+
the remainder of this subclause.
46434643
\begin{note}
46444644
The conversion might be ill-formed even if an implicit conversion
46454645
sequence could be formed.
@@ -4659,7 +4659,7 @@
46594659
If the overload resolution fails, the program is ill-formed. Otherwise,
46604660
the conversions thus determined are applied, and the converted operands
46614661
are used in place of the original operands for the remainder of this
4662-
section.
4662+
subclause.
46634663

46644664
\pnum
46654665
Lvalue-to-rvalue~(\ref{conv.lval}), array-to-pointer~(\ref{conv.array}),

source/future.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
is defined as:
1212
Normative for the current edition of this International Standard,
1313
but having been identified as a candidate for removal from future revisions.
14-
An implementation may declare library names and entities described in this section with the
14+
An implementation may declare library names and entities described in this subclause with the
1515
\tcode{deprecated} attribute~(\ref{dcl.attr.deprecated}).
1616

1717
\rSec1[depr.static_constexpr]{Redeclaration of \tcode{static constexpr} data members}

source/intro.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@
10751075
and they are not potentially concurrent~(\ref{intro.multithread}),
10761076
the behavior is undefined.
10771077
\begin{note}
1078-
The next section imposes similar, but more complex restrictions on
1078+
The next subclause imposes similar, but more complex restrictions on
10791079
potentially concurrent computations.
10801080
\end{note}
10811081

@@ -1174,7 +1174,7 @@
11741174
initial value of the object, a value assigned to the object by \placeholder{T}, or a
11751175
value assigned to the object by another thread, according to the rules below.
11761176
\begin{note} In some cases, there may instead be undefined behavior. Much of this
1177-
section is motivated by the desire to support atomic operations with explicit
1177+
subclause is motivated by the desire to support atomic operations with explicit
11781178
and detailed visibility constraints. However, it also implicitly supports a
11791179
simpler view for more restricted programs. \end{note}
11801180

source/iostreams.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10746,7 +10746,7 @@
1074610746

1074710747
\pnum
1074810748
\begin{note}
10749-
The format conversions described in this section
10749+
The format conversions described in this subclause
1075010750
are not applied on POSIX-based operating systems
1075110751
because on these systems:
1075210752
\begin{itemize}

source/iterators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3062,7 +3062,7 @@
30623062
\rSec3[istreambuf.iterator.cons]{\tcode{istreambuf_iterator} constructors}
30633063

30643064
\pnum
3065-
For each \tcode{istreambuf_iterator} constructor in this section,
3065+
For each \tcode{istreambuf_iterator} constructor in this subclause,
30663066
an end-of-stream iterator is constructed if and only if
30673067
the exposition-only member \tcode{sbuf_} is initialized with a null pointer value.
30683068

source/lib-intro.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@
13181318
\rSec3[using.overview]{Overview}
13191319

13201320
\pnum
1321-
This section describes how a \Cpp program gains access to the facilities of the
1321+
This subclause describes how a \Cpp program gains access to the facilities of the
13221322
\Cpp standard library. \ref{using.headers} describes effects during translation
13231323
phase 4, while~\ref{using.linkage} describes effects during phase
13241324
8~(\ref{lex.phases}).
@@ -2145,7 +2145,7 @@
21452145
\rSec3[constraints.overview]{Overview}
21462146

21472147
\pnum
2148-
This section describes restrictions on \Cpp programs that use the facilities of
2148+
This subclause describes restrictions on \Cpp programs that use the facilities of
21492149
the \Cpp standard library. The following subclauses specify constraints on the
21502150
program's use of namespaces~(\ref{namespace.std}), its use of various reserved
21512151
names~(\ref{reserved.names}), its use of headers~(\ref{alt.headers}), its use of
@@ -2641,7 +2641,7 @@
26412641
\rSec3[conforming.overview]{Overview}
26422642

26432643
\pnum
2644-
This section describes the constraints upon, and latitude of, implementations of the \Cpp standard library.
2644+
This subclause describes the constraints upon, and latitude of, implementations of the \Cpp standard library.
26452645

26462646
\pnum
26472647
An implementation's use of headers is discussed in~\ref{res.on.headers}, its use
@@ -2790,7 +2790,7 @@
27902790
\rSec3[res.on.data.races]{Data race avoidance}
27912791

27922792
\pnum
2793-
This section specifies requirements that implementations shall meet to prevent data
2793+
This subclause specifies requirements that implementations shall meet to prevent data
27942794
races~(\ref{intro.multithread}).
27952795
Every standard library function shall meet each requirement unless otherwise specified.
27962796
Implementations may prevent data races in cases other than those specified below.

source/macros.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@
6262

6363
%%--------------------------------------------------
6464
%% Sectioning macros.
65-
% Each section has a depth, an automatically generated section
65+
% Each subclause has a depth, an automatically generated subclause
6666
% number, a name, and a short tag. The depth is an integer in
6767
% the range [0,5]. (If it proves necessary, it wouldn't take much
6868
% programming to raise the limit from 5 to something larger.)
6969

7070

7171
% The basic sectioning command. Example:
7272
% \Sec1[intro.scope]{Scope}
73-
% defines a first-level section whose name is "Scope" and whose short
73+
% defines a first-level subclause whose name is "Scope" and whose short
7474
% tag is intro.scope. The square brackets are mandatory.
7575
\def\Sec#1[#2]#3{%
7676
\ifcase#1\let\s=\chapter

0 commit comments

Comments
 (0)