#include <cerrno>
#include <iomanip>
+#include <map>
using std::endl;
namespace {
+#ifdef WORDS_BIGENDIAN
+ char const * utf16_codeset = "UTF16-BE";
+#else
+ char const * utf16_codeset = "UTF16-LE";
+#endif
+
+}
+
+
+namespace lyx {
+
#ifdef WORDS_BIGENDIAN
char const * ucs4_codeset = "UCS-4BE";
- char const * ucs2_codeset = "UCS-2BE";
#else
char const * ucs4_codeset = "UCS-4LE";
- char const * ucs2_codeset = "UCS-2LE";
#endif
-template<typename RetType, typename InType>
-std::vector<RetType>
-iconv_convert(iconv_t * cd,
- char const * tocode,
- char const * fromcode,
- InType const * buf,
- size_t buflen)
-{
- if (buflen == 0)
- return std::vector<RetType>();
+static const iconv_t invalid_cd = (iconv_t)(-1);
+
- if (*cd == (iconv_t)(-1)) {
- *cd = iconv_open(tocode, fromcode);
- if (*cd == (iconv_t)(-1)) {
- lyxerr << "Error returned from iconv_open" << endl;
- switch (errno) {
- case EINVAL:
- lyxerr << "EINVAL The conversion from " << fromcode
- << " to " << tocode
- << " is not supported by the implementation."
- << endl;
- break;
- default:
- lyxerr << "\tSome other error: " << errno << endl;
- break;
+struct IconvProcessor::Private {
+ Private(): cd(invalid_cd) {}
+ ~Private()
+ {
+ if (cd != invalid_cd) {
+ if (iconv_close(cd) == -1) {
+ lyxerr << "Error returned from iconv_close("
+ << errno << ")" << endl;
}
}
}
+ iconv_t cd;
+};
+
+
+IconvProcessor::IconvProcessor(char const * tocode,
+ char const * fromcode): tocode_(tocode), fromcode_(fromcode),
+ pimpl_(new IconvProcessor::Private)
+{
+}
- char ICONV_CONST * inbuf = const_cast<char ICONV_CONST *>(reinterpret_cast<char const *>(buf));
- size_t inbytesleft = buflen * sizeof(InType);
- size_t const outsize = 1000;
- static char out[outsize];
- char * outbuf = out;
- size_t outbytesleft = outsize;
- size_t res = iconv(*cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+IconvProcessor::IconvProcessor(IconvProcessor const & other)
+ : tocode_(other.tocode_), fromcode_(other.fromcode_),
+ pimpl_(new IconvProcessor::Private)
+{
+}
+
+
+IconvProcessor & IconvProcessor::operator=(IconvProcessor const & other)
+{
+ if (&other == this)
+ return *this;
+ tocode_ = other.tocode_;
+ fromcode_ = other.fromcode_;
+ pimpl_.reset(new Private);
+ return *this;
+}
+
+
+IconvProcessor::~IconvProcessor() {}
+
+
+bool IconvProcessor::init()
+{
+ if (pimpl_->cd != invalid_cd)
+ return true;
+
+ pimpl_->cd = iconv_open(tocode_.c_str(), fromcode_.c_str());
+ if (pimpl_->cd != invalid_cd)
+ return true;
+
+ lyxerr << "Error returned from iconv_open" << endl;
+ switch (errno) {
+ case EINVAL:
+ lyxerr << "EINVAL The conversion from " << fromcode_
+ << " to " << tocode_
+ << " is not supported by the implementation."
+ << endl;
+ break;
+ default:
+ lyxerr << "\tSome other error: " << errno << endl;
+ break;
+ }
+ return false;
+}
+
+
+int IconvProcessor::convert(char const * buf, size_t buflen,
+ char * outbuf, size_t maxoutsize)
+{
+ if (buflen == 0)
+ return 0;
+
+ if (pimpl_->cd == invalid_cd) {
+ if (!init())
+ return -1;
+ }
+
+ char ICONV_CONST * inbuf = const_cast<char ICONV_CONST *>(buf);
+ size_t inbytesleft = buflen;
+ size_t outbytesleft = maxoutsize;
+
+ int res = iconv(pimpl_->cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+
+ //lyxerr << std::dec;
+ //lyxerr << "Inbytesleft: " << inbytesleft << endl;
+ //lyxerr << "Outbytesleft: " << outbytesleft << endl;
- if (res == (size_t)(-1)) {
- lyxerr << "Error returned from iconv" << endl;
- switch (errno) {
+ if (res != -1)
+ // Everything went well.
+ return maxoutsize - outbytesleft;
+
+ // There are some errors in the conversion
+ lyxerr << "Error returned from iconv" << endl;
+ switch (errno) {
case E2BIG:
lyxerr << "E2BIG There is not sufficient room at *outbuf." << endl;
break;
case EILSEQ:
lyxerr << "EILSEQ An invalid multibyte sequence"
- << " has been encountered in the input.\n"
- << "When converting from " << fromcode
- << " to " << tocode << ".\n";
+ << " has been encountered in the input.\n"
+ << "When converting from " << fromcode_
+ << " to " << tocode_ << ".\n";
lyxerr << "Input: " << std::hex;
for (size_t i = 0; i < buflen; ++i) {
boost::uint32_t const b = buf[i];
break;
case EINVAL:
lyxerr << "EINVAL An incomplete multibyte sequence"
- << " has been encountered in the input.\n"
- << "When converting from " << fromcode
- << " to " << tocode << ".\n";
+ << " has been encountered in the input.\n"
+ << "When converting from " << fromcode_
+ << " to " << tocode_ << ".\n";
lyxerr << "Input: " << std::hex;
for (size_t i = 0; i < buflen; ++i) {
boost::uint32_t const b = buf[i];
default:
lyxerr << "\tSome other error: " << errno << endl;
break;
- }
- // We got an error so we close down the conversion engine
- if (iconv_close(*cd) == -1) {
- lyxerr << "Error returned from iconv_close("
- << errno << ")" << endl;
- }
- *cd = (iconv_t)(-1);
}
+ // We got an error so we close down the conversion engine
+ if (iconv_close(pimpl_->cd) == -1) {
+ lyxerr << "Error returned from iconv_close("
+ << errno << ")" << endl;
+ }
+ pimpl_->cd = invalid_cd;
+ return -1;
+}
+
+
+namespace {
- //lyxerr << std::dec;
- //lyxerr << "Inbytesleft: " << inbytesleft << endl;
- //lyxerr << "Outbytesleft: " << outbytesleft << endl;
- int bytes = outsize - outbytesleft;
+
+template<typename RetType, typename InType>
+std::vector<RetType>
+iconv_convert(IconvProcessor & processor,
+ InType const * buf,
+ size_t buflen)
+{
+ if (buflen == 0)
+ return std::vector<RetType>();
+
+ char const * inbuf = reinterpret_cast<char const *>(buf);
+ size_t inbytesleft = buflen * sizeof(InType);
+
+ size_t const outsize = 32768;
+ static char out[outsize];
+ char * outbuf = out;
+
+ int bytes = processor.convert(inbuf, inbytesleft, outbuf, outsize);
+ if (bytes <= 0)
+ // Conversion failed
+ // FIXME Maybe throw an exception and handle that in the caller?
+ return std::vector<RetType>();
RetType const * tmp = reinterpret_cast<RetType const *>(out);
return std::vector<RetType>(tmp, tmp + bytes / sizeof(RetType));
std::vector<lyx::char_type> utf8_to_ucs4(std::vector<char> const & utf8str)
{
+ if (utf8str.empty())
+ return std::vector<lyx::char_type>();
+
return utf8_to_ucs4(&utf8str[0], utf8str.size());
}
std::vector<lyx::char_type>
utf8_to_ucs4(char const * utf8str, size_t ls)
{
- static iconv_t cd = (iconv_t)(-1);
- return iconv_convert<lyx::char_type>(&cd, ucs4_codeset, "UTF-8",
- utf8str, ls);
+ static IconvProcessor processor(ucs4_codeset, "UTF-8");
+ return iconv_convert<lyx::char_type>(processor, utf8str, ls);
}
-lyx::char_type
-ucs2_to_ucs4(unsigned short c)
+std::vector<char_type>
+utf16_to_ucs4(unsigned short const * s, size_t ls)
{
- return ucs2_to_ucs4(&c, 1)[0];
+ static IconvProcessor processor(ucs4_codeset, utf16_codeset);
+ return iconv_convert<char_type>(processor, s, ls);
}
-std::vector<lyx::char_type>
-ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str)
-{
- return ucs2_to_ucs4(&ucs2str[0], ucs2str.size());
-}
-
-
-std::vector<lyx::char_type>
-ucs2_to_ucs4(unsigned short const * ucs2str, size_t ls)
+std::vector<unsigned short>
+ucs4_to_utf16(char_type const * s, size_t ls)
{
- static iconv_t cd = (iconv_t)(-1);
- return iconv_convert<lyx::char_type>(&cd, ucs4_codeset, ucs2_codeset,
- ucs2str, ls);
+ static IconvProcessor processor(utf16_codeset, ucs4_codeset);
+ return iconv_convert<unsigned short>(processor, s, ls);
}
-unsigned short
-ucs4_to_ucs2(lyx::char_type c)
+std::vector<char>
+ucs4_to_utf8(lyx::char_type c)
{
- return ucs4_to_ucs2(&c, 1)[0];
+ static IconvProcessor processor("UTF-8", ucs4_codeset);
+ return iconv_convert<char>(processor, &c, 1);
}
-std::vector<unsigned short>
-ucs4_to_ucs2(std::vector<lyx::char_type> const & ucs4str)
+std::vector<char>
+ucs4_to_utf8(std::vector<lyx::char_type> const & ucs4str)
{
- return ucs4_to_ucs2(&ucs4str[0], ucs4str.size());
-}
-
+ if (ucs4str.empty())
+ return std::vector<char>();
-std::vector<unsigned short>
-ucs4_to_ucs2(lyx::char_type const * s, size_t ls)
-{
- static iconv_t cd = (iconv_t)(-1);
- return iconv_convert<unsigned short>(&cd, ucs2_codeset, ucs4_codeset,
- s, ls);
+ return ucs4_to_utf8(&ucs4str[0], ucs4str.size());
}
std::vector<char>
-ucs4_to_utf8(lyx::char_type c)
+ucs4_to_utf8(lyx::char_type const * ucs4str, size_t ls)
{
- static iconv_t cd = (iconv_t)(-1);
- return iconv_convert<char>(&cd, "UTF-8", ucs4_codeset, &c, 1);
+ static IconvProcessor processor("UTF-8", ucs4_codeset);
+ return iconv_convert<char>(processor, ucs4str, ls);
}
-std::vector<char>
-ucs4_to_utf8(std::vector<lyx::char_type> const & ucs4str)
+std::vector<lyx::char_type>
+eightbit_to_ucs4(char const * s, size_t ls, std::string const & encoding)
{
- return ucs4_to_utf8(&ucs4str[0], ucs4str.size());
+ static std::map<std::string, IconvProcessor> processors;
+ if (processors.find(encoding) == processors.end()) {
+ IconvProcessor processor(ucs4_codeset, encoding.c_str());
+ processors.insert(std::make_pair(encoding, processor));
+ }
+ return iconv_convert<char_type>(processors[encoding], s, ls);
}
std::vector<char>
-ucs4_to_utf8(lyx::char_type const * ucs4str, size_t ls)
+ucs4_to_eightbit(lyx::char_type const * ucs4str, size_t ls, std::string const & encoding)
{
- static iconv_t cd = (iconv_t)(-1);
- return iconv_convert<char>(&cd, "UTF-8", ucs4_codeset,
- ucs4str, ls);
+ static std::map<std::string, IconvProcessor> processors;
+ if (processors.find(encoding) == processors.end()) {
+ IconvProcessor processor(encoding.c_str(), ucs4_codeset);
+ processors.insert(std::make_pair(encoding, processor));
+ }
+ return iconv_convert<char>(processors[encoding], ucs4str, ls);
}
+
+} // namespace lyx
projects / lyx.git / blobdiff