Skip to content

Commit f3ff6aa

Browse files
jensmaurerjensmaurer
committed
[lib] Use \placeholder with italic correction before <
1 parent c98c78a commit f3ff6aa

File tree

6 files changed

+81
-81
lines changed

6 files changed

+81
-81
lines changed

‎source/concepts.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
concept @\placeholdernc{same-as-impl}@ = is_same_v<T, U>; // \expos
280280

281281
template<class T, class U>
282-
concept same_as = @\placeholdernc{same-as-impl}@<T, U> && @\placeholdernc{same-as-impl}@<U, T>;
282+
concept same_as = @\placeholder{same-as-impl}@<T, U> && @\placeholder{same-as-impl}@<U, T>;
283283
\end{itemdecl}
284284

285285
\begin{itemdescr}

‎source/containers.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6251,7 +6251,7 @@
62516251
using reverse_iterator = std::reverse_iterator<iterator>;
62526252
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
62536253
using node_type = @\unspec@;
6254-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
6254+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
62556255

62566256
class value_compare {
62576257
friend class map;
@@ -7116,7 +7116,7 @@
71167116
using reverse_iterator = std::reverse_iterator<iterator>;
71177117
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
71187118
using node_type = @\unspec@;
7119-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
7119+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
71207120

71217121
// \ref{set.cons}, construct/copy/destroy
71227122
set() : set(Compare()) { }
@@ -7802,7 +7802,7 @@
78027802
using local_iterator = @\impdefx{type of \tcode{unordered_map::local_iterator}}@; // see \ref{container.requirements}
78037803
using const_local_iterator = @\impdefx{type of \tcode{unordered_map::const_local_iterator}}@; // see \ref{container.requirements}
78047804
using node_type = @\unspec@;
7805-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
7805+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
78067806

78077807
// \ref{unord.map.cnstr}, construct/copy/destroy
78087808
unordered_map();
@@ -8754,7 +8754,7 @@
87548754
using local_iterator = @\impdefx{type of \tcode{unordered_set::local_iterator}}@; // see \ref{container.requirements}
87558755
using const_local_iterator = @\impdefx{type of \tcode{unordered_set::const_local_iterator}}@; // see \ref{container.requirements}
87568756
using node_type = @\unspec@;
8757-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
8757+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
87588758

87598759
// \ref{unord.set.cnstr}, construct/copy/destroy
87608760
unordered_set();

‎source/iterators.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
namespace std {
3939
template<class T> using @\placeholder{with-reference}@ = T&; // \expos
4040
template<class T> concept @\placeholder{can-reference}@ // \expos
41-
= requires { typename @\placeholdernc{with-reference}@<T>; };
41+
= requires { typename @\placeholder{with-reference}@<T>; };
4242
template<class T> concept @\placeholder{dereferenceable}@ // \expos
4343
= requires(T& t) {
4444
{ *t } -> @\placeholder{can-reference}@; // not required to be equality-preserving
@@ -1293,7 +1293,7 @@
12931293
default_constructible<I> && movable<I> &&
12941294
requires(I i) {
12951295
typename iter_difference_t<I>;
1296-
requires @\placeholdernc{is-signed-integer-like}@<iter_difference_t<I>>;
1296+
requires @\placeholder{is-signed-integer-like}@<iter_difference_t<I>>;
12971297
{ ++i } -> same_as<I&>; // not required to be equality-preserving
12981298
i++; // not required to be equality-preserving
12991299
};
@@ -1397,9 +1397,9 @@
13971397
if it is an unsigned-integer-class type.
13981398

13991399
\pnum
1400-
\tcode{\placeholdernc{is-integer-like}<I>} is \tcode{true}
1400+
\tcode{\placeholder{is-integer-like}<I>} is \tcode{true}
14011401
if and only if \tcode{I} is an integer-like type.
1402-
\tcode{\placeholdernc{is-signed-integer-like}<I>} is \tcode{true}
1402+
\tcode{\placeholder{is-signed-integer-like}<I>} is \tcode{true}
14031403
if and only if I is a signed-integer-like type.
14041404

14051405
\pnum

‎source/ranges.tex

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@
761761
};
762762

763763
template<class T>
764-
concept range = @\placeholdernc{range-impl}@<T&>;
764+
concept range = @\placeholder{range-impl}@<T&>;
765765

766766
template<class T>
767767
concept @\placeholder{forwarding-range}@ = // \expos
@@ -1239,11 +1239,11 @@
12391239

12401240
template<class T, class U, class V>
12411241
concept @\placeholdernc{pair-like-convertible-from}@ = // \expos
1242-
!range<T> && @\placeholdernc{pair-like}@<T> && constructible_from<T, U, V>;
1242+
!range<T> && @\placeholder{pair-like}@<T> && constructible_from<T, U, V>;
12431243

12441244
template<class T>
12451245
concept @\placeholdernc{iterator-sentinel-pair}@ = // \expos
1246-
!range<T> && @\placeholdernc{pair-like}@<T> &&
1246+
!range<T> && @\placeholder{pair-like}@<T> &&
12471247
sentinel_for<tuple_element_t<1, T>, tuple_element_t<0, T>>;
12481248

12491249
template<input_or_output_iterator I, sentinel_for<I> S = I, subrange_kind K =
@@ -1265,8 +1265,8 @@
12651265
constexpr subrange(I i, S s, @\placeholdernc{make-unsigned-like-t}@(iter_difference_t<I>) n)
12661266
requires (K == subrange_kind::sized);
12671267

1268-
template<@\placeholdernc{not-same-as}@<subrange> R>
1269-
requires @\placeholdernc{forwarding-range}@<R> &&
1268+
template<@\placeholder{not-same-as}@<subrange> R>
1269+
requires @\placeholder{forwarding-range}@<R> &&
12701270
convertible_to<iterator_t<R>, I> && convertible_to<sentinel_t<R>, S>
12711271
constexpr subrange(R&& r) requires (!StoreSize || sized_range<R>);
12721272

@@ -1277,22 +1277,22 @@
12771277
: subrange{ranges::begin(r), ranges::end(r), n}
12781278
{}
12791279

1280-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1281-
requires @\placeholdernc{pair-like-convertible-to}@<PairLike, I, S>
1280+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1281+
requires @\placeholder{pair-like-convertible-to}@<PairLike, I, S>
12821282
constexpr subrange(PairLike&& r) requires (!StoreSize)
12831283
: subrange{std::get<0>(std::forward<PairLike>(r)),
12841284
std::get<1>(std::forward<PairLike>(r))}
12851285
{}
12861286

1287-
template<@\placeholdernc{pair-like-convertible-to}@<I, S> PairLike>
1287+
template<@\placeholder{pair-like-convertible-to}@<I, S> PairLike>
12881288
constexpr subrange(PairLike&& r, @\placeholdernc{make-unsigned-like-t}@(iter_difference_t<I>) n)
12891289
requires (K == subrange_kind::sized)
12901290
: subrange{std::get<0>(std::forward<PairLike>(r)),
12911291
std::get<1>(std::forward<PairLike>(r)), n}
12921292
{}
12931293

1294-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1295-
requires @\placeholdernc{pair-like-convertible-from}@<PairLike, const I&, const S&>
1294+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1295+
requires @\placeholder{pair-like-convertible-from}@<PairLike, const I&, const S&>
12961296
constexpr operator PairLike() const;
12971297

12981298
constexpr I begin() const;
@@ -1385,8 +1385,8 @@
13851385

13861386
\indexlibrary{\idxcode{subrange}!\idxcode{subrange}}%
13871387
\begin{itemdecl}
1388-
template<@\placeholdernc{not-same-as}@<subrange> R>
1389-
requires @\placeholdernc{forwarding-range}@<R> &&
1388+
template<@\placeholder{not-same-as}@<subrange> R>
1389+
requires @\placeholder{forwarding-range}@<R> &&
13901390
convertible_to<iterator_t<R>, I> && convertible_to<sentinel_t<R>, S>
13911391
constexpr subrange(R&& r) requires (!StoreSize || sized_range<R>);
13921392
\end{itemdecl}
@@ -1403,8 +1403,8 @@
14031403

14041404
\indexlibrary{\idxcode{operator \placeholder{PairLike}}!\idxcode{subrange}}%
14051405
\begin{itemdecl}
1406-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1407-
requires @\placeholdernc{pair-like-convertible-from}@<PairLike, const I&, const S&>
1406+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1407+
requires @\placeholder{pair-like-convertible-from}@<PairLike, const I&, const S&>
14081408
constexpr operator PairLike() const;
14091409
\end{itemdecl}
14101410

@@ -1654,7 +1654,7 @@
16541654
requires is_object_v<T>
16551655
class single_view : public view_interface<single_view<T>> {
16561656
private:
1657-
@\placeholdernc{semiregular-box}@<T> value_; // \expos{} (see \ref{range.semi.wrap})
1657+
@\placeholder{semiregular-box}@<T> value_; // \expos{} (see \ref{range.semi.wrap})
16581658
public:
16591659
single_view() = default;
16601660
constexpr explicit single_view(const T& t);
@@ -1786,7 +1786,7 @@
17861786
@\seebelow@;
17871787

17881788
template<weakly_incrementable W, semiregular Bound = unreachable_sentinel_t>
1789-
requires @\placeholdernc{weakly-equality-comparable-with}@<W, Bound>
1789+
requires @\placeholder{weakly-equality-comparable-with}@<W, Bound>
17901790
class iota_view : public view_interface<iota_view<W, Bound>> {
17911791
private:
17921792
// \ref{range.iota.iterator}, class \tcode{iota_view::iterator}
@@ -1809,8 +1809,8 @@
18091809
};
18101810

18111811
template<class W, class Bound>
1812-
requires (!@\placeholdernc{is-integer-like}@<W> || !@\placeholdernc{is-integer-like}@<Bound> ||
1813-
(@\placeholdernc{is-signed-integer-like}@<W> == @\placeholdernc{is-signed-integer-like}@<Bound>))
1812+
requires (!@\placeholder{is-integer-like}@<W> || !@\placeholder{is-integer-like}@<Bound> ||
1813+
(@\placeholder{is-signed-integer-like}@<W> == @\placeholder{is-signed-integer-like}@<Bound>))
18141814
iota_view(W, Bound) -> iota_view<W, Bound>;
18151815
}
18161816
\end{codeblock}
@@ -1875,7 +1875,7 @@
18751875
\begin{itemdecl}
18761876
template<class I>
18771877
concept @\placeholder{advanceable}@ =
1878-
@\placeholdernc{decrementable}@<I> && totally_ordered<I> &&
1878+
@\placeholder{decrementable}@<I> && totally_ordered<I> &&
18791879
requires(I i, const I j, const @\placeholdernc{IOTA-DIFF-T}@(I) n) {
18801880
{ i += n } -> same_as<I&>;
18811881
{ i -= n } -> same_as<I&>;
@@ -1990,7 +1990,7 @@
19901990
\pnum
19911991
\effects Equivalent to:
19921992
\begin{codeblock}
1993-
if constexpr (@\placeholdernc{is-integer-like}@<W> && @\placeholdernc{is-integer-like}@<Bound>)
1993+
if constexpr (@\placeholder{is-integer-like}@<W> && @\placeholder{is-integer-like}@<Bound>)
19941994
return (value_ < 0)
19951995
? ((bound_ < 0)
19961996
? @\placeholdernc{make-unsigned-like}@(-value_) - @\placeholdernc{make-unsigned-like}@(-bound_)
@@ -2030,15 +2030,15 @@
20302030
constexpr void operator++(int);
20312031
constexpr iterator operator++(int) requires incrementable<W>;
20322032

2033-
constexpr iterator& operator--() requires @\placeholdernc{decrementable}@<W>;
2034-
constexpr iterator operator--(int) requires @\placeholdernc{decrementable}@<W>;
2033+
constexpr iterator& operator--() requires @\placeholder{decrementable}@<W>;
2034+
constexpr iterator operator--(int) requires @\placeholder{decrementable}@<W>;
20352035

20362036
constexpr iterator& operator+=(difference_type n)
2037-
requires @\placeholdernc{advanceable}@<W>;
2037+
requires @\placeholder{advanceable}@<W>;
20382038
constexpr iterator& operator-=(difference_type n)
2039-
requires @\placeholdernc{advanceable}@<W>;
2039+
requires @\placeholder{advanceable}@<W>;
20402040
constexpr W operator[](difference_type n) const
2041-
requires @\placeholdernc{advanceable}@<W>;
2041+
requires @\placeholder{advanceable}@<W>;
20422042

20432043
friend constexpr bool operator==(const iterator& x, const iterator& y)
20442044
requires equality_comparable<W>;
@@ -2056,14 +2056,14 @@
20562056
requires totally_ordered<W> && three_way_comparable<W>;
20572057

20582058
friend constexpr iterator operator+(iterator i, difference_type n)
2059-
requires @\placeholdernc{advanceable}@<W>;
2059+
requires @\placeholder{advanceable}@<W>;
20602060
friend constexpr iterator operator+(difference_type n, iterator i)
2061-
requires @\placeholdernc{advanceable}@<W>;
2061+
requires @\placeholder{advanceable}@<W>;
20622062

20632063
friend constexpr iterator operator-(iterator i, difference_type n)
2064-
requires @\placeholdernc{advanceable}@<W>;
2064+
requires @\placeholder{advanceable}@<W>;
20652065
friend constexpr difference_type operator-(const iterator& x, const iterator& y)
2066-
requires @\placeholdernc{advanceable}@<W>;
2066+
requires @\placeholder{advanceable}@<W>;
20672067
};
20682068
}
20692069
\end{codeblock}
@@ -2152,7 +2152,7 @@
21522152

21532153
\indexlibrary{\idxcode{operator\dcr}!\idxcode{iota_view::iterator}}
21542154
\begin{itemdecl}
2155-
constexpr iterator& operator--() requires @\placeholdernc{decrementable}@<W>;
2155+
constexpr iterator& operator--() requires @\placeholder{decrementable}@<W>;
21562156
\end{itemdecl}
21572157

21582158
\begin{itemdescr}
@@ -2166,7 +2166,7 @@
21662166

21672167
\indexlibrary{\idxcode{operator\dcr}!\idxcode{iota_view::iterator}}
21682168
\begin{itemdecl}
2169-
constexpr iterator operator--(int) requires @\placeholdernc{decrementable}@<W>;
2169+
constexpr iterator operator--(int) requires @\placeholder{decrementable}@<W>;
21702170
\end{itemdecl}
21712171

21722172
\begin{itemdescr}
@@ -2182,14 +2182,14 @@
21822182
\indexlibrary{\idxcode{operator+=}!\idxcode{iota_view::iterator}}
21832183
\begin{itemdecl}
21842184
constexpr iterator& operator+=(difference_type n)
2185-
requires @\placeholdernc{advanceable}@<W>;
2185+
requires @\placeholder{advanceable}@<W>;
21862186
\end{itemdecl}
21872187

21882188
\begin{itemdescr}
21892189
\pnum
21902190
\effects Equivalent to:
21912191
\begin{codeblock}
2192-
if constexpr (@\placeholdernc{is-integer-like}@<W> && !@\placeholdernc{is-signed-integer-like}@<W>) {
2192+
if constexpr (@\placeholder{is-integer-like}@<W> && !@\placeholder{is-signed-integer-like}@<W>) {
21932193
if (n >= difference_type(0))
21942194
value_ += static_cast<W>(n);
21952195
else
@@ -2204,14 +2204,14 @@
22042204
\indexlibrary{\idxcode{operator-=}!\idxcode{iota_view::iterator}}
22052205
\begin{itemdecl}
22062206
constexpr iterator& operator-=(difference_type n)
2207-
requires @\placeholdernc{advanceable}@<W>;
2207+
requires @\placeholder{advanceable}@<W>;
22082208
\end{itemdecl}
22092209

22102210
\begin{itemdescr}
22112211
\pnum
22122212
\effects Equivalent to:
22132213
\begin{codeblock}
2214-
if constexpr (@\placeholdernc{is-integer-like}@<W> && !@\placeholdernc{is-signed-integer-like}@<W>) {
2214+
if constexpr (@\placeholder{is-integer-like}@<W> && !@\placeholder{is-signed-integer-like}@<W>) {
22152215
if (n >= difference_type(0))
22162216
value_ -= static_cast<W>(n);
22172217
else
@@ -2226,7 +2226,7 @@
22262226
\indexlibrary{\idxcode{operator[]}!\idxcode{iota_view::iterator}}
22272227
\begin{itemdecl}
22282228
constexpr W operator[](difference_type n) const
2229-
requires @\placeholdernc{advanceable}@<W>;
2229+
requires @\placeholder{advanceable}@<W>;
22302230
\end{itemdecl}
22312231

22322232
\begin{itemdescr}
@@ -2305,7 +2305,7 @@
23052305
\indexlibrary{\idxcode{operator+}!\idxcode{iota_view::iterator}}
23062306
\begin{itemdecl}
23072307
friend constexpr iterator operator+(iterator i, difference_type n)
2308-
requires @\placeholdernc{advanceable}@<W>;
2308+
requires @\placeholder{advanceable}@<W>;
23092309
\end{itemdecl}
23102310

23112311
\begin{itemdescr}
@@ -2316,7 +2316,7 @@
23162316
\indexlibrary{\idxcode{operator+}!\idxcode{iota_view::iterator}}
23172317
\begin{itemdecl}
23182318
friend constexpr iterator operator+(difference_type n, iterator i)
2319-
requires @\placeholdernc{advanceable}@<W>;
2319+
requires @\placeholder{advanceable}@<W>;
23202320
\end{itemdecl}
23212321

23222322
\begin{itemdescr}
@@ -2327,7 +2327,7 @@
23272327
\indexlibrary{\idxcode{operator-}!\idxcode{iota_view::iterator}}
23282328
\begin{itemdecl}
23292329
friend constexpr iterator operator-(iterator i, difference_type n)
2330-
requires @\placeholdernc{advanceable}@<W>;
2330+
requires @\placeholder{advanceable}@<W>;
23312331
\end{itemdecl}
23322332

23332333
\begin{itemdescr}
@@ -2338,7 +2338,7 @@
23382338
\indexlibrary{\idxcode{operator-}!\idxcode{iota_view::iterator}}
23392339
\begin{itemdecl}
23402340
friend constexpr difference_type operator-(const iterator& x, const iterator& y)
2341-
requires @\placeholdernc{advanceable}@<W>;
2341+
requires @\placeholder{advanceable}@<W>;
23422342
\end{itemdecl}
23432343

23442344
\begin{itemdescr}
@@ -2670,7 +2670,7 @@
26702670
class filter_view : public view_interface<filter_view<V, Pred>> {
26712671
private:
26722672
V base_ = V(); // \expos
2673-
@\placeholdernc{semiregular-box}@<Pred> pred_; // \expos
2673+
@\placeholder{semiregular-box}@<Pred> pred_; // \expos
26742674

26752675
// \ref{range.filter.iterator}, class \tcode{filter_view::iterator}
26762676
class iterator; // \expos
@@ -3070,7 +3070,7 @@
30703070
template<bool> struct sentinel; // \expos
30713071

30723072
V base_ = V(); // \expos
3073-
@\placeholdernc{semiregular-box}@<F> fun_; // \expos
3073+
@\placeholder{semiregular-box}@<F> fun_; // \expos
30743074

30753075
public:
30763076
transform_view() = default;
@@ -4798,13 +4798,13 @@
47984798
template<class R>
47994799
concept @\placeholdernc{tiny-range}@ = // \expos
48004800
sized_range<R> &&
4801-
requires { typename @\placeholdernc{require-constant}@<remove_reference_t<R>::size()>; } &&
4801+
requires { typename @\placeholder{require-constant}@<remove_reference_t<R>::size()>; } &&
48024802
(remove_reference_t<R>::size() <= 1);
48034803

48044804
template<input_range V, forward_range Pattern>
48054805
requires view<V> && view<Pattern> &&
48064806
indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> &&
4807-
(forward_range<V> || @\placeholdernc{tiny-range}@<Pattern>)
4807+
(forward_range<V> || @\placeholder{tiny-range}@<Pattern>)
48084808
class split_view : public view_interface<split_view<V, Pattern>> {
48094809
private:
48104810
V base_ = V(); // \expos

0 commit comments

Comments
 (0)