Skip to content

Commit 752d013

Browse files
jensmaurerjensmaurer
committed
[lib] Use \placeholder with italic correction before <
1 parent 4060676 commit 752d013

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-impl}@ = is_same_v<T, U>; // \expos
280280

281281
template<class T, class U>
282-
concept Same = @\placeholdernc{same-impl}@<T, U> && @\placeholdernc{same-impl}@<U, T>;
282+
concept Same = @\placeholder{same-impl}@<T, U> && @\placeholder{same-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
@@ -1291,7 +1291,7 @@
12911291
DefaultConstructible<I> && Movable<I> &&
12921292
requires(I i) {
12931293
typename iter_difference_t<I>;
1294-
requires @\placeholdernc{is-signed-integer-like}@<iter_difference_t<I>>;
1294+
requires @\placeholder{is-signed-integer-like}@<iter_difference_t<I>>;
12951295
{ ++i } -> Same<I&>; // not required to be equality-preserving
12961296
i++; // not required to be equality-preserving
12971297
};
@@ -1395,9 +1395,9 @@
13951395
if it is an unsigned-integer-class type.
13961396

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

14031403
\pnum

‎source/ranges.tex

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@
751751
};
752752

753753
template<class T>
754-
concept Range = @\placeholdernc{range-impl}@<T&>;
754+
concept Range = @\placeholder{range-impl}@<T&>;
755755

756756
template<class T>
757757
concept @\placeholder{forwarding-range}@ = // \expos
@@ -1229,11 +1229,11 @@
12291229

12301230
template<class T, class U, class V>
12311231
concept @\placeholdernc{pair-like-convertible-from}@ = // \expos
1232-
!Range<T> && @\placeholdernc{pair-like}@<T> && Constructible<T, U, V>;
1232+
!Range<T> && @\placeholder{pair-like}@<T> && Constructible<T, U, V>;
12331233

12341234
template<class T>
12351235
concept @\placeholdernc{iterator-sentinel-pair}@ = // \expos
1236-
!Range<T> && @\placeholdernc{pair-like}@<T> &&
1236+
!Range<T> && @\placeholder{pair-like}@<T> &&
12371237
Sentinel<tuple_element_t<1, T>, tuple_element_t<0, T>>;
12381238

12391239
template<Iterator I, Sentinel<I> S = I, subrange_kind K =
@@ -1255,8 +1255,8 @@
12551255
constexpr subrange(I i, S s, @\placeholdernc{make-unsigned-like-t}@(iter_difference_t<I>) n)
12561256
requires (K == subrange_kind::sized);
12571257

1258-
template<@\placeholdernc{not-same-as}@<subrange> R>
1259-
requires @\placeholdernc{forwarding-range}@<R> &&
1258+
template<@\placeholder{not-same-as}@<subrange> R>
1259+
requires @\placeholder{forwarding-range}@<R> &&
12601260
ConvertibleTo<iterator_t<R>, I> && ConvertibleTo<sentinel_t<R>, S>
12611261
constexpr subrange(R&& r) requires (!StoreSize || SizedRange<R>);
12621262

@@ -1267,22 +1267,22 @@
12671267
: subrange{ranges::begin(r), ranges::end(r), n}
12681268
{}
12691269

1270-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1271-
requires @\placeholdernc{pair-like-convertible-to}@<PairLike, I, S>
1270+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1271+
requires @\placeholder{pair-like-convertible-to}@<PairLike, I, S>
12721272
constexpr subrange(PairLike&& r) requires (!StoreSize)
12731273
: subrange{std::get<0>(std::forward<PairLike>(r)),
12741274
std::get<1>(std::forward<PairLike>(r))}
12751275
{}
12761276

1277-
template<@\placeholdernc{pair-like-convertible-to}@<I, S> PairLike>
1277+
template<@\placeholder{pair-like-convertible-to}@<I, S> PairLike>
12781278
constexpr subrange(PairLike&& r, @\placeholdernc{make-unsigned-like-t}@(iter_difference_t<I>) n)
12791279
requires (K == subrange_kind::sized)
12801280
: subrange{std::get<0>(std::forward<PairLike>(r)),
12811281
std::get<1>(std::forward<PairLike>(r)), n}
12821282
{}
12831283

1284-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1285-
requires @\placeholdernc{pair-like-convertible-from}@<PairLike, const I&, const S&>
1284+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1285+
requires @\placeholder{pair-like-convertible-from}@<PairLike, const I&, const S&>
12861286
constexpr operator PairLike() const;
12871287

12881288
constexpr I begin() const;
@@ -1375,8 +1375,8 @@
13751375

13761376
\indexlibrary{\idxcode{subrange}!\idxcode{subrange}}%
13771377
\begin{itemdecl}
1378-
template<@\placeholdernc{not-same-as}@<subrange> R>
1379-
requires @\placeholdernc{forwarding-range}@<R> &&
1378+
template<@\placeholder{not-same-as}@<subrange> R>
1379+
requires @\placeholder{forwarding-range}@<R> &&
13801380
ConvertibleTo<iterator_t<R>, I> && ConvertibleTo<sentinel_t<R>, S>
13811381
constexpr subrange(R&& r) requires (!StoreSize || SizedRange<R>);
13821382
\end{itemdecl}
@@ -1393,8 +1393,8 @@
13931393

13941394
\indexlibrary{\idxcode{operator \placeholder{PairLike}}!\idxcode{subrange}}%
13951395
\begin{itemdecl}
1396-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1397-
requires @\placeholdernc{pair-like-convertible-from}@<PairLike, const I&, const S&>
1396+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1397+
requires @\placeholder{pair-like-convertible-from}@<PairLike, const I&, const S&>
13981398
constexpr operator PairLike() const;
13991399
\end{itemdecl}
14001400

@@ -1644,7 +1644,7 @@
16441644
requires is_object_v<T>
16451645
class single_view : public view_interface<single_view<T>> {
16461646
private:
1647-
@\placeholdernc{semiregular-box}@<T> value_; // \expos{} (see \ref{range.semi.wrap})
1647+
@\placeholder{semiregular-box}@<T> value_; // \expos{} (see \ref{range.semi.wrap})
16481648
public:
16491649
single_view() = default;
16501650
constexpr explicit single_view(const T& t);
@@ -1776,7 +1776,7 @@
17761776
@\seebelow@;
17771777

17781778
template<WeaklyIncrementable W, Semiregular Bound = unreachable_sentinel_t>
1779-
requires @\placeholdernc{weakly-equality-comparable-with}@<W, Bound>
1779+
requires @\placeholder{weakly-equality-comparable-with}@<W, Bound>
17801780
class iota_view : public view_interface<iota_view<W, Bound>> {
17811781
private:
17821782
// \ref{range.iota.iterator}, class \tcode{iota_view::iterator}
@@ -1799,8 +1799,8 @@
17991799
};
18001800

18011801
template<class W, class Bound>
1802-
requires (!@\placeholdernc{is-integer-like}@<W> || !@\placeholdernc{is-integer-like}@<Bound> ||
1803-
(@\placeholdernc{is-signed-integer-like}@<W> == @\placeholdernc{is-signed-integer-like}@<Bound>))
1802+
requires (!@\placeholder{is-integer-like}@<W> || !@\placeholder{is-integer-like}@<Bound> ||
1803+
(@\placeholder{is-signed-integer-like}@<W> == @\placeholder{is-signed-integer-like}@<Bound>))
18041804
iota_view(W, Bound) -> iota_view<W, Bound>;
18051805
}
18061806
\end{codeblock}
@@ -1865,7 +1865,7 @@
18651865
\begin{itemdecl}
18661866
template<class I>
18671867
concept @\placeholder{Advanceable}@ =
1868-
@\placeholdernc{Decrementable}@<I> && StrictTotallyOrdered<I> &&
1868+
@\placeholder{Decrementable}@<I> && StrictTotallyOrdered<I> &&
18691869
requires(I i, const I j, const @\placeholdernc{IOTA-DIFF-T}@(I) n) {
18701870
{ i += n } -> Same<I&>;
18711871
{ i -= n } -> Same<I&>;
@@ -1980,7 +1980,7 @@
19801980
\pnum
19811981
\effects Equivalent to:
19821982
\begin{codeblock}
1983-
if constexpr (@\placeholdernc{is-integer-like}@<W> && @\placeholdernc{is-integer-like}@<Bound>)
1983+
if constexpr (@\placeholder{is-integer-like}@<W> && @\placeholder{is-integer-like}@<Bound>)
19841984
return (value_ < 0)
19851985
? ((bound_ < 0)
19861986
? @\placeholdernc{make-unsigned-like}@(-value_) - @\placeholdernc{make-unsigned-like}@(-bound_)
@@ -2020,15 +2020,15 @@
20202020
constexpr void operator++(int);
20212021
constexpr iterator operator++(int) requires Incrementable<W>;
20222022

2023-
constexpr iterator& operator--() requires @\placeholdernc{Decrementable}@<W>;
2024-
constexpr iterator operator--(int) requires @\placeholdernc{Decrementable}@<W>;
2023+
constexpr iterator& operator--() requires @\placeholder{Decrementable}@<W>;
2024+
constexpr iterator operator--(int) requires @\placeholder{Decrementable}@<W>;
20252025

20262026
constexpr iterator& operator+=(difference_type n)
2027-
requires @\placeholdernc{Advanceable}@<W>;
2027+
requires @\placeholder{Advanceable}@<W>;
20282028
constexpr iterator& operator-=(difference_type n)
2029-
requires @\placeholdernc{Advanceable}@<W>;
2029+
requires @\placeholder{Advanceable}@<W>;
20302030
constexpr W operator[](difference_type n) const
2031-
requires @\placeholdernc{Advanceable}@<W>;
2031+
requires @\placeholder{Advanceable}@<W>;
20322032

20332033
friend constexpr bool operator==(const iterator& x, const iterator& y)
20342034
requires EqualityComparable<W>;
@@ -2046,14 +2046,14 @@
20462046
requires StrictTotallyOrdered<W> && ThreeWayComparable<W>;
20472047

20482048
friend constexpr iterator operator+(iterator i, difference_type n)
2049-
requires @\placeholdernc{Advanceable}@<W>;
2049+
requires @\placeholder{Advanceable}@<W>;
20502050
friend constexpr iterator operator+(difference_type n, iterator i)
2051-
requires @\placeholdernc{Advanceable}@<W>;
2051+
requires @\placeholder{Advanceable}@<W>;
20522052

20532053
friend constexpr iterator operator-(iterator i, difference_type n)
2054-
requires @\placeholdernc{Advanceable}@<W>;
2054+
requires @\placeholder{Advanceable}@<W>;
20552055
friend constexpr difference_type operator-(const iterator& x, const iterator& y)
2056-
requires @\placeholdernc{Advanceable}@<W>;
2056+
requires @\placeholder{Advanceable}@<W>;
20572057
};
20582058
}
20592059
\end{codeblock}
@@ -2142,7 +2142,7 @@
21422142

21432143
\indexlibrary{\idxcode{operator\dcr}!\idxcode{iota_view::iterator}}
21442144
\begin{itemdecl}
2145-
constexpr iterator& operator--() requires @\placeholdernc{Decrementable}@<W>;
2145+
constexpr iterator& operator--() requires @\placeholder{Decrementable}@<W>;
21462146
\end{itemdecl}
21472147

21482148
\begin{itemdescr}
@@ -2156,7 +2156,7 @@
21562156

21572157
\indexlibrary{\idxcode{operator\dcr}!\idxcode{iota_view::iterator}}
21582158
\begin{itemdecl}
2159-
constexpr iterator operator--(int) requires @\placeholdernc{Decrementable}@<W>;
2159+
constexpr iterator operator--(int) requires @\placeholder{Decrementable}@<W>;
21602160
\end{itemdecl}
21612161

21622162
\begin{itemdescr}
@@ -2172,14 +2172,14 @@
21722172
\indexlibrary{\idxcode{operator+=}!\idxcode{iota_view::iterator}}
21732173
\begin{itemdecl}
21742174
constexpr iterator& operator+=(difference_type n)
2175-
requires @\placeholdernc{Advanceable}@<W>;
2175+
requires @\placeholder{Advanceable}@<W>;
21762176
\end{itemdecl}
21772177

21782178
\begin{itemdescr}
21792179
\pnum
21802180
\effects Equivalent to:
21812181
\begin{codeblock}
2182-
if constexpr (@\placeholdernc{is-integer-like}@<W> && !@\placeholdernc{is-signed-integer-like}@<W>) {
2182+
if constexpr (@\placeholder{is-integer-like}@<W> && !@\placeholder{is-signed-integer-like}@<W>) {
21832183
if (n >= difference_type(0))
21842184
value_ += static_cast<W>(n);
21852185
else
@@ -2194,14 +2194,14 @@
21942194
\indexlibrary{\idxcode{operator-=}!\idxcode{iota_view::iterator}}
21952195
\begin{itemdecl}
21962196
constexpr iterator& operator-=(difference_type n)
2197-
requires @\placeholdernc{Advanceable}@<W>;
2197+
requires @\placeholder{Advanceable}@<W>;
21982198
\end{itemdecl}
21992199

22002200
\begin{itemdescr}
22012201
\pnum
22022202
\effects Equivalent to:
22032203
\begin{codeblock}
2204-
if constexpr (@\placeholdernc{is-integer-like}@<W> && !@\placeholdernc{is-signed-integer-like}@<W>) {
2204+
if constexpr (@\placeholder{is-integer-like}@<W> && !@\placeholder{is-signed-integer-like}@<W>) {
22052205
if (n >= difference_type(0))
22062206
value_ -= static_cast<W>(n);
22072207
else
@@ -2216,7 +2216,7 @@
22162216
\indexlibrary{\idxcode{operator[]}!\idxcode{iota_view::iterator}}
22172217
\begin{itemdecl}
22182218
constexpr W operator[](difference_type n) const
2219-
requires @\placeholdernc{Advanceable}@<W>;
2219+
requires @\placeholder{Advanceable}@<W>;
22202220
\end{itemdecl}
22212221

22222222
\begin{itemdescr}
@@ -2295,7 +2295,7 @@
22952295
\indexlibrary{\idxcode{operator+}!\idxcode{iota_view::iterator}}
22962296
\begin{itemdecl}
22972297
friend constexpr iterator operator+(iterator i, difference_type n)
2298-
requires @\placeholdernc{Advanceable}@<W>;
2298+
requires @\placeholder{Advanceable}@<W>;
22992299
\end{itemdecl}
23002300

23012301
\begin{itemdescr}
@@ -2306,7 +2306,7 @@
23062306
\indexlibrary{\idxcode{operator+}!\idxcode{iota_view::iterator}}
23072307
\begin{itemdecl}
23082308
friend constexpr iterator operator+(difference_type n, iterator i)
2309-
requires @\placeholdernc{Advanceable}@<W>;
2309+
requires @\placeholder{Advanceable}@<W>;
23102310
\end{itemdecl}
23112311

23122312
\begin{itemdescr}
@@ -2317,7 +2317,7 @@
23172317
\indexlibrary{\idxcode{operator-}!\idxcode{iota_view::iterator}}
23182318
\begin{itemdecl}
23192319
friend constexpr iterator operator-(iterator i, difference_type n)
2320-
requires @\placeholdernc{Advanceable}@<W>;
2320+
requires @\placeholder{Advanceable}@<W>;
23212321
\end{itemdecl}
23222322

23232323
\begin{itemdescr}
@@ -2328,7 +2328,7 @@
23282328
\indexlibrary{\idxcode{operator-}!\idxcode{iota_view::iterator}}
23292329
\begin{itemdecl}
23302330
friend constexpr difference_type operator-(const iterator& x, const iterator& y)
2331-
requires @\placeholdernc{Advanceable}@<W>;
2331+
requires @\placeholder{Advanceable}@<W>;
23322332
\end{itemdecl}
23332333

23342334
\begin{itemdescr}
@@ -2660,7 +2660,7 @@
26602660
class filter_view : public view_interface<filter_view<V, Pred>> {
26612661
private:
26622662
V base_ = V(); // \expos
2663-
@\placeholdernc{semiregular-box}@<Pred> pred_; // \expos
2663+
@\placeholder{semiregular-box}@<Pred> pred_; // \expos
26642664

26652665
// \ref{range.filter.iterator}, class \tcode{filter_view::iterator}
26662666
class iterator; // \expos
@@ -3060,7 +3060,7 @@
30603060
template<bool> struct sentinel; // \expos
30613061

30623062
V base_ = V(); // \expos
3063-
@\placeholdernc{semiregular-box}@<F> fun_; // \expos
3063+
@\placeholder{semiregular-box}@<F> fun_; // \expos
30643064

30653065
public:
30663066
transform_view() = default;
@@ -4788,13 +4788,13 @@
47884788
template<class R>
47894789
concept @\placeholdernc{tiny-range}@ = // \expos
47904790
SizedRange<R> &&
4791-
requires { typename @\placeholdernc{require-constant}@<remove_reference_t<R>::size()>; } &&
4791+
requires { typename @\placeholder{require-constant}@<remove_reference_t<R>::size()>; } &&
47924792
(remove_reference_t<R>::size() <= 1);
47934793

47944794
template<InputRange V, ForwardRange Pattern>
47954795
requires View<V> && View<Pattern> &&
47964796
IndirectlyComparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> &&
4797-
(ForwardRange<V> || @\placeholdernc{tiny-range}@<Pattern>)
4797+
(ForwardRange<V> || @\placeholder{tiny-range}@<Pattern>)
47984798
class split_view : public view_interface<split_view<V, Pattern>> {
47994799
private:
48004800
V base_ = V(); // \expos

0 commit comments

Comments
 (0)