FIXUP: Move [ostream.formatted.print] to the end of [ostream.formatted]; add reference in [ostream.syn]

Author: burblebee

source/iostreams.tex

@@ -4163,6 +4163,7 @@
   template<class Ostream, class T>
     Ostream&& operator<<(Ostream&& os, const T& x);
 
+  // \ref{ostream.formatted.print}, print functions
   template<class... Args>
     void print(ostream& os, @\exposid{format-string}@<Args...> fmt, Args&&... args);
   template<class... Args>
@@ -6688,6 +6689,92 @@
 \tcode{out}.
 \end{itemdescr}
 
+\rSec4[ostream.formatted.print]{Print}
+
+\indexlibraryglobal{print}%
+\begin{itemdecl}
+template<class... Args>
+  void print(ostream& os, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum
+\effects
+If the ordinary literal encoding\iref{lex.charset} is UTF-8, equivalent to:
+\begin{codeblock}
+vprint_unicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
+\end{codeblock}
+Otherwise, equivalent to:
+\begin{codeblock}
+vprint_nonunicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
+\end{codeblock}
+\end{itemdescr}
+
+\indexlibraryglobal{println}%
+\begin{itemdecl}
+template<class... Args>
+  void println(ostream& os, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum
+\effects
+Equivalent to:
+\begin{codeblock}
+print(os, "{}\n", format(fmt, std::forward<Args>(args)...));
+\end{codeblock}
+\end{itemdescr}
+
+\indexlibraryglobal{vprint_unicode}%
+\indexlibraryglobal{vprint_nonunicode}%
+\begin{itemdecl}
+void vprint_unicode(ostream& os, string_view fmt, format_args args);
+void vprint_nonunicode(ostream& os, string_view fmt, format_args args);
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum
+\effects
+Behaves as a formatted output function\iref{ostream.formatted.reqmts}
+of \tcode{os}, except that:
+\begin{itemize}
+\item
+failure to generate output is reported as specified below, and
+\item
+any exception thrown by the call to \tcode{vformat} is propagated
+without regard to the value of \tcode{os.exceptions()} and
+without turning on \tcode{ios_base::badbit} in the error state of \tcode{os}.
+\end{itemize}
+After constructing a \tcode{sentry} object,
+the function initializes an automatic variable via
+\begin{codeblock}
+string out = vformat(os.getloc(), fmt, args);
+\end{codeblock}
+If the function is \tcode{vprint_unicode} and
+\tcode{os} is a stream that refers to a terminal capable of displaying Unicode
+which is determined in an implementation-defined manner,
+writes \tcode{out} to the terminal using the native Unicode API;
+if \tcode{out} contains invalid code units,
+\indextext{undefined}%
+the behavior is undefined and
+implementations are encouraged to diagnose it.
+Otherwise (if \tcode{os} is not such a stream or
+the function is \tcode{vprint_nonunicode}),
+inserts the character sequence
+\range{out.begin()}{out.end()} into \tcode{os}.
+If writing to the terminal or inserting into \tcode{os} fails,
+calls \tcode{os.setstate(ios_base::badbit)}
+(which may throw \tcode{ios_base::failure}).
+
+\pnum
+\recommended
+For \tcode{vprint_unicode},
+if invoking the native Unicode API requires transcoding,
+implementations should substitute invalid code units
+with \unicode{fffd}{replacement character} per
+The Unicode Standard Version 14.0 - Core Specification, Chapter 3.9.
+\end{itemdescr}
+
 \rSec3[ostream.unformatted]{Unformatted output functions}
 
 \pnum
@@ -7657,92 +7744,6 @@
 May throw \tcode{bad_alloc}.
 \end{itemdescr}
 
-\rSec2[ostream.formatted.print]{Print}
-
-\indexlibraryglobal{print}%
-\begin{itemdecl}
-template<class... Args>
-  void print(ostream& os, @\exposid{format-string}@<Args...> fmt, Args&&... args);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\effects
-If the ordinary literal encoding\iref{lex.charset} is UTF-8, equivalent to:
-\begin{codeblock}
-vprint_unicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
-\end{codeblock}
-Otherwise, equivalent to:
-\begin{codeblock}
-vprint_nonunicode(os, fmt.@\exposid{str}@, make_format_args(std::forward<Args>(args)...));
-\end{codeblock}
-\end{itemdescr}
-
-\indexlibraryglobal{println}%
-\begin{itemdecl}
-template<class... Args>
-  void println(ostream& os, @\exposid{format-string}@<Args...> fmt, Args&&... args);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\effects
-Equivalent to:
-\begin{codeblock}
-print(os, "{}\n", format(fmt, std::forward<Args>(args)...));
-\end{codeblock}
-\end{itemdescr}
-
-\indexlibraryglobal{vprint_unicode}%
-\indexlibraryglobal{vprint_nonunicode}%
-\begin{itemdecl}
-void vprint_unicode(ostream& os, string_view fmt, format_args args);
-void vprint_nonunicode(ostream& os, string_view fmt, format_args args);
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\effects
-Behaves as a formatted output function\iref{ostream.formatted.reqmts}
-of \tcode{os}, except that:
-\begin{itemize}
-\item
-failure to generate output is reported as specified below, and
-\item
-any exception thrown by the call to \tcode{vformat} is propagated
-without regard to the value of \tcode{os.exceptions()} and
-without turning on \tcode{ios_base::badbit} in the error state of \tcode{os}.
-\end{itemize}
-After constructing a \tcode{sentry} object,
-the function initializes an automatic variable via
-\begin{codeblock}
-string out = vformat(os.getloc(), fmt, args);
-\end{codeblock}
-If the function is \tcode{vprint_unicode} and
-\tcode{os} is a stream that refers to a terminal capable of displaying Unicode
-which is determined in an implementation-defined manner,
-writes \tcode{out} to the terminal using the native Unicode API;
-if \tcode{out} contains invalid code units,
-\indextext{undefined}%
-the behavior is undefined and
-implementations are encouraged to diagnose it.
-Otherwise (if \tcode{os} is not such a stream or
-the function is \tcode{vprint_nonunicode}),
-inserts the character sequence
-\range{out.begin()}{out.end()} into \tcode{os}.
-If writing to the terminal or inserting into \tcode{os} fails,
-calls \tcode{os.setstate(ios_base::badbit)}
-(which may throw \tcode{ios_base::failure}).
-
-\pnum
-\recommended
-For \tcode{vprint_unicode},
-if invoking the native Unicode API requires transcoding,
-implementations should substitute invalid code units
-with \unicode{fffd}{replacement character} per
-The Unicode Standard Version 14.0 - Core Specification, Chapter 3.9.
-\end{itemdescr}
-
 \rSec1[string.streams]{String-based streams}
 
 \rSec2[sstream.syn]{Header \tcode{<sstream>} synopsis}