X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstream.cpp;h=04b57045b24d2fed98bea7c4bb1aa52359512deb;hb=41a8994da902031a743373c1c57d028b7c900797;hp=34008cb8518058e88264eb8d85bf5bf9da767815;hpb=8f2828197cb97d6909843b15455036490b074aa3;p=lyx.git

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 34008cb851..04b57045b2 100644
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -28,7 +28,24 @@ using lyx::ucs4_codeset;
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
 std::locale::id numpunct<lyx::char_type>::id;
-#endif
+
+namespace std {
+// Implementation of numpunct<lyx::char_type> defined in numpunct_lyx_char_type.h
+typedef basic_string<lyx::char_type> string_type;
+
+string_type numpunct<lyx::char_type>::truename() const
+{
+	return lyx::from_ascii(numpunct<char>::truename());
+}
+
+string_type numpunct<lyx::char_type>::falsename() const
+{
+	return lyx::from_ascii(numpunct<char>::falsename());
+}
+
+} // namespace std
+
+#endif // _MSC_VER >= 1600
 
 
 namespace {
@@ -71,6 +88,7 @@ public:
 		} else
 			out_cd_ = (iconv_t)(-1);
 	}
+	string const & encoding() const { return encoding_; }
 protected:
 	virtual ~iconv_codecvt_facet()
 	{
@@ -263,7 +281,7 @@ private:
 				inbytesleft, to, outbytesleft);
 		if (converted == (size_t)(-1)) {
 			switch(errno) {
-			case 0: 
+			case 0:
 				// As strange as it may seem, this
 				// does happen on windows when parsing
 				// comments with accented chars in
@@ -289,7 +307,7 @@ private:
 	string encoding_;
 };
 
-} // namespace anon
+} // namespace
 
 
 namespace lyx {
@@ -316,6 +334,12 @@ ifdocstream::ifdocstream() : base()
 }
 
 
+ifdocstream::ifdocstream(SetEnc const & enc) : base()
+{
+	setEncoding(*this, enc.encoding, in);
+}
+
+
 ifdocstream::ifdocstream(const char* s, ios_base::openmode mode,
 			 string const & encoding)
 	: base()
@@ -331,6 +355,12 @@ ofdocstream::ofdocstream(): base()
 }
 
 
+ofdocstream::ofdocstream(SetEnc const & enc) : base()
+{
+	setEncoding(*this, enc.encoding, out);
+}
+
+
 ofdocstream::ofdocstream(const char* s, ios_base::openmode mode,
 			 string const & encoding)
 	: base()
@@ -358,37 +388,51 @@ odocstream & operator<<(odocstream & os, SetEnc e)
 	if (has_facet<iconv_codecvt_facet>(os.rdbuf()->getloc())) {
 		// This stream must be a file stream, since we never imbue
 		// any other stream with a locale having a iconv_codecvt_facet.
+		iconv_codecvt_facet const & facet =
+			use_facet<iconv_codecvt_facet>(os.rdbuf()->getloc());
+
+		// FIXME Changing the codecvt facet of an open file is allowed,
+		// but unsafe for facets that use internal state (see the thread
+		// "iostreams: Does imbue() need to be called before open()?"
+		// in comp.std.c++.
+		// Currently it seems to work with gcc and MSVC, but not with
+		// clang on OS X.
+		// Avoid imbueing with the same encoding again if possible.
+		if (facet.encoding() == e.encoding)
+			return os;
+
 		// Flush the stream so that all pending output is written
 		// with the old encoding.
 		os.flush();
+
 		locale locale(os.rdbuf()->getloc(),
 			new iconv_codecvt_facet(e.encoding, ios_base::out));
-		// FIXME Does changing the codecvt facet of an open file
-		// stream always work? It does with gcc 4.1, but I have read
-		// somewhere that it does not with MSVC.
-		// What does the standard say?
 		os.imbue(locale);
 	}
 	return os;
 }
 
 
-//CHECKME: I just copied the code above, and have no idea whether it
-//is correct... (JMarc)
 idocstream & operator<<(idocstream & is, SetEnc e)
 {
 	if (has_facet<iconv_codecvt_facet>(is.rdbuf()->getloc())) {
 		// This stream must be a file stream, since we never imbue
 		// any other stream with a locale having a iconv_codecvt_facet.
-		// Flush the stream so that all pending output is written
-		// with the old encoding.
-		//is.flush();
+		iconv_codecvt_facet const & facet =
+			use_facet<iconv_codecvt_facet>(is.rdbuf()->getloc());
+
+		// FIXME Changing the codecvt facet of an open file is allowed,
+		// but unsafe for facets that use internal state (see the thread
+		// "iostreams: Does imbue() need to be called before open()?"
+		// in comp.std.c++.
+		// Currently it seems to work with gcc and MSVC, but not with
+		// clang on OS X.
+		// Avoid imbueing with the same encoding again if possible.
+		if (facet.encoding() == e.encoding)
+			return is;
+
 		locale locale(is.rdbuf()->getloc(),
 			new iconv_codecvt_facet(e.encoding, ios_base::in));
-		// FIXME Does changing the codecvt facet of an open file
-		// stream always work? It does with gcc 4.1, but I have read
-		// somewhere that it does not with MSVC.
-		// What does the standard say?
 		is.imbue(locale);
 	}
 	return is;
@@ -403,7 +447,7 @@ odocstream & operator<<(odocstream & os, char c)
 }
 #endif
 
-}
+} // namespace lyx
 
 
 #if ! defined(USE_WCHAR_T) && defined(__GNUC__)
@@ -451,17 +495,6 @@ bool codecvt<lyx::char_type, char, mbstate_t>::do_always_noconv() const throw()
 	return true;
 }
 
-#if __GNUC__ == 3 && __GNUC_MINOR__ < 4
-
-template<>
-int codecvt<lyx::char_type, char, mbstate_t>::do_length(
-	mbstate_t const &, const char *, const char *, size_t) const
-{
-	return 1;
-}
-
-#else
-
 template<>
 int codecvt<lyx::char_type, char, mbstate_t>::do_length(
 	mbstate_t &, const char *, const char *, size_t) const
@@ -469,8 +502,6 @@ int codecvt<lyx::char_type, char, mbstate_t>::do_length(
 	return 1;
 }
 
-#endif
-
 template<>
 int codecvt<lyx::char_type, char, mbstate_t>::do_max_length() const throw()
 {