X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Funicode.cpp;h=adec55299c552221a6fbb7c8aef2657e9c1df9b3;hb=14fa2c71625c715ffcc42d13ee0151333079de2c;hp=682ac3e9664f5ee9a080b7424f251255787a66db;hpb=7c41973d518f733f32f38ba32f471abf11188f3c;p=lyx.git diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp index 682ac3e966..adec55299c 100644 --- a/src/support/unicode.cpp +++ b/src/support/unicode.cpp @@ -12,23 +12,23 @@ #include -#include "unicode.h" +#include "support/unicode.h" +#include "support/debug.h" -#include "debug.h" +#include #include #include #include -#include #include +#include +//Needed in MSVC +#include -using std::endl; -using std::map; -using std::make_pair; -using std::string; -using std::vector; + +using namespace std; namespace { @@ -49,95 +49,75 @@ namespace lyx { char const * ucs4_codeset = "UCS-4LE"; #endif -static const iconv_t invalid_cd = (iconv_t)(-1); - -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; - } - } +struct IconvProcessor::Handler { + // assumes cd is valid + Handler(iconv_t const cd) : cd(cd) {} + ~Handler() { + if (iconv_close(cd) == -1) + LYXERR0("Error returned from iconv_close(" << errno << ')'); } - iconv_t cd; + iconv_t const cd; }; -IconvProcessor::IconvProcessor(char const * tocode, char const * fromcode) - : tocode_(tocode), fromcode_(fromcode), - pimpl_(new IconvProcessor::Private) -{ -} - - -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(string tocode, string fromcode) + : tocode_(tocode), fromcode_(fromcode) +{} -IconvProcessor::~IconvProcessor() {} +// for gcc 4.6 +IconvProcessor::IconvProcessor(IconvProcessor && other) + : tocode_(move(other.tocode_)), fromcode_(move(other.fromcode_)), + h_(move(other.h_)) +{} bool IconvProcessor::init() { - if (pimpl_->cd != invalid_cd) + if (h_) return true; - - pimpl_->cd = iconv_open(tocode_.c_str(), fromcode_.c_str()); - if (pimpl_->cd != invalid_cd) + iconv_t cd = iconv_open(tocode_.c_str(), fromcode_.c_str()); + if (cd != (iconv_t)(-1)) { + h_ = make_unique(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; + 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) + char * outbuf, size_t maxoutsize) { if (buflen == 0) return 0; - if (pimpl_->cd == invalid_cd) { - if (!init()) - return -1; - } + if (!h_ && !init()) + return -1; char ICONV_CONST * inbuf = const_cast(buf); size_t inbytesleft = buflen; size_t outbytesleft = maxoutsize; - int res = iconv(pimpl_->cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + int res = iconv(h_->cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); - //lyxerr << std::dec; + // flush out remaining data. This is needed because iconv sometimes + // holds back chars in the stream, waiting for a combination character + // (see e.g. http://sources.redhat.com/bugzilla/show_bug.cgi?id=1124) + iconv(h_->cd, NULL, NULL, &outbuf, &outbytesleft); + + //lyxerr << dec; //lyxerr << "Inbytesleft: " << inbytesleft << endl; //lyxerr << "Outbytesleft: " << outbytesleft << endl; @@ -156,41 +136,37 @@ int IconvProcessor::convert(char const * buf, size_t buflen, << " has been encountered in the input.\n" << "When converting from " << fromcode_ << " to " << tocode_ << ".\n"; - lyxerr << "Input:" << std::hex; + lyxerr << "Input:" << hex; for (size_t i = 0; i < buflen; ++i) { // char may be signed, avoid output of // something like 0xffffffc2 boost::uint32_t const b = *reinterpret_cast(buf + i); - lyxerr << " 0x" << b; + lyxerr << " 0x" << (unsigned int)b; } - lyxerr << std::dec << endl; + lyxerr << dec << endl; break; case EINVAL: lyxerr << "EINVAL An incomplete multibyte sequence" << " has been encountered in the input.\n" << "When converting from " << fromcode_ << " to " << tocode_ << ".\n"; - lyxerr << "Input:" << std::hex; + lyxerr << "Input:" << hex; for (size_t i = 0; i < buflen; ++i) { // char may be signed, avoid output of // something like 0xffffffc2 boost::uint32_t const b = *reinterpret_cast(buf + i); - lyxerr << " 0x" << b; + lyxerr << " 0x" << (unsigned int)b; } - lyxerr << std::dec << endl; + lyxerr << dec << endl; break; default: lyxerr << "\tSome other error: " << errno << endl; break; } // 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; + h_.reset(); return -1; } @@ -200,9 +176,7 @@ namespace { template vector -iconv_convert(IconvProcessor & processor, - InType const * buf, - size_t buflen) +iconv_convert(IconvProcessor & processor, InType const * buf, size_t buflen) { if (buflen == 0) return vector(); @@ -210,23 +184,39 @@ iconv_convert(IconvProcessor & processor, char const * inbuf = reinterpret_cast(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); + static QThreadStorage *> static_outbuf; + if (!static_outbuf.hasLocalData()) + static_outbuf.setLocalData(new std::vector(32768)); + std::vector & outbuf = *static_outbuf.localData(); + // The number of UCS4 code points in buf is at most inbytesleft. + // The output encoding will use at most + // max_encoded_bytes(pimpl_->tocode_) per UCS4 code point. + size_t maxoutbufsize = max_encoded_bytes(processor.to()) * inbytesleft; + if (outbuf.size() < maxoutbufsize) + outbuf.resize(maxoutbufsize); + + int bytes = processor.convert(inbuf, inbytesleft, &outbuf[0], outbuf.size()); if (bytes <= 0) // Conversion failed // FIXME Maybe throw an exception and handle that in the caller? return vector(); - RetType const * tmp = reinterpret_cast(out); + RetType const * tmp = reinterpret_cast(&outbuf[0]); return vector(tmp, tmp + bytes / sizeof(RetType)); } } // anon namespace +IconvProcessor & utf8ToUcs4() +{ + static QThreadStorage processor; + if (!processor.hasLocalData()) + processor.setLocalData(new IconvProcessor(ucs4_codeset, "UTF-8")); + return *processor.localData(); +} + + vector utf8_to_ucs4(vector const & utf8str) { if (utf8str.empty()) @@ -239,32 +229,60 @@ vector utf8_to_ucs4(vector const & utf8str) vector utf8_to_ucs4(char const * utf8str, size_t ls) { - static IconvProcessor processor(ucs4_codeset, "UTF-8"); - return iconv_convert(processor, utf8str, ls); + return iconv_convert(utf8ToUcs4(), utf8str, ls); } vector utf16_to_ucs4(unsigned short const * s, size_t ls) { - static IconvProcessor processor(ucs4_codeset, utf16_codeset); - return iconv_convert(processor, s, ls); + static QThreadStorage processor; + if (!processor.hasLocalData()) + processor.setLocalData(new IconvProcessor(ucs4_codeset, utf16_codeset)); + return iconv_convert(*processor.localData(), s, ls); } vector ucs4_to_utf16(char_type const * s, size_t ls) { - static IconvProcessor processor(utf16_codeset, ucs4_codeset); - return iconv_convert(processor, s, ls); + static QThreadStorage processor; + if (!processor.hasLocalData()) + processor.setLocalData(new IconvProcessor(utf16_codeset, ucs4_codeset)); + return iconv_convert(*processor.localData(), s, ls); } +IconvProcessor & ucs4ToUtf8() +{ + static QThreadStorage processor; + if (!processor.hasLocalData()) + processor.setLocalData(new IconvProcessor("UTF-8", ucs4_codeset)); + return *processor.localData(); +} + +namespace { + +IconvProcessor & getProc(map & processors, + string const & encoding, bool to) +{ + string const & fromcode = to ? ucs4_codeset : encoding; + string const & tocode = to ? encoding : ucs4_codeset; + map::iterator const it = processors.find(encoding); + if (it == processors.end()) { + IconvProcessor p(fromcode, tocode); + return processors.insert(make_pair(encoding, move(p))).first->second; + } else + return it->second; +} + +} //anon namespace + + vector ucs4_to_utf8(char_type c) { - static IconvProcessor processor("UTF-8", ucs4_codeset); - return iconv_convert(processor, &c, 1); + return iconv_convert(ucs4ToUtf8(), &c, 1); } @@ -281,46 +299,49 @@ ucs4_to_utf8(vector const & ucs4str) vector ucs4_to_utf8(char_type const * ucs4str, size_t ls) { - static IconvProcessor processor("UTF-8", ucs4_codeset); - return iconv_convert(processor, ucs4str, ls); + return iconv_convert(ucs4ToUtf8(), ucs4str, ls); } vector eightbit_to_ucs4(char const * s, size_t ls, string const & encoding) { - static map processors; - if (processors.find(encoding) == processors.end()) { - IconvProcessor processor(ucs4_codeset, encoding.c_str()); - processors.insert(make_pair(encoding, processor)); - } - return iconv_convert(processors[encoding], s, ls); + static QThreadStorage *> static_processors; + if (!static_processors.hasLocalData()) + static_processors.setLocalData(new map); + map & processors = *static_processors.localData(); + IconvProcessor & processor = getProc(processors, encoding, true); + return iconv_convert(processor, s, ls); } +namespace { + +map & ucs4To8bitProcessors() +{ + static QThreadStorage *> processors; + if (!processors.hasLocalData()) + processors.setLocalData(new map); + return *processors.localData(); +} + +} + vector ucs4_to_eightbit(char_type const * ucs4str, size_t ls, string const & encoding) { - static map processors; - if (processors.find(encoding) == processors.end()) { - IconvProcessor processor(encoding.c_str(), ucs4_codeset); - processors.insert(make_pair(encoding, processor)); - } - return iconv_convert(processors[encoding], ucs4str, ls); + map & processors(ucs4To8bitProcessors()); + IconvProcessor & processor = getProc(processors, encoding, false); + return iconv_convert(processor, ucs4str, ls); } char ucs4_to_eightbit(char_type ucs4, string const & encoding) { - static map processors; - map::iterator it = processors.find(encoding); - if (it == processors.end()) { - IconvProcessor processor(encoding.c_str(), ucs4_codeset); - it = processors.insert(make_pair(encoding, processor)).first; - } - + map & processors(ucs4To8bitProcessors()); + IconvProcessor & processor = getProc(processors, encoding, false); char out; - int const bytes = it->second.convert((char *)(&ucs4), 4, &out, 1); + int const bytes = processor.convert((char *)(&ucs4), 4, &out, 1); if (bytes > 0) return out; return 0; @@ -330,19 +351,47 @@ char ucs4_to_eightbit(char_type ucs4, string const & encoding) void ucs4_to_multibytes(char_type ucs4, vector & out, string const & encoding) { - static map processors; - map::iterator it = processors.find(encoding); - if (it == processors.end()) { - IconvProcessor processor(encoding.c_str(), ucs4_codeset); - it = processors.insert(make_pair(encoding, processor)).first; - } - + static QThreadStorage *> static_processors; + if (!static_processors.hasLocalData()) + static_processors.setLocalData(new map); + map & processors = *static_processors.localData(); + IconvProcessor & processor = getProc(processors, encoding, false); out.resize(4); - int bytes = it->second.convert((char *)(&ucs4), 4, &out[0], 4); + int bytes = processor.convert((char *)(&ucs4), 4, &out[0], 4); if (bytes > 0) out.resize(bytes); else out.clear(); } +int max_encoded_bytes(std::string const & encoding) +{ + // FIXME: this information should be transferred to lib/encodings + // UTF8 uses at most 4 bytes to represent one UCS4 code point + // (see RFC 3629). RFC 2279 specifies 6 bytes, but that + // information is outdated, and RFC 2279 has been superseded by + // RFC 3629. + // The CJK encodings use (different) multibyte representation as well. + // All other encodings encode one UCS4 code point in one byte + // (and can therefore only encode a subset of UCS4) + // Furthermore, all encodings that use shifting (like SJIS) do not work with + // iconv_codecvt_facet. + if (encoding == "UTF-8" || + encoding == "GB" || + encoding == "EUC-TW") + return 4; + else if (encoding == "EUC-JP") + return 3; + else if (encoding == "ISO-2022-JP") + return 8; + else if (encoding == "BIG5" || + encoding == "EUC-KR" || + encoding == "EUC-CN" || + encoding == "SJIS" || + encoding == "GBK") + return 2; + else + return 1; +} + } // namespace lyx