#include <config.h>
#include "support/docstream.h"
+#include "support/lstrings.h"
#include "support/unicode.h"
#include <algorithm>
#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 {
} else
out_cd_ = (iconv_t)(-1);
}
+ string const & encoding() const { return encoding_; }
protected:
virtual ~iconv_codecvt_facet()
{
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
string encoding_;
};
-} // namespace anon
+} // namespace
namespace lyx {
}
+ifdocstream::ifdocstream(SetEnc const & enc) : base()
+{
+ setEncoding(*this, enc.encoding, in);
+}
+
+
ifdocstream::ifdocstream(const char* s, ios_base::openmode mode,
string const & encoding)
: 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()
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;
}
#endif
-
-void otexstream::put(char_type const & c)
-{
- if (protectspace_) {
- if (!canbreakline_ && c == ' ')
- os_ << "{}";
- protectspace_ = false;
- }
- os_.put(c);
- if (c == '\n') {
- texrow_.newline();
- 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.texrow().newline();
- }
- ots.protectSpace(false);
- return ots;
-}
-
-
-otexstream & operator<<(otexstream & ots, SafeBreakLine)
-{
- if (ots.canBreakLine()) {
- ots.os() << "%\n";
- ots.canBreakLine(false);
- ots.texrow().newline();
- }
- ots.protectSpace(false);
- return ots;
-}
+} // namespace lyx
-otexstream & operator<<(otexstream & ots, odocstream_manip pf)
-{
- ots.os() << pf;
- if (pf == static_cast<odocstream_manip>(endl))
- ots.texrow().newline();
- 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.texrow().newlines(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.texrow().newlines(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.texrow().newline();
- ots.canBreakLine(c != '\n');
- return ots;
-}
-
-
-template <typename Type>
-otexstream & operator<<(otexstream & ots, Type value)
-{
- ots.os() << value;
- ots.canBreakLine(true);
- ots.protectSpace(false);
- return ots;
-}
-
-template otexstream & operator<< <SetEnc>(otexstream & os, SetEnc);
-template otexstream & operator<< <double>(otexstream &, double);
-template otexstream & operator<< <int>(otexstream &, int);
-template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
-template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
-
-}
-
#if ! defined(USE_WCHAR_T) && defined(__GNUC__)
// We get undefined references to these virtual methods. This looks like
// a bug in gcc. The implementation here does not do anything useful, since
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
return 1;
}
-#endif
-
template<>
int codecvt<lyx::char_type, char, mbstate_t>::do_max_length() const throw()
{
projects / lyx.git / blobdiff