X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstream.cpp;h=04b57045b24d2fed98bea7c4bb1aa52359512deb;hb=41a8994da902031a743373c1c57d028b7c900797;hp=56472058c56e3a0c713785a585ddc39f2a484742;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp index 56472058c5..04b57045b2 100644 --- a/src/support/docstream.cpp +++ b/src/support/docstream.cpp @@ -11,6 +11,7 @@ #include #include "support/docstream.h" +#include "support/lstrings.h" #include "support/unicode.h" #include @@ -27,7 +28,24 @@ using lyx::ucs4_codeset; #if defined(_MSC_VER) && (_MSC_VER >= 1600) std::locale::id numpunct::id; -#endif + +namespace std { +// Implementation of numpunct defined in numpunct_lyx_char_type.h +typedef basic_string string_type; + +string_type numpunct::truename() const +{ + return lyx::from_ascii(numpunct::truename()); +} + +string_type numpunct::falsename() const +{ + return lyx::from_ascii(numpunct::falsename()); +} + +} // namespace std + +#endif // _MSC_VER >= 1600 namespace { @@ -70,6 +88,7 @@ public: } else out_cd_ = (iconv_t)(-1); } + string const & encoding() const { return encoding_; } protected: virtual ~iconv_codecvt_facet() { @@ -262,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 @@ -288,7 +307,7 @@ private: string encoding_; }; -} // namespace anon +} // namespace namespace lyx { @@ -315,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() @@ -330,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() @@ -357,37 +388,51 @@ odocstream & operator<<(odocstream & os, SetEnc e) if (has_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(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(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(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; @@ -402,142 +447,8 @@ odocstream & operator<<(odocstream & os, char c) } #endif +} // namespace lyx -void otexstream::put(char_type const & c) -{ - if (protectspace_) { - if (!canbreakline_ && c == ' ') - os_ << "{}"; - protectspace_ = false; - } - os_.put(c); - if (c == '\n') { - ++lines_; - canbreakline_ = false; - } else - canbreakline_ = true; -} - - -BreakLine breakln; -SafeBreakLine safebreakln; - - -otexstream & operator<<(otexstream & ots, BreakLine) -{ - if (ots.canBreakLine()) { - ots.os().put('\n'); - ots.canBreakLine(false); - ots.addLines(1); - } - ots.protectSpace(false); - return ots; -} - - -otexstream & operator<<(otexstream & ots, SafeBreakLine) -{ - if (ots.canBreakLine()) { - ots.os() << "%\n"; - ots.canBreakLine(false); - ots.addLines(1); - } - ots.protectSpace(false); - return ots; -} - - -otexstream & operator<<(otexstream & ots, SetEnc e) -{ - ots.os() << e; - ots.canBreakLine(true); - ots.protectSpace(false); - return ots; -} - - -otexstream & operator<<(otexstream & ots, docstring const & s) -{ - size_t const len = s.length(); - - // Check whether there's something to output - if (len == 0) - return ots; - - if (ots.protectSpace()) { - if (!ots.canBreakLine() && s[0] == ' ') - ots.os() << "{}"; - ots.protectSpace(false); - } - ots.os() << s; - ots.addLines(count(s.begin(), s.end(), '\n')); - ots.canBreakLine(s[len - 1] != '\n'); - return ots; -} - - -otexstream & operator<<(otexstream & ots, char const * s) -{ - size_t const len = strlen(s); - - // Check whether there's something to output - if (len == 0) - return ots; - - if (ots.protectSpace()) { - if (!ots.canBreakLine() && s[0] == ' ') - ots.os() << "{}"; - ots.protectSpace(false); - } - ots.os() << s; - ots.addLines(count(s, s + len, '\n')); - ots.canBreakLine(s[len - 1] != '\n'); - return ots; -} - - -otexstream & operator<<(otexstream & ots, char c) -{ - if (ots.protectSpace()) { - if (!ots.canBreakLine() && c == ' ') - ots.os() << "{}"; - ots.protectSpace(false); - } - ots.os() << c; - if (c == '\n') - ots.addLines(1); - ots.canBreakLine(c != '\n'); - return ots; -} - - -otexstream & operator<<(otexstream & ots, double d) -{ - ots.os() << d; - ots.canBreakLine(true); - ots.protectSpace(false); - return ots; -} - - -otexstream & operator<<(otexstream & ots, int i) -{ - ots.os() << i; - ots.canBreakLine(true); - ots.protectSpace(false); - return ots; -} - - -otexstream & operator<<(otexstream & ots, unsigned int i) -{ - ots.os() << i; - ots.canBreakLine(true); - ots.protectSpace(false); - return ots; -} - -} #if ! defined(USE_WCHAR_T) && defined(__GNUC__) // We get undefined references to these virtual methods. This looks like @@ -584,17 +495,6 @@ bool codecvt::do_always_noconv() const throw() return true; } -#if __GNUC__ == 3 && __GNUC_MINOR__ < 4 - -template<> -int codecvt::do_length( - mbstate_t const &, const char *, const char *, size_t) const -{ - return 1; -} - -#else - template<> int codecvt::do_length( mbstate_t &, const char *, const char *, size_t) const @@ -602,8 +502,6 @@ int codecvt::do_length( return 1; } -#endif - template<> int codecvt::do_max_length() const throw() {