X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Funicode.h;h=12f112c44d60c97cf9a73e0a2411253e2d3206a3;hb=848c89564fce9c4bfec79b915746dc6bc47abc3d;hp=21ff21afb5d61fb5847abcaece15a46a1c96a65f;hpb=c46b7d89553209b8df4e9de392ee07ef711f092f;p=lyx.git

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 21ff21afb5..12f112c44d 100644
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -13,28 +13,93 @@
 #ifndef LYX_SUPPORT_UNICODE_H
 #define LYX_SUPPORT_UNICODE_H
 
-#include <boost/cstdint.hpp>
+#include "support/types.h"
+
+#include <boost/scoped_ptr.hpp>
+
+#include <string>
 #include <vector>
 
-std::vector<boost::uint32_t>
-utf8_to_ucs4(std::vector<char> const & utf8str);
 
-std::vector<boost::uint32_t>
-ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str);
+namespace lyx {
 
-std::vector<unsigned short>
-ucs4_to_ucs2(std::vector<boost::uint32_t> const & ucs4str);
+class IconvProcessor
+{
+public:
+	IconvProcessor(
+		char const * tocode = "",
+		char const * fromcode = "");
+	/// copy constructor needed because of pimpl_
+	IconvProcessor(IconvProcessor const &);
+	/// assignment operator needed because of pimpl_
+	IconvProcessor & operator=(IconvProcessor const &);
+	/// destructor (needs to be implemented in the .C file because the
+	/// boost::scoped_ptr destructor needs a fully defined type
+	~IconvProcessor();
 
-std::vector<unsigned short>
-ucs4_to_ucs2(boost::uint32_t const * s, size_t ls);
+	/// convert any data from \c fromcode to \c tocode unicode format.
+	/// \return the number of bytes of the converted output buffer.
+	int convert(
+		char const * in_buffer,
+		size_t in_size,
+		char * out_buffer,
+		size_t max_out_size);
+private:
+	/// open iconv.
+	/// \return true if the processor is ready to use.
+	bool init();
 
-unsigned short
-ucs4_to_ucs2(boost::uint32_t c);
+	std::string tocode_;
+	std::string fromcode_;
 
-std::vector<char>
-ucs4_to_utf8(std::vector<boost::uint32_t> const & ucs4str);
+	struct Private;
+	boost::scoped_ptr<Private> pimpl_;
+};
+
+// A single codepoint conversion for utf8_to_ucs4 does not make
+// sense, so that function is left out.
+
+std::vector<char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
+
+std::vector<char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
+
+// utf16_to_ucs4
+
+std::vector<char_type> utf16_to_ucs4(unsigned short const * s, size_t ls);
+
+// ucs4_to_utf16
+
+std::vector<unsigned short> ucs4_to_utf16(char_type const * s, size_t ls);
 
+// ucs4_to_utf8
+
+std::vector<char> ucs4_to_utf8(char_type c);
+
+std::vector<char> ucs4_to_utf8(std::vector<char_type> const & ucs4str);
+
+std::vector<char> ucs4_to_utf8(char_type const * ucs4str, size_t ls);
+
+/// convert \p s from encoding \p encoding to ucs4.
+/// \p encoding must be a valid iconv 8bit encoding
+std::vector<char_type>
+eightbit_to_ucs4(char const * s, size_t ls, std::string const & encoding);
+
+/// convert \p s from ucs4 to encoding \p encoding.
+/// \p encoding must be a valid iconv 8bit encoding
 std::vector<char>
-ucs4_to_utf8(boost::uint32_t c);
+ucs4_to_eightbit(char_type const * ucs4str, size_t ls, std::string const & encoding);
+
+/// convert ucs4 character \p c to encoding \p encoding.
+/// \p encoding must be a valid iconv 8bit encoding
+char ucs4_to_eightbit(char_type c, std::string const & encoding);
+
+///
+void ucs4_to_multibytes(char_type ucs4, std::vector<char> & out,
+	std::string const & encoding);
+
+extern char const * ucs4_codeset;
+
+
+} // namespace lyx
 
 #endif