#include <config.h>
-#include "docstream.h"
-#include "unicode.h"
+#include "support/docstream.h"
+#include "support/unicode.h"
#include <cerrno>
#include <cstdio>
#include <iconv.h>
#include <locale>
+using namespace std;
using lyx::ucs4_codeset;
-using std::string;
-
-
namespace {
// We use C IO throughout this file, because the facets might be used with
/// codecvt facet for conversion of UCS4 (internal representation) to UTF8
/// (external representation) or vice versa
-class iconv_codecvt_facet : public std::codecvt<lyx::char_type, char, std::mbstate_t>
+class iconv_codecvt_facet : public codecvt<lyx::char_type, char, mbstate_t>
{
- typedef std::codecvt<lyx::char_type, char, std::mbstate_t> base;
+ typedef codecvt<lyx::char_type, char, mbstate_t> base;
public:
/// Constructor. You have to specify with \p inout whether you want
/// to use this facet only for input, only for output or for both.
explicit iconv_codecvt_facet(string const & encoding = "UTF-8",
- std::ios_base::openmode inout = std::ios_base::in | std::ios_base::out,
+ ios_base::openmode inout = ios_base::in | ios_base::out,
size_t refs = 0)
: base(refs), encoding_(encoding)
{
- if (inout & std::ios_base::in) {
+ if (inout & ios_base::in) {
in_cd_ = iconv_open(ucs4_codeset, encoding.c_str());
if (in_cd_ == (iconv_t)(-1)) {
fprintf(stderr, "Error %d returned from iconv_open(in_cd_): %s\n",
}
} else
in_cd_ = (iconv_t)(-1);
- if (inout & std::ios_base::out) {
+ if (inout & ios_base::out) {
out_cd_ = iconv_open(encoding.c_str(), ucs4_codeset);
if (out_cd_ == (iconv_t)(-1)) {
fprintf(stderr, "Error %d returned from iconv_open(out_cd_): %s\n",
return to_next - to;
#else
size_t const length = end - from;
- return std::min(length, max);
+ return min(length, max);
#endif
}
virtual int do_max_length() const throw()
iconv_t in_cd_;
iconv_t out_cd_;
/// The narrow encoding
- std::string encoding_;
+ string encoding_;
};
} // namespace anon
namespace lyx {
+template<class Ios>
+void setEncoding(Ios & ios, string const & encoding, ios_base::openmode mode)
+{
+ // We must imbue the stream before openening the file
+ locale global;
+ locale locale(global, new iconv_codecvt_facet(encoding, mode));
+ ios.imbue(locale);
+}
+
const char * iconv_codecvt_facet_exception::what() const throw()
{
idocfstream::idocfstream(string const & encoding) : base()
{
- std::locale global;
- std::locale locale(global, new iconv_codecvt_facet(encoding, in));
- imbue(locale);
+ setEncoding(*this, encoding, in);
}
-idocfstream::idocfstream(const char* s, std::ios_base::openmode mode,
+idocfstream::idocfstream(const char* s, ios_base::openmode mode,
string const & encoding)
: base()
{
- // We must imbue the stream before openening the file
- std::locale global;
- std::locale locale(global, new iconv_codecvt_facet(encoding, in));
- imbue(locale);
+ setEncoding(*this, encoding, in);
open(s, mode);
}
+odocfstream::odocfstream(): base()
+{
+}
+
+
odocfstream::odocfstream(string const & encoding) : base()
{
- std::locale global;
- std::locale locale(global, new iconv_codecvt_facet(encoding, out));
- imbue(locale);
+ setEncoding(*this, encoding, out);
}
-odocfstream::odocfstream(const char* s, std::ios_base::openmode mode,
+odocfstream::odocfstream(const char* s, ios_base::openmode mode,
string const & encoding)
: base()
{
- // We must imbue the stream before openening the file
- std::locale global;
- std::locale locale(global, new iconv_codecvt_facet(encoding, out));
- imbue(locale);
+ setEncoding(*this, encoding, out);
open(s, mode);
}
+void odocfstream::reset(string const & encoding)
+{
+ setEncoding(*this, encoding, out);
+}
+
+
+
SetEnc setEncoding(string const & encoding)
{
return SetEnc(encoding);
odocstream & operator<<(odocstream & os, SetEnc e)
{
- if (std::has_facet<iconv_codecvt_facet>(os.rdbuf()->getloc())) {
+ 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.
// Flush the stream so that all pending output is written
// with the old encoding.
os.flush();
- std::locale locale(os.rdbuf()->getloc(),
- new iconv_codecvt_facet(e.encoding, std::ios_base::out));
+ 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.
return os;
}
+
+#if ! defined(USE_WCHAR_T)
+odocstream & operator<<(odocstream & os, char c)
+{
+ os.put(c);
+ return os;
+}
+#endif
+
}
#if ! defined(USE_WCHAR_T) && defined(__GNUC__)
// a bug in gcc. The implementation here does not do anything useful, since
// it is overriden in iconv_codecvt_facet.
namespace std {
+
template<> codecvt<lyx::char_type, char, mbstate_t>::result
-codecvt<lyx::char_type, char, mbstate_t>::do_out(mbstate_t &, const lyx::char_type *, const lyx::char_type *, const lyx::char_type *&,
- char *, char *, char *&) const { return error; }
+codecvt<lyx::char_type, char, mbstate_t>::do_out(
+ mbstate_t &, const lyx::char_type *, const lyx::char_type *,
+ const lyx::char_type *&, char *, char *, char *&) const
+{
+ return error;
+}
+
+
template<> codecvt<lyx::char_type, char, mbstate_t>::result
-codecvt<lyx::char_type, char, mbstate_t>::do_unshift(mbstate_t &, char *, char *, char *&) const { return error; }
+codecvt<lyx::char_type, char, mbstate_t>::do_unshift(
+ mbstate_t &, char *, char *, char *&) const
+{
+ return error;
+}
+
+
template<> codecvt<lyx::char_type, char, mbstate_t>::result
-codecvt<lyx::char_type, char, mbstate_t>::do_in(mbstate_t &, const char *, const char *, const char *&,
- lyx::char_type *, lyx::char_type *, lyx::char_type *&) const { return error; }
-template<> int codecvt<lyx::char_type, char, mbstate_t>::do_encoding() const throw() { return 0; }
-template<> bool codecvt<lyx::char_type, char, mbstate_t>::do_always_noconv() const throw() { return true; }
+codecvt<lyx::char_type, char, mbstate_t>::do_in(
+ mbstate_t &, const char *, const char *, const char *&,
+ lyx::char_type *, lyx::char_type *, lyx::char_type *&) const
+{
+ return error;
+}
+
+
+template<>
+int codecvt<lyx::char_type, char, mbstate_t>::do_encoding() const throw()
+{
+ return 0;
+}
+
+
+template<>
+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; }
+
+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; }
+
+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() { return 4; }
+
+template<>
+int codecvt<lyx::char_type, char, mbstate_t>::do_max_length() const throw()
+{
+ return 4;
}
+
+} // namespace std
#endif
projects / lyx.git / blobdiff