TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems...

[lyx.git] / src / support / docstream.h

diff --git a/src/support/docstream.h b/src/support/docstream.h
index c1f4f1ad8b056bbfcdd8930b36f77519021fd9d6..0a2d42b38bb418b0b6a02d3a7a55c507ff962f64 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -14,11 +14,24 @@
 
 #include "support/docstring.h"
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) 
+// Ugly workaround for MSVC10 STL bug:
+// std::numpunct has a hardcoded dllimport in definition, but we wanna it with 32 bit 
+// so we can't import it and must define it but then the compiler complains.
+#include "support/numpunct_lyx_char_type.h"
+#endif
+
 #include <fstream>
 #include <sstream>
 
 namespace lyx {
 
+class iconv_codecvt_facet_exception : public std::exception {
+public:
+       virtual ~iconv_codecvt_facet_exception() throw() {}
+       virtual const char * what() const throw();
+};
+
 /// Base class for UCS4 input streams
 typedef std::basic_istream<char_type> idocstream;
 
@@ -36,38 +49,58 @@ typedef std::basic_ostream<char_type> odocstream;
 
 /// File stream for reading UTF8-encoded files with automatic conversion to
 /// UCS4.
-class idocfstream : public std::basic_ifstream<char_type> {
+class ifdocstream : public std::basic_ifstream<char_type> {
        typedef std::basic_ifstream<char_type> base;
 public:
-       idocfstream();
-       explicit idocfstream(const char* s,
-               std::ios_base::openmode mode = std::ios_base::in);
-       ~idocfstream() {}
+       ifdocstream();
+       explicit ifdocstream(const char* s,
+               std::ios_base::openmode mode = std::ios_base::in,
+               std::string const & encoding = "UTF-8");
+       ~ifdocstream() {}
 };
 
-/// File stream for writing UTF8-encoded files with automatic conversion from
-/// UCS4.
-class odocfstream : public std::basic_ofstream<char_type> {
+/// File stream for writing files in 8bit encoding \p encoding with automatic
+/// conversion from UCS4.
+
+class ofdocstream : public std::basic_ofstream<char_type> {
        typedef std::basic_ofstream<char_type> base;
 public:
-       odocfstream();
-       explicit odocfstream(const char* s,
-               std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc);
-       ~odocfstream() {}
+       ofdocstream();
+       explicit ofdocstream(const char* s,
+               std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc,
+               std::string const & encoding = "UTF-8");
+       ~ofdocstream() {}
+       ///
+       void reset(std::string const & encoding);
 };
 
+
+
 /// UCS4 input stringstream
 typedef std::basic_istringstream<char_type> idocstringstream;
 
 /// UCS4 output stringstream
 typedef std::basic_ostringstream<char_type> odocstringstream;
 
-inline
-odocstream & operator<<(odocstream & os, char c)
-{
-    os.put(c);
-    return os;
-}
+/// Helper struct for changing stream encoding
+struct SetEnc {
+       SetEnc(std::string const & e) : encoding(e) {}
+       std::string encoding;
+};
+
+/// Helper function for changing stream encoding
+SetEnc setEncoding(std::string const & encoding);
+
+/** Change the encoding of \p os to \p e.encoding.
+    \p e.encoding must be a valid iconv name of an 8bit encoding.
+    This does nothing if the stream is not a file stream, since only
+    file streams do have an associated 8bit encoding.
+    Usage: \code
+    os << setEncoding("ISO-8859-1");
+    \endcode
+ */
+odocstream & operator<<(odocstream & os, SetEnc e);
+idocstream & operator<<(idocstream & os, SetEnc e);
 
 }