Skip to content

Commit 7add650

Browse files
jensmaurerjensmaurer
committed
[lib] Use \placeholder with italic correction before <
1 parent 69fe79d commit 7add650

File tree

6 files changed

+74
-74
lines changed

6 files changed

+74
-74
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
@@ -6245,7 +6245,7 @@
62456245
using reverse_iterator = std::reverse_iterator<iterator>;
62466246
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
62476247
using node_type = @\unspec@;
6248-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
6248+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
62496249

62506250
class value_compare {
62516251
friend class map;
@@ -7110,7 +7110,7 @@
71107110
using reverse_iterator = std::reverse_iterator<iterator>;
71117111
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
71127112
using node_type = @\unspec@;
7113-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
7113+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
71147114

71157115
// \ref{set.cons}, construct/copy/destroy
71167116
set() : set(Compare()) { }
@@ -7796,7 +7796,7 @@
77967796
using local_iterator = @\impdefx{type of \tcode{unordered_map::local_iterator}}@; // see \ref{container.requirements}
77977797
using const_local_iterator = @\impdefx{type of \tcode{unordered_map::const_local_iterator}}@; // see \ref{container.requirements}
77987798
using node_type = @\unspec@;
7799-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
7799+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
78007800

78017801
// \ref{unord.map.cnstr}, construct/copy/destroy
78027802
unordered_map();
@@ -8748,7 +8748,7 @@
87488748
using local_iterator = @\impdefx{type of \tcode{unordered_set::local_iterator}}@; // see \ref{container.requirements}
87498749
using const_local_iterator = @\impdefx{type of \tcode{unordered_set::const_local_iterator}}@; // see \ref{container.requirements}
87508750
using node_type = @\unspec@;
8751-
using insert_return_type = @\placeholdernc{insert-return-type}@<iterator, node_type>;
8751+
using insert_return_type = @\placeholder{insert-return-type}@<iterator, node_type>;
87528752

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

‎source/iterators.tex

Lines changed: 1 addition & 1 deletion
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

‎source/ranges.tex

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@
741741
};
742742

743743
template<class T>
744-
concept Range = @\placeholdernc{range-impl}@<T&>;
744+
concept Range = @\placeholder{range-impl}@<T&>;
745745

746746
template<class T>
747747
concept @\placeholder{forwarding-range}@ = // \expos
@@ -1219,11 +1219,11 @@
12191219

12201220
template<class T, class U, class V>
12211221
concept @\placeholdernc{pair-like-convertible-from}@ = // \expos
1222-
!Range<T> && @\placeholdernc{pair-like}@<T> && Constructible<T, U, V>;
1222+
!Range<T> && @\placeholder{pair-like}@<T> && Constructible<T, U, V>;
12231223

12241224
template<class T>
12251225
concept @\placeholdernc{iterator-sentinel-pair}@ = // \expos
1226-
!Range<T> && @\placeholdernc{pair-like}@<T> &&
1226+
!Range<T> && @\placeholder{pair-like}@<T> &&
12271227
Sentinel<tuple_element_t<1, T>, tuple_element_t<0, T>>;
12281228

12291229
template<Iterator I, Sentinel<I> S = I, subrange_kind K =
@@ -1245,8 +1245,8 @@
12451245
constexpr subrange(I i, S s, iter_difference_t<I> n)
12461246
requires (K == subrange_kind::sized);
12471247

1248-
template<@\placeholdernc{not-same-as}@<subrange> R>
1249-
requires @\placeholdernc{forwarding-range}@<R> &&
1248+
template<@\placeholder{not-same-as}@<subrange> R>
1249+
requires @\placeholder{forwarding-range}@<R> &&
12501250
ConvertibleTo<iterator_t<R>, I> && ConvertibleTo<sentinel_t<R>, S>
12511251
constexpr subrange(R&& r) requires (!StoreSize || SizedRange<R>);
12521252

@@ -1257,22 +1257,22 @@
12571257
: subrange{ranges::begin(r), ranges::end(r), n}
12581258
{}
12591259

1260-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1261-
requires @\placeholdernc{pair-like-convertible-to}@<PairLike, I, S>
1260+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1261+
requires @\placeholder{pair-like-convertible-to}@<PairLike, I, S>
12621262
constexpr subrange(PairLike&& r) requires (!StoreSize)
12631263
: subrange{std::get<0>(std::forward<PairLike>(r)),
12641264
std::get<1>(std::forward<PairLike>(r))}
12651265
{}
12661266

1267-
template<@\placeholdernc{pair-like-convertible-to}@<I, S> PairLike>
1267+
template<@\placeholder{pair-like-convertible-to}@<I, S> PairLike>
12681268
constexpr subrange(PairLike&& r, iter_difference_t<I> n)
12691269
requires (K == subrange_kind::sized)
12701270
: subrange{std::get<0>(std::forward<PairLike>(r)),
12711271
std::get<1>(std::forward<PairLike>(r)), n}
12721272
{}
12731273

1274-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1275-
requires @\placeholdernc{pair-like-convertible-from}@<PairLike, const I&, const S&>
1274+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1275+
requires @\placeholder{pair-like-convertible-from}@<PairLike, const I&, const S&>
12761276
constexpr operator PairLike() const;
12771277

12781278
constexpr I begin() const;
@@ -1364,8 +1364,8 @@
13641364

13651365
\indexlibrary{\idxcode{subrange}!\idxcode{subrange}}%
13661366
\begin{itemdecl}
1367-
template<@\placeholdernc{not-same-as}@<subrange> R>
1368-
requires @\placeholdernc{forwarding-range}@<R> &&
1367+
template<@\placeholder{not-same-as}@<subrange> R>
1368+
requires @\placeholder{forwarding-range}@<R> &&
13691369
ConvertibleTo<iterator_t<R>, I> && ConvertibleTo<sentinel_t<R>, S>
13701370
constexpr subrange(R&& r) requires (!StoreSize || SizedRange<R>);
13711371
\end{itemdecl}
@@ -1382,8 +1382,8 @@
13821382

13831383
\indexlibrary{\idxcode{operator \placeholder{PairLike}}!\idxcode{subrange}}%
13841384
\begin{itemdecl}
1385-
template<@\placeholdernc{not-same-as}@<subrange> PairLike>
1386-
requires @\placeholdernc{pair-like-convertible-from}@<PairLike, const I&, const S&>
1385+
template<@\placeholder{not-same-as}@<subrange> PairLike>
1386+
requires @\placeholder{pair-like-convertible-from}@<PairLike, const I&, const S&>
13871387
constexpr operator PairLike() const;
13881388
\end{itemdecl}
13891389

@@ -1629,7 +1629,7 @@
16291629
requires is_object_v<T>
16301630
class single_view : public view_interface<single_view<T>> {
16311631
private:
1632-
@\placeholdernc{semiregular-box}@<T> value_; // \expos{} (see \ref{range.semi.wrap})
1632+
@\placeholder{semiregular-box}@<T> value_; // \expos{} (see \ref{range.semi.wrap})
16331633
public:
16341634
single_view() = default;
16351635
constexpr explicit single_view(const T& t);
@@ -1761,7 +1761,7 @@
17611761
@\seebelow@;
17621762

17631763
template<WeaklyIncrementable W, Semiregular Bound = unreachable_sentinel_t>
1764-
requires @\placeholdernc{weakly-equality-comparable-with}@<W, Bound>
1764+
requires @\placeholder{weakly-equality-comparable-with}@<W, Bound>
17651765
class iota_view : public view_interface<iota_view<W, Bound>> {
17661766
private:
17671767
// \ref{range.iota.iterator}, class \tcode{iota_view::iterator}
@@ -1781,7 +1781,7 @@
17811781
constexpr iterator end() const requires Same<W, Bound>;
17821782

17831783
constexpr auto size() const
1784-
requires (Same<W, Bound> && @\placeholdernc{Advanceable}@<W>) ||
1784+
requires (Same<W, Bound> && @\placeholder{Advanceable}@<W>) ||
17851785
(Integral<W> && Integral<Bound>) ||
17861786
SizedSentinel<Bound, W>
17871787
{ return bound_ - value_; }
@@ -1831,7 +1831,7 @@
18311831
\begin{itemdecl}
18321832
template<class I>
18331833
concept @\placeholder{Advanceable}@ =
1834-
@\placeholdernc{Decrementable}@<I> && StrictTotallyOrdered<I> &&
1834+
@\placeholder{Decrementable}@<I> && StrictTotallyOrdered<I> &&
18351835
requires(I i, const I j, const iter_difference_t<I> n) {
18361836
{ i += n } -> Same<I&>;
18371837
{ i -= n } -> Same<I&>;
@@ -1951,15 +1951,15 @@
19511951
constexpr void operator++(int);
19521952
constexpr iterator operator++(int) requires Incrementable<W>;
19531953

1954-
constexpr iterator& operator--() requires @\placeholdernc{Decrementable}@<W>;
1955-
constexpr iterator operator--(int) requires @\placeholdernc{Decrementable}@<W>;
1954+
constexpr iterator& operator--() requires @\placeholder{Decrementable}@<W>;
1955+
constexpr iterator operator--(int) requires @\placeholder{Decrementable}@<W>;
19561956

19571957
constexpr iterator& operator+=(difference_type n)
1958-
requires @\placeholdernc{Advanceable}@<W>;
1958+
requires @\placeholder{Advanceable}@<W>;
19591959
constexpr iterator& operator-=(difference_type n)
1960-
requires @\placeholdernc{Advanceable}@<W>;
1960+
requires @\placeholder{Advanceable}@<W>;
19611961
constexpr W operator[](difference_type n) const
1962-
requires @\placeholdernc{Advanceable}@<W>;
1962+
requires @\placeholder{Advanceable}@<W>;
19631963

19641964
friend constexpr bool operator==(const iterator& x, const iterator& y)
19651965
requires EqualityComparable<W>;
@@ -1977,14 +1977,14 @@
19771977
requires StrictTotallyOrdered<W> && ThreeWayComparable<W>;
19781978

19791979
friend constexpr iterator operator+(iterator i, difference_type n)
1980-
requires @\placeholdernc{Advanceable}@<W>;
1980+
requires @\placeholder{Advanceable}@<W>;
19811981
friend constexpr iterator operator+(difference_type n, iterator i)
1982-
requires @\placeholdernc{Advanceable}@<W>;
1982+
requires @\placeholder{Advanceable}@<W>;
19831983

19841984
friend constexpr iterator operator-(iterator i, difference_type n)
1985-
requires @\placeholdernc{Advanceable}@<W>;
1985+
requires @\placeholder{Advanceable}@<W>;
19861986
friend constexpr difference_type operator-(const iterator& x, const iterator& y)
1987-
requires @\placeholdernc{Advanceable}@<W>;
1987+
requires @\placeholder{Advanceable}@<W>;
19881988
};
19891989
}
19901990
\end{codeblock}
@@ -2073,7 +2073,7 @@
20732073

20742074
\indexlibrary{\idxcode{operator\dcr}!\idxcode{iota_view::iterator}}
20752075
\begin{itemdecl}
2076-
constexpr iterator& operator--() requires @\placeholdernc{Decrementable}@<W>;
2076+
constexpr iterator& operator--() requires @\placeholder{Decrementable}@<W>;
20772077
\end{itemdecl}
20782078

20792079
\begin{itemdescr}
@@ -2087,7 +2087,7 @@
20872087

20882088
\indexlibrary{\idxcode{operator\dcr}!\idxcode{iota_view::iterator}}
20892089
\begin{itemdecl}
2090-
constexpr iterator operator--(int) requires @\placeholdernc{Decrementable}@<W>;
2090+
constexpr iterator operator--(int) requires @\placeholder{Decrementable}@<W>;
20912091
\end{itemdecl}
20922092

20932093
\begin{itemdescr}
@@ -2103,7 +2103,7 @@
21032103
\indexlibrary{\idxcode{operator+=}!\idxcode{iota_view::iterator}}
21042104
\begin{itemdecl}
21052105
constexpr iterator& operator+=(difference_type n)
2106-
requires @\placeholdernc{Advanceable}@<W>;
2106+
requires @\placeholder{Advanceable}@<W>;
21072107
\end{itemdecl}
21082108

21092109
\begin{itemdescr}
@@ -2118,7 +2118,7 @@
21182118
\indexlibrary{\idxcode{operator-=}!\idxcode{iota_view::iterator}}
21192119
\begin{itemdecl}
21202120
constexpr iterator& operator-=(difference_type n)
2121-
requires @\placeholdernc{Advanceable}@<W>;
2121+
requires @\placeholder{Advanceable}@<W>;
21222122
\end{itemdecl}
21232123

21242124
\begin{itemdescr}
@@ -2133,7 +2133,7 @@
21332133
\indexlibrary{\idxcode{operator[]}!\idxcode{iota_view::iterator}}
21342134
\begin{itemdecl}
21352135
constexpr W operator[](difference_type n) const
2136-
requires @\placeholdernc{Advanceable}@<W>;
2136+
requires @\placeholder{Advanceable}@<W>;
21372137
\end{itemdecl}
21382138

21392139
\begin{itemdescr}
@@ -2212,7 +2212,7 @@
22122212
\indexlibrary{\idxcode{operator+}!\idxcode{iota_view::iterator}}
22132213
\begin{itemdecl}
22142214
friend constexpr iterator operator+(iterator i, difference_type n)
2215-
requires @\placeholdernc{Advanceable}@<W>;
2215+
requires @\placeholder{Advanceable}@<W>;
22162216
\end{itemdecl}
22172217

22182218
\begin{itemdescr}
@@ -2223,7 +2223,7 @@
22232223
\indexlibrary{\idxcode{operator+}!\idxcode{iota_view::iterator}}
22242224
\begin{itemdecl}
22252225
friend constexpr iterator operator+(difference_type n, iterator i)
2226-
requires @\placeholdernc{Advanceable}@<W>;
2226+
requires @\placeholder{Advanceable}@<W>;
22272227
\end{itemdecl}
22282228

22292229
\begin{itemdescr}
@@ -2234,7 +2234,7 @@
22342234
\indexlibrary{\idxcode{operator-}!\idxcode{iota_view::iterator}}
22352235
\begin{itemdecl}
22362236
friend constexpr iterator operator-(iterator i, difference_type n)
2237-
requires @\placeholdernc{Advanceable}@<W>;
2237+
requires @\placeholder{Advanceable}@<W>;
22382238
\end{itemdecl}
22392239

22402240
\begin{itemdescr}
@@ -2245,7 +2245,7 @@
22452245
\indexlibrary{\idxcode{operator-}!\idxcode{iota_view::iterator}}
22462246
\begin{itemdecl}
22472247
friend constexpr difference_type operator-(const iterator& x, const iterator& y)
2248-
requires @\placeholdernc{Advanceable}@<W>;
2248+
requires @\placeholder{Advanceable}@<W>;
22492249
\end{itemdecl}
22502250

22512251
\begin{itemdescr}
@@ -2539,7 +2539,7 @@
25392539
class filter_view : public view_interface<filter_view<V, Pred>> {
25402540
private:
25412541
V base_ = V(); // \expos
2542-
@\placeholdernc{semiregular-box}@<Pred> pred_; // \expos
2542+
@\placeholder{semiregular-box}@<Pred> pred_; // \expos
25432543

25442544
// \ref{range.filter.iterator}, class \tcode{filter_view::iterator}
25452545
class iterator; // \expos
@@ -2939,7 +2939,7 @@
29392939
template<bool> struct sentinel; // \expos
29402940

29412941
V base_ = V(); // \expos
2942-
@\placeholdernc{semiregular-box}@<F> fun_; // \expos
2942+
@\placeholder{semiregular-box}@<F> fun_; // \expos
29432943

29442944
public:
29452945
transform_view() = default;
@@ -4667,13 +4667,13 @@
46674667
template<class R>
46684668
concept @\placeholdernc{tiny-range}@ = // \expos
46694669
SizedRange<R> &&
4670-
requires { typename @\placeholdernc{require-constant}@<remove_reference_t<R>::size()>; } &&
4670+
requires { typename @\placeholder{require-constant}@<remove_reference_t<R>::size()>; } &&
46714671
(remove_reference_t<R>::size() <= 1);
46724672

46734673
template<InputRange V, ForwardRange Pattern>
46744674
requires View<V> && View<Pattern> &&
46754675
IndirectlyComparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to> &&
4676-
(ForwardRange<V> || @\placeholdernc{tiny-range}@<Pattern>)
4676+
(ForwardRange<V> || @\placeholder{tiny-range}@<Pattern>)
46774677
class split_view : public view_interface<split_view<V, Pattern>> {
46784678
private:
46794679
V base_ = V(); // \expos

‎source/threads.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5622,7 +5622,7 @@
56225622
\begin{itemdescr}
56235623
\pnum
56245624
\requires
5625-
\tcode{\placeholdernc{INVOKE}<R>(f, t$_1$, t$_2$, $\dotsc$, t$_N$)}\iref{func.require}, where \tcode{t$_1$, t$_2$, $\dotsc$, t$_N$} are values
5625+
\tcode{\placeholder{INVOKE}<R>(f, t$_1$, t$_2$, $\dotsc$, t$_N$)}\iref{func.require}, where \tcode{t$_1$, t$_2$, $\dotsc$, t$_N$} are values
56265626
of the corresponding types in \tcode{ArgTypes...}, shall be a valid expression. Invoking
56275627
a copy of \tcode{f} shall behave the same as invoking \tcode{f}.
56285628

@@ -5748,7 +5748,7 @@
57485748

57495749
\begin{itemdescr}
57505750
\pnum
5751-
\effects As if by \tcode{\placeholdernc{INVOKE}<R>(f, t$_1$, t$_2$, $\dotsc$, t$_N$)}\iref{func.require},
5751+
\effects As if by \tcode{\placeholder{INVOKE}<R>(f, t$_1$, t$_2$, $\dotsc$, t$_N$)}\iref{func.require},
57525752
where \tcode{f} is the
57535753
stored task of \tcode{*this} and
57545754
\tcode{t$_1$, t$_2$, $\dotsc$, t$_N$} are the values in \tcode{args...}. If the task returns normally,
@@ -5778,7 +5778,7 @@
57785778

57795779
\begin{itemdescr}
57805780
\pnum
5781-
\effects As if by \tcode{\placeholdernc{INVOKE}<R>(f, t$_1$, t$_2$, $\dotsc$, t$_N$)}\iref{func.require},
5781+
\effects As if by \tcode{\placeholder{INVOKE}<R>(f, t$_1$, t$_2$, $\dotsc$, t$_N$)}\iref{func.require},
57825782
where \tcode{f} is the stored task and
57835783
\tcode{t$_1$, t$_2$, $\dotsc$, t$_N$} are the values in \tcode{args...}. If the task returns normally,
57845784
the return value is stored as the asynchronous result in the shared state of

0 commit comments

Comments
 (0)