Skip to content

Commit 02f6d23

Browse files
committed
Fix overfull hboxes.
1 parent d1ef75b commit 02f6d23

File tree

4 files changed

+37
-21
lines changed

4 files changed

+37
-21
lines changed

source/algorithms.tex

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,8 +1436,8 @@
14361436
template<class I, class O>
14371437
using replace_copy_result = copy_result<I, O>;
14381438

1439-
template<input_iterator I, sentinel_for<I> S, class T1, class T2, output_iterator<const T2&> O,
1440-
class Proj = identity>
1439+
template<input_iterator I, sentinel_for<I> S, class T1, class T2,
1440+
output_iterator<const T2&> O, class Proj = identity>
14411441
requires indirectly_copyable<I, O> &&
14421442
indirect_relation<ranges::equal_to, projected<I, Proj>, const T1*>
14431443
constexpr replace_copy_result<I, O>
@@ -1909,7 +1909,8 @@
19091909
namespace ranges {
19101910
template<class I, class O> using partial_sort_copy_result = copy_result<I, O>;
19111911

1912-
template<input_iterator I1, sentinel_for<I1> S1, random_access_iterator I2, sentinel_for<I2> S2,
1912+
template<input_iterator I1, sentinel_for<I1> S1,
1913+
random_access_iterator I2, sentinel_for<I2> S2,
19131914
class Comp = ranges::less, class Proj1 = identity, class Proj2 = identity>
19141915
requires indirectly_copyable<I1, I2> && sortable<I2, Comp, Proj2> &&
19151916
indirect_strict_weak_order<Comp, projected<I1, Proj1>, projected<I2, Proj2>>
@@ -2183,7 +2184,8 @@
21832184
}
21842185
};
21852186

2186-
template<input_iterator I, sentinel_for<I> S, weakly_incrementable O1, weakly_incrementable O2,
2187+
template<input_iterator I, sentinel_for<I> S,
2188+
weakly_incrementable O1, weakly_incrementable O2,
21872189
class Proj = identity, indirect_unary_predicate<projected<I, Proj>> Pred>
21882190
requires indirectly_copyable<I, O1> && indirectly_copyable<I, O2>
21892191
constexpr partition_copy_result<I, O1, O2>

source/concepts.tex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,8 @@
10441044
\indexlibrary{\idxcode{regular}}%
10451045
\begin{itemdecl}
10461046
template<class T>
1047-
concept movable = is_object_v<T> && move_constructible<T> && assignable_from<T&, T> && swappable<T>;
1047+
concept movable = is_object_v<T> && move_constructible<T> &&
1048+
assignable_from<T&, T> && swappable<T>;
10481049
template<class T>
10491050
concept copyable = copy_constructible<T> && movable<T> && assignable_from<T&, const T&>;
10501051
template<class T>

source/iterators.tex

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,15 @@
513513

514514
\pnum
515515
The six categories of iterators correspond to the iterator concepts
516-
\libconcept{input_iterator}\iref{iterator.concept.input},
517-
\libconcept{output_iterator}\iref{iterator.concept.output},
518-
\libconcept{forward_iterator}\iref{iterator.concept.forward},
519-
\libconcept{bidirectional_iterator}\iref{iterator.concept.bidir}
520-
\libconcept{random_access_iterator}\iref{iterator.concept.random.access},
516+
\begin{itemize}
517+
\item \libconcept{input_iterator}\iref{iterator.concept.input},
518+
\item \libconcept{output_iterator}\iref{iterator.concept.output},
519+
\item \libconcept{forward_iterator}\iref{iterator.concept.forward},
520+
\item \libconcept{bidirectional_iterator}\iref{iterator.concept.bidir}
521+
\item \libconcept{random_access_iterator}\iref{iterator.concept.random.access},
521522
and
522-
\libconcept{contiguous_iterator}\iref{iterator.concept.contiguous},
523+
\item \libconcept{contiguous_iterator}\iref{iterator.concept.contiguous},
524+
\end{itemize}
523525
respectively.
524526
The generic term \defn{iterator} refers to any type that models the
525527
\libconcept{input_or_output_iterator} concept\iref{iterator.concept.iterator}.
@@ -1536,7 +1538,8 @@
15361538

15371539
\pnum
15381540
The \libconcept{sized_sentinel_for} concept specifies
1539-
requirements on an \libconcept{input_or_output_iterator} and a \libconcept{sentinel_for}
1541+
requirements on an \libconcept{input_or_output_iterator} and
1542+
a corresponding \libconcept{sentinel_for}
15401543
that allow the use of the \tcode{-} operator to compute the distance
15411544
between them in constant time.
15421545

source/ranges.tex

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -360,12 +360,17 @@
360360
Otherwise, if \tcode{E} is an lvalue,
361361
\tcode{\placeholdernc{decay-copy}(E.end())}
362362
if it is a valid expression and its type \tcode{S} models
363-
\tcode{sentinel_for<decltype(\brk{}ranges::\brk{}begin(E))>}.
363+
\begin{codeblock}
364+
sentinel_for<decltype(ranges::begin(E))>
365+
\end{codeblock}
364366

365367
\item
366368
Otherwise, \tcode{\placeholdernc{decay-copy}(end(E))} if it is a valid
367369
expression and its type \tcode{S} models
368-
\tcode{sentinel_for<decltype(\brk{}ranges::\brk{}begin(E))>} with overload
370+
\begin{codeblock}
371+
sentinel_for<decltype(ranges::begin(E))>
372+
\end{codeblock}
373+
with overload
369374
resolution performed in a context that includes the declarations:
370375
\begin{codeblock}
371376
template<class T> void end(T&&) = delete;
@@ -480,12 +485,17 @@
480485
\item
481486
If \tcode{E} is an lvalue, \tcode{\placeholdernc{decay-copy}(E.rend())}
482487
if it is a valid expression and its type \tcode{S} models
483-
\tcode{sentinel_for<\brk{}decltype(ranges::rbegin(E))>}.
488+
\begin{codeblock}
489+
sentinel_for<decltype(ranges::rbegin(E))>
490+
\end{codeblock}
484491

485492
\item
486493
Otherwise, \tcode{\placeholdernc{decay-copy}(rend(E))} if it is a valid
487494
expression and its type \tcode{S} models
488-
\tcode{sentinel_for<decltype(\brk{}ranges::rbegin(E))>} with overload
495+
\begin{codeblock}
496+
sentinel_for<decltype(ranges::rbegin(E))>
497+
\end{codeblock}
498+
with overload
489499
resolution performed in a context that includes the declaration:
490500
\begin{codeblock}
491501
template<class T> void rend(T&&) = delete;
@@ -4874,8 +4884,8 @@
48744884
\begin{itemdescr}
48754885
\pnum
48764886
\effects
4877-
Initializes \tcode{base_} with \tcode{views::all(std::forward<R>(r))} and
4878-
\tcode{pattern_} with \tcode{views::all(std\brk{}::forward<P>(p))}.
4887+
Initializes \tcode{base_} with \tcode{views::all(std::forward<R>(r))}, and
4888+
\tcode{pattern_} with \tcode{views::all(\brk{}std::forward<P>(p))}.
48794889
\end{itemdescr}
48804890

48814891
\indexlibrary{\idxcode{split_view}!\idxcode{split_view}}%
@@ -4889,7 +4899,7 @@
48894899
\begin{itemdescr}
48904900
\pnum
48914901
\effects
4892-
Initializes \tcode{base_} with \tcode{views::all(std::forward<R>(r))} and
4902+
Initializes \tcode{base_} with \tcode{views::all(std::forward<R>(r))}, and
48934903
\tcode{pattern_} with \tcode{single_view\{\brk{}std::move(e)\}}.
48944904
\end{itemdescr}
48954905

@@ -5252,10 +5262,10 @@
52525262

52535263
\begin{itemize}
52545264
\item If \tcode{T} models \libconcept{input_or_output_iterator} and
5255-
\tcode{decltype((F))} models \tcode{\libconcept{convertible_to}<iter_difference_t<T>>},
5265+
\tcode{decltype((F))} models \tcode{\libconcept{convertible_to}<iter_differ\-ence_t<T>>},
52565266
\begin{itemize}
52575267
\item \tcode{subrange\{E, E + static_cast<iter_difference_t<T>>(F)\}}
5258-
if \tcode{T} models \libconcept{random_access_iterator}.
5268+
if \tcode{T} models \libconcept{random_access_\-it\-er\-ator}.
52595269
\item Otherwise,
52605270
\tcode{subrange\{counted_iterator\{E, F\}, default_sentinel\}}.
52615271
\end{itemize}

0 commit comments

Comments
 (0)