Skip to content

Commit 79bcee0

Browse files
committed
Use cxxdraft-htmlgen macros more.
1 parent a269ad1 commit 79bcee0

16 files changed

+529
-538
lines changed

source/algorithms.tex

Lines changed: 97 additions & 97 deletions
Large diffs are not rendered by default.

source/concepts.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
template<class T>
496496
concept @\deflibconcept{unsigned_integral}@ = @\libconcept{integral}@<T> && !@\libconcept{signed_integral}@<T>;
497497
template<class T>
498-
concept @\deflibconcept{floating_point}@ = @\libglobalref{is_floating_point_v}@<T>;
498+
concept @\deflibconcept{floating_point}@ = is_floating_point_v<T>;
499499
\end{itemdecl}
500500

501501
\begin{itemdescr}
@@ -747,7 +747,7 @@
747747
\begin{itemdescr}
748748
\pnum
749749
\begin{note}
750-
Unlike the \oldconcept{Destructible} requirements~(\tref{cpp17.destructible}), this
750+
Unlike the \oldconceptref{Destructible} requirements~(\tref{cpp17.destructible}), this
751751
concept forbids destructors that are potentially throwing, even if a particular
752752
invocation of the destructor does not actually throw.
753753
\end{note}

source/diagnostics.tex

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -833,9 +833,9 @@
833833

834834
// \ref{syserr}, system error support
835835
template<class T>
836-
constexpr bool @\libglobal{is_error_code_enum_v}@ = is_error_code_enum<T>::value;
836+
constexpr bool @\libglobal{is_error_code_enum_v}@ = @\libglobalref{is_error_code_enum}@<T>::value;
837837
template<class T>
838-
constexpr bool is_error_condition_enum_v = is_error_condition_enum<T>::value;
838+
constexpr bool @\libglobal{is_error_condition_enum_v}@ = @\libglobalref{is_error_condition_enum}@<T>::value;
839839
}
840840
\end{codeblock}
841841

@@ -846,9 +846,9 @@
846846
exposes the \libheader{cerrno} macros is unspecified.
847847

848848
\pnum
849-
The \tcode{is_error_code_enum} and \tcode{is_error_condition_enum} templates may be
849+
The \libglobalref{is_error_code_enum} and \libglobalref{is_error_condition_enum} templates may be
850850
specialized for program-defined types to indicate that such types are eligible
851-
for \tcode{class error_code} and \tcode{class error_condition} implicit
851+
for \tcode{class \libglobalref{error_code}} and \tcode{class \libglobalref{error_condition}} implicit
852852
conversions, respectively.
853853

854854
\rSec2[syserr.errcat]{Class \tcode{error_category}}
@@ -873,8 +873,6 @@
873873
\indexlibraryglobal{error_category}%
874874
\indexlibraryctor{error_category}%
875875
\indexlibrarydtor{error_category}%
876-
\indexlibraryglobal{generic_category}%
877-
\indexlibraryglobal{system_category}%
878876
\begin{codeblock}
879877
namespace std {
880878
class error_category {
@@ -893,8 +891,8 @@
893891
strong_ordering operator<=>(const error_category& rhs) const noexcept;
894892
};
895893

896-
const error_category& generic_category() noexcept;
897-
const error_category& system_category() noexcept;
894+
const error_category& @\libglobal{generic_category}@() noexcept;
895+
const error_category& @\libglobal{system_category}@() noexcept;
898896
}
899897
\end{codeblock}
900898

@@ -1165,7 +1163,7 @@
11651163
\begin{itemdescr}
11661164
\pnum
11671165
\constraints
1168-
\tcode{is_error_code_enum_v<ErrorCodeEnum>} is \tcode{true}.
1166+
\tcode{\libglobalref{is_error_code_enum_v}<ErrorCodeEnum>} is \tcode{true}.
11691167

11701168
\pnum
11711169
\effects
@@ -1198,7 +1196,7 @@
11981196
\begin{itemdescr}
11991197
\pnum
12001198
\constraints
1201-
\tcode{is_error_code_enum_v<ErrorCodeEnum>} is \tcode{true}.
1199+
\tcode{\libglobalref{is_error_code_enum_v}<ErrorCodeEnum>} is \tcode{true}.
12021200

12031201
\pnum
12041202
\effects

source/exec.tex

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,25 @@
3131
\capsep
3232
core &
3333
provide core execution functionality, and connection between core components &
34-
e.g., \tcode{connect}, \tcode{start} \\
34+
e.g., \libglobalref{connect}, \libglobalref{start} \\
3535
completion functions &
3636
called by senders to announce the completion of the work (success, error, or cancellation) &
37-
\tcode{set_value}, \tcode{set_error}, \tcode{set_stopped} \\
37+
\libglobalref{set_value}, \libglobalref{set_error}, \libglobalref{set_stopped} \\
3838
senders &
3939
allow the specialization of the provided sender algorithms &
4040
\begin{itemize}
41-
\item sender factories (e.g., \tcode{schedule}, \tcode{just}, \tcode{read_env})
42-
\item sender adaptors (e.g., \tcode{continues_on}, \tcode{then}, \tcode{let_value})
43-
\item sender consumers (e.g., \tcode{sync_wait})
41+
\item sender factories (e.g., \libglobalref{schedule}, \libglobalref{just}, \libglobalref{read_env})
42+
\item sender adaptors (e.g., \libglobalref{continues_on}, \libglobalref{then}, \libglobalref{let_value})
43+
\item sender consumers (e.g., \libglobalref{sync_wait})
4444
\end{itemize}
4545
\\
4646
queries &
4747
allow querying different properties of objects &
4848
\begin{itemize}
49-
\item general queries (e.g., \tcode{get_allocator}, \tcode{get_stop_token})
50-
\item environment queries (e.g., \tcode{get_scheduler}, \tcode{get_delegation_scheduler})
51-
\item scheduler queries (e.g., \tcode{get_forward_progress_guarantee})
52-
\item sender attribute queries (e.g., \tcode{get_completion_scheduler})
49+
\item general queries (e.g., \libglobalref{get_allocator}, \libglobalref{get_stop_token})
50+
\item environment queries (e.g., \tcode{get_scheduler}, \libglobalref{get_delegation_scheduler})
51+
\item scheduler queries (e.g., \libglobalref{get_forward_progress_guarantee})
52+
\item sender attribute queries (e.g., \libglobalref{get_completion_scheduler})
5353
\end{itemize}
5454
\\
5555
\end{floattable}

source/future.tex

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
\begin{itemdescr}
271271
\pnum
272272
\expects
273-
\tcode{T} meets the \oldconcept{EqualityComparable} requirements (\tref{cpp17.equalitycomparable}).
273+
\tcode{T} meets the \oldconceptref{EqualityComparable} requirements (\tref{cpp17.equalitycomparable}).
274274

275275
\pnum
276276
\returns
@@ -285,7 +285,7 @@
285285
\begin{itemdescr}
286286
\pnum
287287
\expects
288-
\tcode{T} meets the \oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
288+
\tcode{T} meets the \oldconceptref{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
289289

290290
\pnum
291291
\returns
@@ -300,7 +300,7 @@
300300
\begin{itemdescr}
301301
\pnum
302302
\expects
303-
\tcode{T} meets the \oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
303+
\tcode{T} meets the \oldconceptref{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
304304

305305
\pnum
306306
\returns
@@ -315,7 +315,7 @@
315315
\begin{itemdescr}
316316
\pnum
317317
\expects
318-
\tcode{T} meets the \oldconcept{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
318+
\tcode{T} meets the \oldconceptref{LessThanComparable} requirements (\tref{cpp17.lessthancomparable}).
319319

320320
\pnum
321321
\returns
@@ -401,7 +401,7 @@
401401

402402
\pnum
403403
\remarks
404-
\tcode{is_pod<T>} is a \oldconcept{UnaryTypeTrait}\iref{meta.rqmts}
404+
\tcode{is_pod<T>} is a \oldconceptref{UnaryTypeTrait}\iref{meta.rqmts}
405405
with a base characteristic of \tcode{true_type}
406406
if \tcode{T} is a POD type,
407407
and \tcode{false_type} otherwise.
@@ -505,7 +505,7 @@
505505
If the expression \tcode{TS::value} is well-formed
506506
when treated as an \deflink{unevaluated operand}{expr.context},
507507
then specializations of each of the two templates meet
508-
the \oldconcept{TransformationTrait} requirements with a base characteristic of
508+
the \oldconceptref{TransformationTrait} requirements with a base characteristic of
509509
\tcode{integral_constant<size_t, TS::value>}.
510510
Otherwise, they have no member \tcode{value}.
511511

@@ -533,7 +533,7 @@
533533
Let \tcode{TE} denote \tcode{tuple_element_t<I, T>}
534534
of the cv-unqualified type \tcode{T}.
535535
Then specializations of each of the two templates meet
536-
the \oldconcept{TransformationTrait} requirements
536+
the \oldconceptref{TransformationTrait} requirements
537537
with a member typedef \tcode{type} that names the following type:
538538
\begin{itemize}
539539
\item for the first specialization, \tcode{add_volatile_t<TE>}, and
@@ -573,7 +573,7 @@
573573
Let \tcode{VS} denote \tcode{variant_size<T>}
574574
of the cv-unqualified type \tcode{T}.
575575
Then specializations of each of the two templates meet
576-
the \oldconcept{UnaryTypeTrait} requirements
576+
the \oldconceptref{UnaryTypeTrait} requirements
577577
with a base characteristic of \tcode{integral_constant<size_t, VS::value>}.
578578
\end{itemdescr}
579579

@@ -587,7 +587,7 @@
587587
Let \tcode{VA} denote \tcode{variant_alternative<I, T>}
588588
of the cv-unqualified type \tcode{T}.
589589
Then specializations of each of the two templates meet
590-
the \oldconcept{TransformationTrait} requirements
590+
the \oldconceptref{TransformationTrait} requirements
591591
with a member typedef \tcode{type} that names the following type:
592592
\begin{itemize}
593593
\item for the first specialization, \tcode{add_volatile_t<VA::type>}, and

source/iostreams.tex

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,22 +1681,22 @@
16811681
It holds a state object
16821682
whose type is equal to the template parameter \tcode{stateT}.
16831683
Type \tcode{stateT} shall meet
1684-
the \oldconcept{DefaultConstructible} (\tref{cpp17.defaultconstructible}),
1685-
\oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible}),
1686-
\oldconcept{CopyAssignable} (\tref{cpp17.copyassignable}), and
1687-
\oldconcept{Destructible} (\tref{cpp17.destructible}) requirements.
1684+
the \oldconceptref{DefaultConstructible} (\tref{cpp17.defaultconstructible}),
1685+
\oldconceptref{CopyConstructible} (\tref{cpp17.copyconstructible}),
1686+
\oldconceptref{CopyAssignable} (\tref{cpp17.copyassignable}), and
1687+
\oldconceptref{Destructible} (\tref{cpp17.destructible}) requirements.
16881688
If \tcode{is_trivially_copy_constructible_v<stateT>} is \tcode{true},
16891689
then \tcode{fpos<stateT>} has a trivial copy constructor.
16901690
If \tcode{is_trivially_copy_assignable_v<stateT>} is \tcode{true},
16911691
then \tcode{fpos<stateT>} has a trivial copy assignment operator.
16921692
If \tcode{is_trivially_destructible_v<stateT>} is \tcode{true},
16931693
then \tcode{fpos<stateT>} has a trivial destructor.
16941694
All specializations of \tcode{fpos} meet
1695-
the \oldconcept{DefaultConstructible},
1696-
\oldconcept{CopyConstructible},
1697-
\oldconcept{CopyAssignable},
1698-
\oldconcept{Destructible},
1699-
and \oldconcept{EqualityComparable} (\tref{cpp17.equalitycomparable}) requirements.
1695+
the \oldconceptref{DefaultConstructible},
1696+
\oldconceptref{CopyConstructible},
1697+
\oldconceptref{CopyAssignable},
1698+
\oldconceptref{Destructible},
1699+
and \oldconceptref{EqualityComparable} (\tref{cpp17.equalitycomparable}) requirements.
17001700
In addition, the expressions shown in \tref{fpos.operations}
17011701
are valid and have the indicated semantics.
17021702
In that table,
@@ -12940,7 +12940,7 @@
1294012940

1294112941
\pnum
1294212942
\tcode{Allocator} shall meet
12943-
the \oldconcept{Allocator} requirements\iref{allocator.requirements.general}.
12943+
the \oldconceptref{Allocator} requirements\iref{allocator.requirements.general}.
1294412944

1294512945
\pnum
1294612946
\begin{example}
@@ -13233,7 +13233,7 @@
1323313233

1323413234
\pnum
1323513235
Template parameters named \tcode{InputIterator} shall meet the
13236-
\oldconcept{InputIterator} requirements\iref{input.iterators} and shall
13236+
\oldconceptref{InputIterator} requirements\iref{input.iterators} and shall
1323713237
have a value type that is one of the encoded character types.
1323813238

1323913239
\pnum
@@ -13247,7 +13247,7 @@
1324713247

1324813248
\pnum
1324913249
Template parameters named \tcode{Allocator} shall meet
13250-
the \oldconcept{Allocator} requirements\iref{allocator.requirements.general}.
13250+
the \oldconceptref{Allocator} requirements\iref{allocator.requirements.general}.
1325113251

1325213252
\rSec2[fs.filesystem.syn]{Header \tcode{<filesystem>} synopsis}
1325313253

@@ -14060,7 +14060,7 @@
1406014060
\item \tcode{basic_string_view<EcharT, traits>}. A function
1406114061
argument \tcode{const Source\&} \tcode{source} shall have an
1406214062
effective range \range{source.begin()}{source.end()}.
14063-
\item A type meeting the \oldconcept{InputIterator} requirements that iterates over a NTCTS\@.
14063+
\item A type meeting the \oldconceptref{InputIterator} requirements that iterates over a NTCTS\@.
1406414064
The value type shall be an encoded character type. A function argument
1406514065
\tcode{const Source\&} \tcode{source} shall have an effective range
1406614066
\range{source}{end} where \tcode{end} is the first
@@ -16540,7 +16540,7 @@
1654016540

1654116541
\pnum
1654216542
\tcode{directory_iterator} meets the
16543-
\oldconcept{InputIterator} requirements\iref{input.iterators}.
16543+
\oldconceptref{InputIterator} requirements\iref{input.iterators}.
1654416544

1654516545
\pnum
1654616546
If an iterator of type \tcode{directory_iterator} reports an error or

source/lib-intro.tex

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,7 @@
17731773
}\\
17741774
\end{oldconcepttable}
17751775

1776-
\begin{oldconcepttable}{CopyConstructible}{ (in addition to \oldconcept{MoveConstructible})}{cpp17.copyconstructible}
1776+
\begin{oldconcepttable}{CopyConstructible}{ (in addition to \oldconceptref{MoveConstructible})}{cpp17.copyconstructible}
17771777
{p{1in}p{4.15in}}
17781778
\topline
17791779
\hdstyle{Expression} & \hdstyle{Post-condition} \\ \capsep
@@ -1800,7 +1800,7 @@
18001800
}\\
18011801
\end{oldconcepttable}
18021802

1803-
\begin{oldconcepttable}{CopyAssignable}{ (in addition to \oldconcept{MoveAssignable})}{cpp17.copyassignable}
1803+
\begin{oldconcepttable}{CopyAssignable}{ (in addition to \oldconceptref{MoveAssignable})}{cpp17.copyassignable}
18041804
{p{1in}p{1in}p{1in}p{1.9in}}
18051805
\topline
18061806
\hdstyle{Expression} & \hdstyle{Return type} & \hdstyle{Return value} & \hdstyle{Post-condition} \\ \capsep
@@ -1814,7 +1814,7 @@
18141814
\tcode{u.\~T()} & All resources owned by \tcode{u} are reclaimed, no exception is propagated. \\ \rowsep
18151815
\multicolumn{2}{|l|}{
18161816
\begin{tailnote}
1817-
Array types and non-object types are not \oldconcept{Destructible}.
1817+
Array types and non-object types are not \oldconceptref{Destructible}.
18181818
\end{tailnote}
18191819
} \\
18201820
\end{oldconcepttable}
@@ -1893,7 +1893,7 @@
18931893
// for rvalues and lvalues
18941894
}
18951895

1896-
// Preconditions: \tcode{T} meets the \oldconcept{Swappable} requirements.
1896+
// Preconditions: \tcode{T} meets the \oldconceptref{Swappable} requirements.
18971897
template<class T>
18981898
void lv_swap(T& t1, T& t2) {
18991899
using std::swap;
@@ -1930,9 +1930,9 @@
19301930
A \oldconcept{NullablePointer} type is a pointer-like type that supports null values.
19311931
A type \tcode{P} meets the \oldconcept{\-Nullable\-Pointer} requirements if
19321932
\begin{itemize}
1933-
\item \tcode{P} meets the \oldconcept{EqualityComparable},
1934-
\oldconcept{DefaultConstructible}, \oldconcept{CopyConstructible}, \oldconcept{\-Copy\-Assign\-able},
1935-
\oldconcept{Swappable}, and \oldconcept{Destructible} requirements,
1933+
\item \tcode{P} meets the \oldconceptref{EqualityComparable},
1934+
\oldconceptref{DefaultConstructible}, \oldconceptref{CopyConstructible}, \oldconcept{\-Copy\-Assign\-able},
1935+
\oldconceptref{Swappable}, and \oldconceptref{Destructible} requirements,
19361936

19371937
\item the expressions shown in \tref{cpp17.nullablepointer} are
19381938
valid and have the indicated semantics, and
@@ -2008,8 +2008,8 @@
20082008
A type \tcode{H} meets the \defnoldconcept{Hash} requirements if
20092009
\begin{itemize}
20102010
\item it is a function object type\iref{function.objects},
2011-
\item it meets the \oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible}) and
2012-
\oldconcept{Destructible} (\tref{cpp17.destructible}) requirements, and
2011+
\item it meets the \oldconceptref{CopyConstructible} (\tref{cpp17.copyconstructible}) and
2012+
\oldconceptref{Destructible} (\tref{cpp17.destructible}) requirements, and
20132013
\item the expressions shown in \tref{cpp17.hash}
20142014
are valid and have the indicated semantics.
20152015
\end{itemize}
@@ -2693,7 +2693,7 @@
26932693
\tcode{true_type} only if an allocator of type \tcode{X} should be copied
26942694
when the client container is copy-assigned;
26952695
if so, \tcode{X} shall meet
2696-
the \oldconcept{CopyAssignable} requirements (\tref{cpp17.copyassignable}) and
2696+
the \oldconceptref{CopyAssignable} requirements (\tref{cpp17.copyassignable}) and
26972697
the copy operation shall not throw exceptions.
26982698

26992699
\pnum
@@ -2715,7 +2715,7 @@
27152715
\tcode{true_type} only if an allocator of type \tcode{X} should be moved
27162716
when the client container is move-assigned;
27172717
if so, \tcode{X} shall meet
2718-
the \oldconcept{MoveAssignable} requirements (\tref{cpp17.moveassignable}) and
2718+
the \oldconceptref{MoveAssignable} requirements (\tref{cpp17.moveassignable}) and
27192719
the move operation shall not throw exceptions.
27202720

27212721
\pnum
@@ -2737,7 +2737,7 @@
27372737
\tcode{true_type} only if an allocator of type \tcode{X} should be swapped
27382738
when the client container is swapped;
27392739
if so,
2740-
\tcode{X} shall meet the \oldconcept{Swappable} requirements\iref{swappable.requirements} and
2740+
\tcode{X} shall meet the \oldconceptref{Swappable} requirements\iref{swappable.requirements} and
27412741
the \tcode{swap} operation shall not throw exceptions.
27422742

27432743
\pnum
@@ -2767,15 +2767,15 @@
27672767

27682768
\pnum
27692769
An allocator type \tcode{X} shall meet the
2770-
\oldconcept{CopyConstructible} requirements (\tref{cpp17.copyconstructible}).
2770+
\oldconceptref{CopyConstructible} requirements (\tref{cpp17.copyconstructible}).
27712771
The \tcode{XX::pointer}, \tcode{XX::const_pointer}, \tcode{XX::void_pointer}, and
27722772
\tcode{XX::const_void_pointer} types shall meet the
27732773
\oldconcept{Nullable\-Pointer} requirements (\tref{cpp17.nullablepointer}).
27742774
No constructor,
27752775
comparison operator function, copy operation, move operation, or swap operation on
27762776
these pointer types shall exit via an exception. \tcode{XX::pointer} and \tcode{XX::const_pointer} shall also
27772777
meet the requirements for
2778-
a \oldconcept{RandomAccessIterator}\iref{random.access.iterators} and
2778+
a \oldconceptref{RandomAccessIterator}\iref{random.access.iterators} and
27792779
the additional requirement that, when \tcode{p} and \tcode{(p + n)} are
27802780
dereferenceable pointer values for some integral value \tcode{n},
27812781
\begin{codeblock}

0 commit comments

Comments
 (0)