Skip to content

Commit dbd84ed

Browse files
tkoeppetkoeppe
committed
[numerics] Improve linebreaking in synopses and declarations
1 parent 4bfec37 commit dbd84ed

File tree

1 file changed

+63
-120
lines changed

1 file changed

+63
-120
lines changed

‎source/numerics.tex‎

Lines changed: 63 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -331,12 +331,10 @@
331331
template<class T> constexpr bool operator!=(const T&, const complex<T>&);
332332

333333
template<class T, class charT, class traits>
334-
basic_istream<charT, traits>&
335-
operator>>(basic_istream<charT, traits>&, complex<T>&);
334+
basic_istream<charT, traits>& operator>>(basic_istream<charT, traits>&, complex<T>&);
336335

337336
template<class T, class charT, class traits>
338-
basic_ostream<charT, traits>&
339-
operator<<(basic_ostream<charT, traits>&, const complex<T>&);
337+
basic_ostream<charT, traits>& operator<<(basic_ostream<charT, traits>&, const complex<T>&);
340338

341339
// \ref{complex.value.ops}, values
342340
template<class T> constexpr T real(const complex<T>&);
@@ -377,14 +375,14 @@
377375

378376
// \ref{complex.literals}, complex literals
379377
inline namespace literals {
380-
inline namespace complex_literals {
381-
constexpr complex<long double> operator""il(long double);
382-
constexpr complex<long double> operator""il(unsigned long long);
383-
constexpr complex<double> operator""i(long double);
384-
constexpr complex<double> operator""i(unsigned long long);
385-
constexpr complex<float> operator""if(long double);
386-
constexpr complex<float> operator""if(unsigned long long);
387-
}
378+
inline namespace complex_literals {
379+
constexpr complex<long double> operator""il(long double);
380+
constexpr complex<long double> operator""il(unsigned long long);
381+
constexpr complex<double> operator""i(long double);
382+
constexpr complex<double> operator""i(unsigned long long);
383+
constexpr complex<float> operator""if(long double);
384+
constexpr complex<float> operator""if(unsigned long long);
385+
}
388386
}
389387
}
390388
\end{codeblock}
@@ -394,8 +392,7 @@
394392
\indexlibrary{\idxcode{complex}}%
395393
\begin{codeblock}
396394
namespace std {
397-
template<class T>
398-
class complex {
395+
template<class T> class complex {
399396
public:
400397
using value_type = T;
401398

@@ -848,8 +845,7 @@
848845
\indexlibrarymember{operator>>}{complex}%
849846
\begin{itemdecl}
850847
template<class T, class charT, class traits>
851-
basic_istream<charT, traits>&
852-
operator>>(basic_istream<charT, traits>& is, complex<T>& x);
848+
basic_istream<charT, traits>& operator>>(basic_istream<charT, traits>& is, complex<T>& x);
853849
\end{itemdecl}
854850

855851
\begin{itemdescr}
@@ -892,8 +888,7 @@
892888
\indexlibrarymember{operator<<}{complex}%
893889
\begin{itemdecl}
894890
template<class T, class charT, class traits>
895-
basic_ostream<charT, traits>&
896-
operator<<(basic_ostream<charT, traits>& o, const complex<T>& x);
891+
basic_ostream<charT, traits>& operator<<(basic_ostream<charT, traits>& o, const complex<T>& x);
897892
\end{itemdecl}
898893

899894
\begin{itemdescr}
@@ -6501,29 +6496,23 @@
65016496
template<class T> valarray<bool> operator||(const valarray<T>&, const T&);
65026497
template<class T> valarray<bool> operator||(const T&, const valarray<T>&);
65036498

6504-
template<class T>
6505-
valarray<bool> operator==(const valarray<T>&, const valarray<T>&);
6499+
template<class T> valarray<bool> operator==(const valarray<T>&, const valarray<T>&);
65066500
template<class T> valarray<bool> operator==(const valarray<T>&, const T&);
65076501
template<class T> valarray<bool> operator==(const T&, const valarray<T>&);
6508-
template<class T>
6509-
valarray<bool> operator!=(const valarray<T>&, const valarray<T>&);
6502+
template<class T> valarray<bool> operator!=(const valarray<T>&, const valarray<T>&);
65106503
template<class T> valarray<bool> operator!=(const valarray<T>&, const T&);
65116504
template<class T> valarray<bool> operator!=(const T&, const valarray<T>&);
65126505

6513-
template<class T>
6514-
valarray<bool> operator< (const valarray<T>&, const valarray<T>&);
6506+
template<class T> valarray<bool> operator< (const valarray<T>&, const valarray<T>&);
65156507
template<class T> valarray<bool> operator< (const valarray<T>&, const T&);
65166508
template<class T> valarray<bool> operator< (const T&, const valarray<T>&);
6517-
template<class T>
6518-
valarray<bool> operator> (const valarray<T>&, const valarray<T>&);
6509+
template<class T> valarray<bool> operator> (const valarray<T>&, const valarray<T>&);
65196510
template<class T> valarray<bool> operator> (const valarray<T>&, const T&);
65206511
template<class T> valarray<bool> operator> (const T&, const valarray<T>&);
6521-
template<class T>
6522-
valarray<bool> operator<=(const valarray<T>&, const valarray<T>&);
6512+
template<class T> valarray<bool> operator<=(const valarray<T>&, const valarray<T>&);
65236513
template<class T> valarray<bool> operator<=(const valarray<T>&, const T&);
65246514
template<class T> valarray<bool> operator<=(const T&, const valarray<T>&);
6525-
template<class T>
6526-
valarray<bool> operator>=(const valarray<T>&, const valarray<T>&);
6515+
template<class T> valarray<bool> operator>=(const valarray<T>&, const valarray<T>&);
65276516
template<class T> valarray<bool> operator>=(const valarray<T>&, const T&);
65286517
template<class T> valarray<bool> operator>=(const T&, const valarray<T>&);
65296518

@@ -7504,26 +7493,16 @@
75047493
\indexlibrarymember{operator<<}{valarray}%
75057494
\indexlibrarymember{operator>>}{valarray}%
75067495
\begin{itemdecl}
7507-
template<class T> valarray<T> operator*
7508-
(const valarray<T>&, const valarray<T>&);
7509-
template<class T> valarray<T> operator/
7510-
(const valarray<T>&, const valarray<T>&);
7511-
template<class T> valarray<T> operator%
7512-
(const valarray<T>&, const valarray<T>&);
7513-
template<class T> valarray<T> operator+
7514-
(const valarray<T>&, const valarray<T>&);
7515-
template<class T> valarray<T> operator-
7516-
(const valarray<T>&, const valarray<T>&);
7517-
template<class T> valarray<T> operator^
7518-
(const valarray<T>&, const valarray<T>&);
7519-
template<class T> valarray<T> operator&
7520-
(const valarray<T>&, const valarray<T>&);
7521-
template<class T> valarray<T> operator|
7522-
(const valarray<T>&, const valarray<T>&);
7523-
template<class T> valarray<T> operator<<
7524-
(const valarray<T>&, const valarray<T>&);
7525-
template<class T> valarray<T> operator>>
7526-
(const valarray<T>&, const valarray<T>&);
7496+
template<class T> valarray<T> operator* (const valarray<T>&, const valarray<T>&);
7497+
template<class T> valarray<T> operator/ (const valarray<T>&, const valarray<T>&);
7498+
template<class T> valarray<T> operator% (const valarray<T>&, const valarray<T>&);
7499+
template<class T> valarray<T> operator+ (const valarray<T>&, const valarray<T>&);
7500+
template<class T> valarray<T> operator- (const valarray<T>&, const valarray<T>&);
7501+
template<class T> valarray<T> operator^ (const valarray<T>&, const valarray<T>&);
7502+
template<class T> valarray<T> operator& (const valarray<T>&, const valarray<T>&);
7503+
template<class T> valarray<T> operator| (const valarray<T>&, const valarray<T>&);
7504+
template<class T> valarray<T> operator<<(const valarray<T>&, const valarray<T>&);
7505+
template<class T> valarray<T> operator>>(const valarray<T>&, const valarray<T>&);
75277506
\end{itemdecl}
75287507

75297508
\begin{itemdescr}
@@ -7605,22 +7584,14 @@
76057584
\indexlibrarymember{operator\&\&}{valarray}%
76067585
\indexlibrarymember{operator"|"|}{valarray}%
76077586
\begin{itemdecl}
7608-
template<class T> valarray<bool> operator==
7609-
(const valarray<T>&, const valarray<T>&);
7610-
template<class T> valarray<bool> operator!=
7611-
(const valarray<T>&, const valarray<T>&);
7612-
template<class T> valarray<bool> operator<
7613-
(const valarray<T>&, const valarray<T>&);
7614-
template<class T> valarray<bool> operator>
7615-
(const valarray<T>&, const valarray<T>&);
7616-
template<class T> valarray<bool> operator<=
7617-
(const valarray<T>&, const valarray<T>&);
7618-
template<class T> valarray<bool> operator>=
7619-
(const valarray<T>&, const valarray<T>&);
7620-
template<class T> valarray<bool> operator&&
7621-
(const valarray<T>&, const valarray<T>&);
7622-
template<class T> valarray<bool> operator||
7623-
(const valarray<T>&, const valarray<T>&);
7587+
template<class T> valarray<bool> operator==(const valarray<T>&, const valarray<T>&);
7588+
template<class T> valarray<bool> operator!=(const valarray<T>&, const valarray<T>&);
7589+
template<class T> valarray<bool> operator< (const valarray<T>&, const valarray<T>&);
7590+
template<class T> valarray<bool> operator> (const valarray<T>&, const valarray<T>&);
7591+
template<class T> valarray<bool> operator<=(const valarray<T>&, const valarray<T>&);
7592+
template<class T> valarray<bool> operator>=(const valarray<T>&, const valarray<T>&);
7593+
template<class T> valarray<bool> operator&&(const valarray<T>&, const valarray<T>&);
7594+
template<class T> valarray<bool> operator||(const valarray<T>&, const valarray<T>&);
76247595
\end{itemdecl}
76257596

76267597
\begin{itemdescr}
@@ -7709,17 +7680,15 @@
77097680
template<class T> valarray<T> acos (const valarray<T>&);
77107681
template<class T> valarray<T> asin (const valarray<T>&);
77117682
template<class T> valarray<T> atan (const valarray<T>&);
7712-
template<class T> valarray<T> atan2
7713-
(const valarray<T>&, const valarray<T>&);
7683+
template<class T> valarray<T> atan2(const valarray<T>&, const valarray<T>&);
77147684
template<class T> valarray<T> atan2(const valarray<T>&, const T&);
77157685
template<class T> valarray<T> atan2(const T&, const valarray<T>&);
77167686
template<class T> valarray<T> cos (const valarray<T>&);
77177687
template<class T> valarray<T> cosh (const valarray<T>&);
77187688
template<class T> valarray<T> exp (const valarray<T>&);
77197689
template<class T> valarray<T> log (const valarray<T>&);
77207690
template<class T> valarray<T> log10(const valarray<T>&);
7721-
template<class T> valarray<T> pow
7722-
(const valarray<T>&, const valarray<T>&);
7691+
template<class T> valarray<T> pow (const valarray<T>&, const valarray<T>&);
77237692
template<class T> valarray<T> pow (const valarray<T>&, const T&);
77247693
template<class T> valarray<T> pow (const T&, const valarray<T>&);
77257694
template<class T> valarray<T> sin (const valarray<T>&);
@@ -8577,8 +8546,7 @@
85778546
template <class InputIterator, class T>
85788547
T accumulate(InputIterator first, InputIterator last, T init);
85798548
template <class InputIterator, class T, class BinaryOperation>
8580-
T accumulate(InputIterator first, InputIterator last, T init,
8581-
BinaryOperation binary_op);
8549+
T accumulate(InputIterator first, InputIterator last, T init, BinaryOperation binary_op);
85828550

85838551
// \ref{reduce}, reduce
85848552
template<class InputIterator>
@@ -8587,8 +8555,7 @@
85878555
template<class InputIterator, class T>
85888556
T reduce(InputIterator first, InputIterator last, T init);
85898557
template<class InputIterator, class T, class BinaryOperation>
8590-
T reduce(InputIterator first, InputIterator last, T init,
8591-
BinaryOperation binary_op);
8558+
T reduce(InputIterator first, InputIterator last, T init, BinaryOperation binary_op);
85928559
template<class ExecutionPolicy, class ForwardIterator>
85938560
typename iterator_traits<ForwardIterator>::value_type
85948561
reduce(ExecutionPolicy&& exec, // see \ref{algorithms.parallel.overloads}
@@ -8598,8 +8565,7 @@
85988565
ForwardIterator first, ForwardIterator last, T init);
85998566
template<class ExecutionPolicy, class ForwardIterator, class T, class BinaryOperation>
86008567
T reduce(ExecutionPolicy&& exec, // see \ref{algorithms.parallel.overloads}
8601-
ForwardIterator first, ForwardIterator last, T init,
8602-
BinaryOperation binary_op);
8568+
ForwardIterator first, ForwardIterator last, T init, BinaryOperation binary_op);
86038569

86048570
// \ref{inner.product}, inner product
86058571
template <class InputIterator1, class InputIterator2, class T>
@@ -9198,8 +9164,7 @@
91989164
\begin{itemdecl}
91999165
template<class InputIterator, class OutputIterator, class T>
92009166
OutputIterator exclusive_scan(InputIterator first, InputIterator last,
9201-
OutputIterator result,
9202-
T init);
9167+
OutputIterator result, T init);
92039168
\end{itemdecl}
92049169

92059170
\begin{itemdescr}
@@ -9215,8 +9180,7 @@
92159180
template<class ExecutionPolicy, class ForwardIterator1, class ForwardIterator2, class T>
92169181
ForwardIterator2 exclusive_scan(ExecutionPolicy&& exec,
92179182
ForwardIterator1 first, ForwardIterator1 last,
9218-
ForwardIterator2 result,
9219-
T init);
9183+
ForwardIterator2 result, T init);
92209184
\end{itemdecl}
92219185

92229186
\begin{itemdescr}
@@ -9233,14 +9197,12 @@
92339197
\begin{itemdecl}
92349198
template<class InputIterator, class OutputIterator, class T, class BinaryOperation>
92359199
OutputIterator exclusive_scan(InputIterator first, InputIterator last,
9236-
OutputIterator result,
9237-
T init, BinaryOperation binary_op);
9200+
OutputIterator result, T init, BinaryOperation binary_op);
92389201
template<class ExecutionPolicy,
92399202
class ForwardIterator1, class ForwardIterator2, class T, class BinaryOperation>
92409203
ForwardIterator2 exclusive_scan(ExecutionPolicy&& exec,
92419204
ForwardIterator1 first, ForwardIterator1 last,
9242-
ForwardIterator2 result,
9243-
T init, BinaryOperation binary_op);
9205+
ForwardIterator2 result, T init, BinaryOperation binary_op);
92449206
\end{itemdecl}
92459207

92469208
\begin{itemdescr}
@@ -9289,8 +9251,7 @@
92899251
\indexlibrary{\idxcode{inclusive_scan}}%
92909252
\begin{itemdecl}
92919253
template<class InputIterator, class OutputIterator>
9292-
OutputIterator inclusive_scan(InputIterator first, InputIterator last,
9293-
OutputIterator result);
9254+
OutputIterator inclusive_scan(InputIterator first, InputIterator last, OutputIterator result);
92949255
\end{itemdecl}
92959256

92969257
\begin{itemdescr}
@@ -9322,25 +9283,21 @@
93229283
\begin{itemdecl}
93239284
template<class InputIterator, class OutputIterator, class BinaryOperation>
93249285
OutputIterator inclusive_scan(InputIterator first, InputIterator last,
9325-
OutputIterator result,
9326-
BinaryOperation binary_op);
9286+
OutputIterator result, BinaryOperation binary_op);
93279287
template<class ExecutionPolicy, class ForwardIterator1, class ForwardIterator2,
93289288
class BinaryOperation>
93299289
ForwardIterator2 inclusive_scan(ExecutionPolicy&& exec,
93309290
ForwardIterator1 first, ForwardIterator1 last,
9331-
ForwardIterator2 result,
9332-
BinaryOperation binary_op);
9291+
ForwardIterator2 result, BinaryOperation binary_op);
93339292

93349293
template<class InputIterator, class OutputIterator, class BinaryOperation, class T>
93359294
OutputIterator inclusive_scan(InputIterator first, InputIterator last,
9336-
OutputIterator result,
9337-
BinaryOperation binary_op, T init);
9295+
OutputIterator result, BinaryOperation binary_op, T init);
93389296
template<class ExecutionPolicy,
93399297
class ForwardIterator1, class ForwardIterator2, class BinaryOperation, class T>
93409298
ForwardIterator2 inclusive_scan(ExecutionPolicy&& exec,
93419299
ForwardIterator1 first, ForwardIterator1 last,
9342-
ForwardIterator2 result,
9343-
BinaryOperation binary_op, T init);
9300+
ForwardIterator2 result, BinaryOperation binary_op, T init);
93449301
\end{itemdecl}
93459302

93469303
\begin{itemdescr}
@@ -9402,19 +9359,15 @@
94029359
template<class InputIterator, class OutputIterator, class T,
94039360
class BinaryOperation, class UnaryOperation>
94049361
OutputIterator transform_exclusive_scan(InputIterator first, InputIterator last,
9405-
OutputIterator result,
9406-
T init,
9407-
BinaryOperation binary_op,
9408-
UnaryOperation unary_op);
9362+
OutputIterator result, T init,
9363+
BinaryOperation binary_op,UnaryOperation unary_op);
94099364
template<class ExecutionPolicy,
94109365
class ForwardIterator1, class ForwardIterator2, class T,
94119366
class BinaryOperation, class UnaryOperation>
94129367
ForwardIterator2 transform_exclusive_scan(ExecutionPolicy&& exec,
94139368
ForwardIterator1 first, ForwardIterator1 last,
9414-
ForwardIterator2 result,
9415-
T init,
9416-
BinaryOperation binary_op,
9417-
UnaryOperation unary_op);
9369+
ForwardIterator2 result, T init,
9370+
BinaryOperation binary_op, UnaryOperation unary_op);
94189371
\end{itemdecl}
94199372

94209373
\begin{itemdescr}
@@ -9477,32 +9430,26 @@
94779430
class BinaryOperation, class UnaryOperation>
94789431
OutputIterator transform_inclusive_scan(InputIterator first, InputIterator last,
94799432
OutputIterator result,
9480-
BinaryOperation binary_op,
9481-
UnaryOperation unary_op);
9433+
BinaryOperation binary_op, UnaryOperation unary_op);
94829434
template<class ExecutionPolicy,
94839435
class ForwardIterator1, class ForwardIterator2,
94849436
class BinaryOperation, class UnaryOperation>
94859437
ForwardIterator2 transform_inclusive_scan(ExecutionPolicy&& exec,
94869438
ForwardIterator1 first, ForwardIterator1 last,
94879439
ForwardIterator2 result,
9488-
BinaryOperation binary_op,
9489-
UnaryOperation unary_op);
9440+
BinaryOperation binary_op, UnaryOperation unary_op);
94909441
template<class InputIterator, class OutputIterator,
94919442
class BinaryOperation, class UnaryOperation, class T>
94929443
OutputIterator transform_inclusive_scan(InputIterator first, InputIterator last,
94939444
OutputIterator result,
9494-
BinaryOperation binary_op,
9495-
UnaryOperation unary_op,
9496-
T init);
9445+
BinaryOperation binary_op, UnaryOperation unary_op, T init);
94979446
template<class ExecutionPolicy,
94989447
class ForwardIterator1, class ForwardIterator2,
94999448
class BinaryOperation, class UnaryOperation, class T>
95009449
ForwardIterator2 transform_inclusive_scan(ExecutionPolicy&& exec,
95019450
ForwardIterator1 first, ForwardIterator1 last,
95029451
ForwardIterator2 result,
9503-
BinaryOperation binary_op,
9504-
UnaryOperation unary_op,
9505-
T init);
9452+
BinaryOperation binary_op, UnaryOperation unary_op, T init);
95069453
\end{itemdecl}
95079454

95089455
\begin{itemdescr}
@@ -9571,26 +9518,22 @@
95719518
\begin{itemdecl}
95729519
template <class InputIterator, class OutputIterator>
95739520
OutputIterator
9574-
adjacent_difference(InputIterator first, InputIterator last,
9575-
OutputIterator result);
9521+
adjacent_difference(InputIterator first, InputIterator last, OutputIterator result);
95769522
template <class ExecutionPolicy, class ForwardIterator1, class ForwardIterator2>
95779523
ForwardIterator2
95789524
adjacent_difference(ExecutionPolicy&& exec,
9579-
ForwardIterator1 first, ForwardIterator1 last,
9580-
ForwardIterator2 result);
9525+
ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 result);
95819526

95829527
template <class InputIterator, class OutputIterator, class BinaryOperation>
95839528
OutputIterator
95849529
adjacent_difference(InputIterator first, InputIterator last,
9585-
OutputIterator result,
9586-
BinaryOperation binary_op);
9530+
OutputIterator result, BinaryOperation binary_op);
95879531
template <class ExecutionPolicy, class ForwardIterator1, class ForwardIterator2,
95889532
class BinaryOperation>
95899533
ForwardIterator2
95909534
adjacent_difference(ExecutionPolicy&& exec,
95919535
ForwardIterator1 first, ForwardIterator1 last,
9592-
ForwardIterator2 result,
9593-
BinaryOperation binary_op);
9536+
ForwardIterator2 result, BinaryOperation binary_op);
95949537
\end{itemdecl}
95959538

95969539
\begin{itemdescr}

0 commit comments

Comments
 (0)