Skip to content

Commit 98e474f

Browse files
committed
[iterator.concepts] Stop using LongTable for tables that aren't long.
Fixes an overfull hbox and reduces the risk of tables running off the bottom of the page.
1 parent 7527e05 commit 98e474f

File tree

2 files changed

+16
-36
lines changed

2 files changed

+16
-36
lines changed

source/iterators.tex

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,18 +1899,12 @@
18991899
the indicated semantics.
19001900
\end{itemize}
19011901

1902-
\begin{libreqtab4b}
1902+
\begin{libreqtab4b}[floattable]
19031903
{\oldconcept{Iterator} requirements}
19041904
{iterator}
1905-
\\ \topline
1906-
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
1907-
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
1908-
\endfirsthead
1909-
\continuedcaption\\
1910-
\hline
1905+
\topline
19111906
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
19121907
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
1913-
\endhead
19141908

19151909
\tcode{*r} &
19161910
unspecified &
@@ -2041,18 +2035,13 @@
20412035
and the expressions in \tref{outputiterator}
20422036
are valid and have the indicated semantics.
20432037

2044-
\begin{libreqtab4b}
2038+
\begin{libreqtab4b}[floattable]
20452039
{\oldconcept{OutputIterator} requirements (in addition to \oldconcept{Iterator})}
20462040
{outputiterator}
2047-
\\ \topline
2048-
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
2049-
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
2050-
\endfirsthead
2051-
\continuedcaption\\
2052-
\hline
2041+
\topline
20532042
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
20542043
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
2055-
\endhead
2044+
20562045
\tcode{*r = o} &
20572046
result is not used &
20582047
&
@@ -2143,18 +2132,13 @@
21432132
allows the use of multi-pass one-directional algorithms with forward iterators.
21442133
\end{note}
21452134

2146-
\begin{libreqtab4b}
2135+
\begin{libreqtab4b}[floattable]
21472136
{\oldconcept{ForwardIterator} requirements (in addition to \oldconcept{InputIterator})}
21482137
{forwarditerator}
2149-
\\ \topline
2150-
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
2151-
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
2152-
\endfirsthead
2153-
\continuedcaption\\
2154-
\hline
2138+
\topline
21552139
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
21562140
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
2157-
\endhead
2141+
21582142
\tcode{r++} &
21592143
convertible to \tcode{const X\&} &
21602144
\tcode{\{ X tmp = r;}\br
@@ -2184,18 +2168,13 @@
21842168
in addition to meeting the \oldconcept{ForwardIterator} requirements,
21852169
the following expressions are valid as shown in \tref{bidirectionaliterator}.
21862170

2187-
\begin{libreqtab4b}
2171+
\begin{libreqtab4b}[floattable]
21882172
{\oldconcept{BidirectionalIterator} requirements (in addition to \oldconcept{ForwardIterator})}
21892173
{bidirectionaliterator}
2190-
\\ \topline
2191-
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
2192-
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
2193-
\endfirsthead
2194-
\continuedcaption\\
2195-
\hline
2174+
\topline
21962175
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
21972176
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
2198-
\endhead
2177+
21992178
\tcode{\dcr r} &
22002179
\tcode{X\&} &
22012180
&

source/tables.tex

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,14 +301,15 @@
301301
\end{LongTable}
302302
}
303303

304-
\newenvironment{libreqtab4b}[2]
304+
\newenvironment{libreqtab4b}[3][LongTable]
305305
{
306-
\begin{LongTable}
307-
{#1}{#2}
306+
\def\libreqtabenv{#1}
307+
\begin{\libreqtabenv}
308+
{#2}{#3}
308309
{x{.13\hsize}x{.15\hsize}x{.29\hsize}x{.27\hsize}}
309310
}
310311
{
311-
\end{LongTable}
312+
\end{\libreqtabenv}
312313
}
313314

314315
\newenvironment{libreqtab4c}[2]

0 commit comments

Comments
 (0)