Merge pull request #385 from jwakely/fstream-nesting

[file.streams] Change sub-clauses to rSec2, similar to [string.streams]

Author: zygoloid

source/iostreams.tex

@@ -30,9 +30,9 @@
                         &    & \tcode{<ostream>} \\
                         &    & \tcode{<iomanip>} \\ \rowsep
 \ref{string.streams}    & String streams         & \tcode{<sstream>} \\ \rowsep
-\ref{file.streams}      & File streams           & \tcode{<fstream>} \\
-                        &    & \tcode{<cstdio>}  \\
-                        &    & \tcode{<cinttypes>} \\
+\ref{file.streams}      & File streams           & \tcode{<fstream>} \\ \rowsep
+\ref{c.files}           & C library files        & \tcode{<cstdio>}  \\
+                        &                        & \tcode{<cinttypes>} \\
 \end{libsumtab}
 
 \pnum
@@ -382,6 +382,15 @@
 }
 \end{codeblock}
 
+\pnum
+In this Clause, the type name \tcode{FILE} refers to
+the type
+\tcode{FILE}
+declared in
+\tcode{<cstdio>}
+\indexlibrary{\idxhdr{cstdio}}%
+(\ref{c.files}).
+
 \pnum
 The header
 \tcode{<iostream>}
@@ -8402,7 +8411,7 @@
 
 \rSec1[file.streams]{File-based streams}
 
-\rSec2[fstreams]{File streams}
+\rSec2[fstreams]{Overview}
 
 \pnum
 The header
@@ -8449,23 +8458,14 @@
 }
 \end{codeblock}
 
-\pnum
-In this subclause, the type name \tcode{FILE} refers to
-the type
-\tcode{FILE}
-declared in
-\tcode{<cstdio>}
-\indexlibrary{\idxhdr{cstdio}}%
-(\ref{c.files}).
-
 \pnum
 \enternote The class template \tcode{basic_filebuf} treats a file as a source or
 sink of bytes. In an environment that uses a large character set, the file
 typically holds multibyte character sequences and the \tcode{basic_filebuf}
 object converts those multibyte sequences into wide character sequences.
 \exitnote
 
-\rSec3[filebuf]{Class template \tcode{basic_filebuf}}
+\rSec2[filebuf]{Class template \tcode{basic_filebuf}}
 
 \indexlibrary{\idxcode{basic_filebuf}}%
 \begin{codeblock}
@@ -9228,7 +9228,7 @@
 the original contents of the file.
 \end{itemdescr}
 
-\rSec3[ifstream]{Class template \tcode{basic_ifstream}}
+\rSec2[ifstream]{Class template \tcode{basic_ifstream}}
 
 \indexlibrary{\idxcode{basic_ifstream}}%
 \begin{codeblock}
@@ -9468,7 +9468,7 @@
 \tcode{ios_base::failure}~(\ref{iostate.flags})).
 \end{itemdescr}
 
-\rSec3[ofstream]{Class template \tcode{basic_ofstream}}
+\rSec2[ofstream]{Class template \tcode{basic_ofstream}}
 
 \indexlibrary{\idxcode{basic_ofstream}}%
 \begin{codeblock}
@@ -9705,7 +9705,7 @@
 \effects calls \tcode{open(s.c_str(), mode);}
 \end{itemdescr}
 
-\rSec3[fstream]{Class template \tcode{basic_fstream}}
+\rSec2[fstream]{Class template \tcode{basic_fstream}}
 
 \indexlibrary{\idxcode{basic_fstream}}%
 \begin{codeblock}
@@ -9951,7 +9951,7 @@
 \tcode{ios_base::failure}).
 \end{itemdescr}
 
-\rSec2[c.files]{C library files}
+\rSec1[c.files]{C library files}
 
 \pnum
 Table~\ref{tab:iostreams.hdr.cstdio} describes header \tcode{<cstdio>}.