Skip to content

Commit 0cff15b

Browse files
jensmaurertkoeppe
authored andcommitted
Improve line breaking (resolves some 'Overfull \hbox' warnings) (#1068)
Partially addresses #693.
1 parent 30f6213 commit 0cff15b

File tree

6 files changed

+107
-68
lines changed

6 files changed

+107
-68
lines changed

source/algorithms.tex

+8-5
Original file line numberDiff line numberDiff line change
@@ -1044,23 +1044,23 @@
10441044
\tcode{InputIterator},
10451045
\tcode{InputIterator1},
10461046
or
1047-
\tcode{InputIterator2},
1047+
\tcode{Input\-Iterator2},
10481048
the template argument shall satisfy the
10491049
requirements of an input iterator~(\ref{input.iterators}).
10501050
\item
10511051
If an algorithm's template parameter is named
10521052
\tcode{OutputIterator},
10531053
\tcode{OutputIterator1},
10541054
or
1055-
\tcode{OutputIterator2},
1055+
\tcode{Output\-Iterator2},
10561056
the template argument shall satisfy the requirements
10571057
of an output iterator~(\ref{output.iterators}).
10581058
\item
10591059
If an algorithm's template parameter is named
10601060
\tcode{ForwardIterator},
10611061
\tcode{ForwardIterator1},
10621062
or
1063-
\tcode{ForwardIterator2},
1063+
\tcode{Forward\-Iterator2},
10641064
the template argument shall satisfy the requirements
10651065
of a forward iterator~(\ref{forward.iterators}).
10661066
\item
@@ -3881,7 +3881,10 @@
38813881

38823882
\begin{itemdescr}
38833883
\pnum
3884-
\returns \tcode{is_sorted_until(std::forward<ExecutionPolicy>(exec), first, last, comp) == last}
3884+
\returns
3885+
\begin{codeblock}
3886+
is_sorted_until(std::forward<ExecutionPolicy>(exec), first, last, comp) == last
3887+
\end{codeblock}
38853888
\end{itemdescr}
38863889

38873890

@@ -5206,7 +5209,7 @@
52065209
\requires
52075210
The value of \tcode{lo} shall be no greater than \tcode{hi}.
52085211
For the first form, type \tcode{T}
5209-
shall be \tcode{LessThanComparable} (Table~\ref{tab:lessthancomparable}).
5212+
shall be \tcode{LessThan\-Comparable} (Table~\ref{tab:lessthancomparable}).
52105213

52115214
\pnum
52125215
\returns

source/atomics.tex

+16-8
Original file line numberDiff line numberDiff line change
@@ -465,14 +465,22 @@
465465
operator @\placeholdernc{integral}@() const noexcept;
466466
@\placeholdernc{integral}@ exchange(@\placeholdernc{integral}@, memory_order = memory_order_seq_cst) volatile noexcept;
467467
@\placeholdernc{integral}@ exchange(@\placeholdernc{integral}@, memory_order = memory_order_seq_cst) noexcept;
468-
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order, memory_order) volatile noexcept;
469-
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order, memory_order) noexcept;
470-
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order, memory_order) volatile noexcept;
471-
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order, memory_order) noexcept;
472-
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order = memory_order_seq_cst) volatile noexcept;
473-
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order = memory_order_seq_cst) noexcept;
474-
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order = memory_order_seq_cst) volatile noexcept;
475-
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@, memory_order = memory_order_seq_cst) noexcept;
468+
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
469+
memory_order, memory_order) volatile noexcept;
470+
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
471+
memory_order, memory_order) noexcept;
472+
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
473+
memory_order, memory_order) volatile noexcept;
474+
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
475+
memory_order, memory_order) noexcept;
476+
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
477+
memory_order = memory_order_seq_cst) volatile noexcept;
478+
bool compare_exchange_weak(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
479+
memory_order = memory_order_seq_cst) noexcept;
480+
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
481+
memory_order = memory_order_seq_cst) volatile noexcept;
482+
bool compare_exchange_strong(@\placeholder{integral}@&,@\itcorr[-1]@ @\placeholdernc{integral}@,
483+
memory_order = memory_order_seq_cst) noexcept;
476484
@\placeholdernc{integral}@ fetch_add(@\placeholdernc{integral}@, memory_order = memory_order_seq_cst) volatile noexcept;
477485
@\placeholdernc{integral}@ fetch_add(@\placeholdernc{integral}@, memory_order = memory_order_seq_cst) noexcept;
478486
@\placeholdernc{integral}@ fetch_sub(@\placeholdernc{integral}@, memory_order = memory_order_seq_cst) volatile noexcept;

source/containers.tex

+6-6
Original file line numberDiff line numberDiff line change
@@ -3209,8 +3209,8 @@
32093209

32103210
\begin{itemdescr}
32113211
\pnum \returns
3212-
A pointer such that \range{data()}{data() + size()} is a valid range, and
3213-
\tcode{data() == addressof(front())}.
3212+
A pointer such that \tcode{data() == addressof(front())},
3213+
and \range{data()}{data() + size()} is a valid range.
32143214
\end{itemdescr}
32153215

32163216
\rSec3[array.fill]{\tcode{array::fill}}
@@ -6338,7 +6338,7 @@
63386338
\pnum
63396339
\requires
63406340
\tcode{is_assignable_v<mapped_type\&, M\&\&>} shall be \tcode{true}.
6341-
\tcode{value_type} shall be \tcode{EmplaceConstructible} into \tcode{map}
6341+
\tcode{value_type} shall be \tcode{Emplace\-Constructible} into \tcode{map}
63426342
from \tcode{k}, \tcode{forward<M>(obj)}.
63436343

63446344
\pnum
@@ -6373,7 +6373,7 @@
63736373
\pnum
63746374
\requires
63756375
\tcode{is_assignable_v<mapped_type\&, M\&\&>} shall be \tcode{true}.
6376-
\tcode{value_type} shall be \tcode{EmplaceConstructible} into \tcode{map}
6376+
\tcode{value_type} shall be \tcode{Emplace\-Constructible} into \tcode{map}
63776377
from \tcode{move(k)}, \tcode{forward<M>(obj)}.
63786378

63796379
\pnum
@@ -7830,7 +7830,7 @@
78307830
\pnum
78317831
\requires
78327832
\tcode{is_assignable_v<mapped_type\&, M\&\&>} shall be \tcode{true}.
7833-
\tcode{value_type} shall be \tcode{EmplaceConstructible} into \tcode{unordered_map}
7833+
\tcode{value_type} shall be \tcode{Emplace\-Constructible} into \tcode{unordered_map}
78347834
from \tcode{k}, \tcode{forward<M>(obj)}.
78357835

78367836
\pnum
@@ -7865,7 +7865,7 @@
78657865
\pnum
78667866
\requires
78677867
\tcode{is_assignable_v<mapped_type\&, M\&\&>} shall be \tcode{true}.
7868-
\tcode{value_type} shall be \tcode{EmplaceConstructible} into \tcode{unordered_map}
7868+
\tcode{value_type} shall be \tcode{Emplace\-Constructible} into \tcode{unordered_map}
78697869
from \tcode{move(k)}, \tcode{forward<M>(obj)}.
78707870

78717871
\pnum

source/declarations.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@
227227

228228
\pnum
229229
A \grammarterm{nodeclspec-function-declaration} shall declare a
230-
constructor, destructor, or conversion function. \footnote{The
230+
constructor, destructor, or conversion function.\footnote{The
231231
``implicit int'' rule of C is no longer supported.}
232232
\begin{note}
233233
A \grammarterm{nodeclspec-function-declaration} can only be used in a
234234
\grammarterm{template-declaration}~(Clause~\ref{temp}),
235-
\grammarterm{explicit-instantiation}~(\ref{temp.explicit}), or
235+
\grammarterm{explicit-instantiation} (\ref{temp.explicit}), or
236236
\grammarterm{explicit-specialization}~(\ref{temp.expl.spec}).
237237
\end{note}
238238

source/tables.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
{
388388
\begin{LongTable}
389389
{#1}{#2}
390-
{x{.30\hsize}x{.68\hsize}}
390+
{x{.30\hsize}x{.64\hsize}}
391391
}
392392
{
393393
\end{LongTable}
@@ -457,7 +457,7 @@
457457
{
458458
\begin{LongTable}
459459
{#1}{#2}
460-
{x{.35\hsize}x{.28\hsize}x{.30\hsize}}
460+
{x{.35\hsize}x{.28\hsize}x{.29\hsize}}
461461
}
462462
{
463463
\end{LongTable}

0 commit comments

Comments
 (0)