Skip to content

Commit 4e6dc96

Browse files
committed
[re] Move long pieces of code into codeblocks and remove redundant "the result of" from return statements
This fixes overfull hboxes, see #693.
1 parent 9ed3d36 commit 4e6dc96

File tree

1 file changed

+32
-13
lines changed

1 file changed

+32
-13
lines changed

source/regex.tex

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,8 +1115,12 @@
11151115
\end{itemdecl}
11161116

11171117
\begin{itemdescr}
1118-
\pnum\effects If \tcode{typeid(use_facet<collate<charT>>)
1119-
== typeid(collate_byname<charT>)}
1118+
\pnum
1119+
\effects
1120+
If
1121+
\begin{codeblock}
1122+
typeid(use_facet<collate<charT>>) == typeid(collate_byname<charT>)
1123+
\end{codeblock}
11201124
and the form of the sort key returned
11211125
by \tcode{collate_byname<charT>::transform(first, last)} is known and
11221126
can be converted into a primary sort key then returns that key,
@@ -2000,7 +2004,11 @@
20002004
\end{itemdecl}
20012005

20022006
\begin{itemdescr}
2003-
\pnum\returns \tcode{rhs.compare(typename sub_match<BiIter>::string_type(lhs.data(), lhs.size())) == 0}.
2007+
\pnum
2008+
\returns
2009+
\begin{codeblock}
2010+
rhs.compare(typename sub_match<BiIter>::string_type(lhs.data(), lhs.size())) == 0
2011+
\end{codeblock}
20042012
\end{itemdescr}
20052013

20062014
\indexlibrarymember{sub_match}{operator"!=}%
@@ -2024,7 +2032,11 @@
20242032
\end{itemdecl}
20252033

20262034
\begin{itemdescr}
2027-
\pnum\returns \tcode{rhs.compare(typename sub_match<BiIter>::string_type(lhs.data(), lhs.size())) > 0}.
2035+
\pnum
2036+
\returns
2037+
\begin{codeblock}
2038+
rhs.compare(typename sub_match<BiIter>::string_type(lhs.data(), lhs.size())) > 0
2039+
\end{codeblock}
20282040
\end{itemdescr}
20292041

20302042
\indexlibrarymember{sub_match}{operator>}%
@@ -2072,7 +2084,11 @@
20722084
\end{itemdecl}
20732085

20742086
\begin{itemdescr}
2075-
\pnum\returns \tcode{lhs.compare(typename sub_match<BiIter>::string_type(rhs.data(), rhs.size())) == 0}.
2087+
\pnum
2088+
\returns
2089+
\begin{codeblock}
2090+
lhs.compare(typename sub_match<BiIter>::string_type(rhs.data(), rhs.size())) == 0
2091+
\end{codeblock}
20762092
\end{itemdescr}
20772093

20782094
\indexlibrary{\idxcode{operator"!=}!\idxcode{sub_match}}%
@@ -2098,7 +2114,11 @@
20982114
\end{itemdecl}
20992115

21002116
\begin{itemdescr}
2101-
\pnum\returns \tcode{lhs.compare(typename sub_match<BiIter>::string_type(rhs.data(), rhs.size())) < 0}.
2117+
\pnum
2118+
\returns
2119+
\begin{codeblock}
2120+
lhs.compare(typename sub_match<BiIter>::string_type(rhs.data(), rhs.size())) < 0
2121+
\end{codeblock}
21022122
\end{itemdescr}
21032123

21042124
\indexlibrarymember{operator>}{sub_match}%
@@ -3268,8 +3288,7 @@
32683288

32693289
\begin{itemdescr}
32703290
\pnum
3271-
\returns The result of \tcode{regex_search(str,
3272-
str + char_traits<charT>::length(str), m, e, flags)}.
3291+
\returns \tcode{regex_search(str, str + char_traits<charT>::length(str), m, e, flags)}.
32733292
\end{itemdescr}
32743293

32753294
\indexlibrary{\idxcode{regex_search}}%
@@ -3283,8 +3302,8 @@
32833302
\end{itemdecl}
32843303

32853304
\begin{itemdescr}
3286-
\pnum\returns The result of \tcode{regex_search(s.begin(), s.end(), m,
3287-
e, flags)}.
3305+
\pnum
3306+
\returns \tcode{regex_search(s.begin(), s.end(), m, e, flags)}.
32883307
\end{itemdescr}
32893308

32903309
\indexlibrary{\idxcode{regex_search}}%
@@ -3297,9 +3316,9 @@
32973316

32983317
\begin{itemdescr}
32993318
\pnum
3300-
\effects Behaves ``as if'' by constructing an object \tcode{what}
3301-
of type \tcode{match_results<BidirectionalIterator>}, and then returning
3302-
the result of \tcode{regex_search(first, last, what, e, flags)}.
3319+
\effects Behaves ``as if'' by constructing an object \tcode{what}
3320+
of type \tcode{match_results<Bidirectional\-Iterator>} and returning
3321+
\tcode{regex_search(first, last, what, e, flags)}.
33033322
\end{itemdescr}
33043323

33053324
\indexlibrary{\idxcode{regex_search}}%

0 commit comments

Comments
 (0)