Skip to content

Commit d9acba9

Browse files
Eelisjensmaurer
authored andcommitted
[std] Harmonize indexing for list items. (#3539)
1 parent e01989e commit d9acba9

File tree

6 files changed

+49
-26
lines changed

6 files changed

+49
-26
lines changed

source/basic.tex

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2690,11 +2690,13 @@
26902690
\begin{itemize}
26912691
\item a variable; or
26922692
\item a function; or
2693-
\item \indextext{class!linkage of}%
2693+
\item
2694+
\indextext{class!linkage of}%
26942695
a named class\iref{class.pre}, or an unnamed class defined in a
26952696
typedef declaration in which the class has the typedef name for linkage
26962697
purposes\iref{dcl.typedef}; or
2697-
\item \indextext{enumeration!linkage of}%
2698+
\item
2699+
\indextext{enumeration!linkage of}%
26982700
a named enumeration\iref{dcl.enum}, or an unnamed enumeration defined
26992701
in a typedef declaration in which the enumeration has the typedef name
27002702
for linkage purposes\iref{dcl.typedef}; or
@@ -4920,7 +4922,7 @@
49204922
\item \defnx{pointers}{type!pointer} to \cv{}~\tcode{void} or objects or functions (including
49214923
static members of classes) of a given type, \ref{dcl.ptr};
49224924

4923-
\item %
4925+
\item
49244926
\indextext{reference!lvalue}%
49254927
\indextext{reference!rvalue}%
49264928
\defnx{references}{reference} to objects or functions of a given
@@ -4945,7 +4947,8 @@
49454947
Each distinct enumeration constitutes a different
49464948
\defnadj{enumerated}{type}, \ref{dcl.enum};
49474949

4948-
\item \indextext{member pointer to|see{pointer to member}}%
4950+
\item
4951+
\indextext{member pointer to|see{pointer to member}}%
49494952
\defnx{pointers to non-static class members}{pointer to member},%
49504953
\footnote{Static class members are objects or functions, and pointers to them are
49514954
ordinary pointers to objects or functions.}
@@ -5214,10 +5217,11 @@
52145217
\item The rank of \tcode{bool} shall be less than the rank of all other
52155218
standard integer types.
52165219

5220+
\item
52175221
\indextext{type!\idxcode{wchar_t}}%
52185222
\indextext{type!\idxcode{char16_t}}%
52195223
\indextext{type!\idxcode{char32_t}}%
5220-
\item The ranks of \tcode{char8_t}, \tcode{char16_t}, \tcode{char32_t}, and
5224+
The ranks of \tcode{char8_t}, \tcode{char16_t}, \tcode{char32_t}, and
52215225
\tcode{wchar_t} shall equal the ranks of their underlying
52225226
types\iref{basic.fundamental}.
52235227

source/expressions.tex

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5732,8 +5732,9 @@
57325732
\begin{itemize}
57335733
\item both operands have arithmetic or unscoped enumeration type; or
57345734

5735+
\item
57355736
\indextext{arithmetic!pointer}%
5736-
\item both operands are pointers to cv-qualified or cv-unqualified
5737+
both operands are pointers to cv-qualified or cv-unqualified
57375738
versions of the same completely-defined object type; or
57385739

57395740
\item the left operand is a pointer to a completely-defined object type
@@ -6391,8 +6392,9 @@
63916392
If either the second or the third operand has type \tcode{void},
63926393
one of the following shall hold:
63936394
\begin{itemize}
6395+
\item
63946396
\indextext{conditional-expression!throw-expression in}%
6395-
\item The second or the third operand (but not both) is a (possibly
6397+
The second or the third operand (but not both) is a (possibly
63966398
parenthesized) \grammarterm{throw-expression}\iref{expr.throw}; the result
63976399
is of the type and value category of the other.
63986400
The \grammarterm{conditional-expression}

source/lex.tex

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@
6161
occur, although in practice different phases might be folded together.}
6262

6363
\begin{enumerate}
64+
\item
6465
\indextext{character!source file}%
6566
\indextext{character set!basic source}%
66-
\item Physical source file characters are mapped, in an
67+
Physical source file characters are mapped, in an
6768
\impldef{mapping physical source file characters to basic source character set} manner,
6869
to the basic source character set (introducing new-line characters for end-of-line
6970
indicators) if necessary.
@@ -80,8 +81,9 @@
8081
uXXXX} notation), are handled equivalently
8182
except where this replacement is reverted\iref{lex.pptoken} in a raw string literal.
8283

84+
\item
8385
\indextext{line splicing}%
84-
\item Each instance of a backslash character (\textbackslash)
86+
Each instance of a backslash character (\textbackslash)
8587
immediately followed by a new-line character is deleted, splicing
8688
physical source lines to form logical source lines. Only the last
8789
backslash on any physical source line shall be eligible for being part
@@ -336,8 +338,9 @@
336338
If the input stream has been parsed into preprocessing tokens up to a
337339
given character:
338340
\begin{itemize}
341+
\item
339342
\indextext{literal!string!raw}%
340-
\item If the next character begins a sequence of characters that could be the prefix
343+
If the next character begins a sequence of characters that could be the prefix
341344
and initial double quote of a raw string literal, such as \tcode{R"}, the next preprocessing
342345
token shall be a raw string literal. Between the initial and final
343346
double quote characters of the raw string, any transformations performed in phases

source/preprocessor.tex

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,17 +1553,19 @@
15531553

15541554
\begin{description}
15551555

1556+
\item
15561557
\indextext{__CPLUSPLUS@\xname{cplusplus}}%
1557-
\item \xname{cplusplus}\\
1558+
\xname{cplusplus}\\
15581559
The integer literal \tcode{\cppver}.
15591560
\begin{note}
15601561
It is intended that future
15611562
versions of this International Standard will
15621563
replace the value of this macro with a greater value.
15631564
\end{note}
15641565

1566+
\item
15651567
\indextext{__DATE__@\mname{DATE}}%
1566-
\item \mname{DATE}\\
1568+
\mname{DATE}\\
15671569
The date of translation of the source file:
15681570
a character string literal of the form
15691571
\tcode{"Mmm~dd~yyyy"},
@@ -1578,25 +1580,29 @@
15781580
an \impldef{text of \mname{DATE} when date of translation is not available} valid date
15791581
shall be supplied.
15801582

1583+
\item
15811584
\indextext{__FILE__@\mname{FILE}}%
1582-
\item \mname{FILE}\\
1585+
\mname{FILE}\\
15831586
The presumed name of the current source file (a character string
15841587
literal).%
15851588
\footnote{The presumed source file name can be changed by the \tcode{\#line} directive.}
15861589

1590+
\item
15871591
\indextext{__LINE__@\mname{LINE}}%
1588-
\item \mname{LINE}\\
1592+
\mname{LINE}\\
15891593
The presumed line number (within the current source file) of the current source line
15901594
(an integer literal).%
15911595
\footnote{The presumed line number can be changed by the \tcode{\#line} directive.}
15921596

1597+
\item
15931598
\indextext{__STDC_HOSTED__@\mname{STDC_HOSTED}}%
1594-
\item \mname{STDC_HOSTED}\\
1599+
\mname{STDC_HOSTED}\\
15951600
The integer literal \tcode{1} if the implementation is a hosted
15961601
implementation or the integer literal \tcode{0} if it is not.
15971602

1603+
\item
15981604
\indextext{__STDCPP_DEFAULT_NEW_ALIGNMENT__@\mname{STDCPP_DEFAULT_NEW_ALIGNMENT}}%
1599-
\item \mname{STDCPP_DEFAULT_NEW_ALIGNMENT}\\
1605+
\mname{STDCPP_DEFAULT_NEW_ALIGNMENT}\\
16001606
An integer literal of type \tcode{std::size_t}
16011607
whose value is the alignment guaranteed
16021608
by a call to \tcode{operator new(std::size_t)}
@@ -1606,8 +1612,9 @@
16061612
\tcode{operator new(std::size_t, std::align_val_t)}, etc.\iref{expr.new}.
16071613
\end{note}
16081614

1615+
\item
16091616
\indextext{__TIME__@\mname{TIME}}%
1610-
\item \mname{TIME}\\
1617+
\mname{TIME}\\
16111618
The time of translation of the source file:
16121619
a character string literal of the form
16131620
\tcode{"hh:mm:ss"}
@@ -1698,24 +1705,28 @@
16981705
The following macro names are conditionally defined by the implementation:
16991706

17001707
\begin{description}
1708+
\item
17011709
\indextext{__STDC__@\mname{STDC}}%
1702-
\item \mname{STDC}\\
1710+
\mname{STDC}\\
17031711
Whether \mname{STDC} is predefined and if so, what its value is,
17041712
are \impldef{definition and meaning of \mname{STDC}}.
17051713

1714+
\item
17061715
\indextext{__STDC_MB_MIGHT_NEQ_WC__@\mname{STDC_MB_MIGHT_NEQ_WC}}%
1707-
\item \mname{STDC_MB_MIGHT_NEQ_WC}\\
1716+
\mname{STDC_MB_MIGHT_NEQ_WC}\\
17081717
The integer literal \tcode{1}, intended to indicate that, in the encoding for
17091718
\tcode{wchar_t}, a member of the basic character set need not have a code value equal to
17101719
its value when used as the lone character in an ordinary character literal.
17111720

1721+
\item
17121722
\indextext{__STDC_VERSION__@\mname{STDC_VERSION}}%
1713-
\item \mname{STDC_VERSION}\\
1723+
\mname{STDC_VERSION}\\
17141724
Whether \mname{STDC_VERSION} is predefined and if so, what its value is,
17151725
are \impldef{definition and meaning of \mname{STDC_VERSION}}.
17161726

1727+
\item
17171728
\indextext{__STDC_ISO_10646__@\mname{STDC_ISO_10646}}%
1718-
\item \mname{STDC_ISO_10646}\\
1729+
\mname{STDC_ISO_10646}\\
17191730
An integer literal of the form \tcode{yyyymmL} (for example,
17201731
\tcode{199712L}).
17211732
If this symbol is defined, then every character in the Unicode required set, when
@@ -1724,13 +1735,15 @@
17241735
the characters that are defined by ISO/IEC 10646, along with
17251736
all amendments and technical corrigenda as of the specified year and month.
17261737

1738+
\item
17271739
\indextext{__STDCPP_STRICT_POINTER_SAFETY__@\mname{STDCPP_STRICT_POINTER_SAFETY}}%
1728-
\item \mname{STDCPP_STRICT_POINTER_SAFETY}\\
1740+
\mname{STDCPP_STRICT_POINTER_SAFETY}\\
17291741
Defined, and has the value integer literal 1, if and only if the implementation
17301742
has strict pointer safety\iref{basic.stc.dynamic.safety}.
17311743

1744+
\item
17321745
\indextext{__STDCPP_THREADS__@\mname{STDCPP_THREADS}}%
1733-
\item \mname{STDCPP_THREADS}\\
1746+
\mname{STDCPP_THREADS}\\
17341747
Defined, and has the value integer literal 1, if and only if a program
17351748
can have more than one thread of execution\iref{intro.multithread}.
17361749

source/threads.tex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5278,8 +5278,9 @@
52785278
Repeatedly performs the following steps, in order:
52795279
\begin{itemize}
52805280
\item Evaluates \tcode{try_acquire}. If the result is \tcode{true}, returns.
5281+
\item
52815282
\indextext{block (execution)}%
5282-
\item Blocks on \tcode{*this} until \tcode{counter} is greater than zero.
5283+
Blocks on \tcode{*this} until \tcode{counter} is greater than zero.
52835284
\end{itemize}
52845285

52855286
\pnum

source/utilities.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6441,8 +6441,8 @@
64416441
\item
64426442
\tcode{N} characters have been extracted and stored;
64436443
\item
6444-
end-of-file occurs on the input sequence;%
6445-
\indextext{end-of-file}
6444+
\indextext{end-of-file}%
6445+
end-of-file occurs on the input sequence;
64466446
\item
64476447
the next input character is neither
64486448
\tcode{is.widen('0')}

0 commit comments

Comments
 (0)