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

diff --git a/src/support/unicode.h b/src/support/unicode.h
index d0cd8372ac..12f112c44d 100644
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -15,6 +15,8 @@
 
 #include "support/types.h"
 
+#include <boost/scoped_ptr.hpp>
+
 #include <string>
 #include <vector>
 
@@ -27,6 +29,12 @@ 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();
 
 	/// convert any data from \c fromcode to \c tocode unicode format.
@@ -45,57 +53,51 @@ private:
 	std::string fromcode_;
 
 	struct Private;
-	Private * pimpl_;
+	boost::scoped_ptr<Private> pimpl_;
 };
 
-// utf8_to_ucs4
-
 // A single codepoint conversion for utf8_to_ucs4 does not make
 // sense, so that function is left out.
 
-std::vector<lyx::char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
-
-std::vector<lyx::char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
-
-// ucs2_to_ucs4
-
-lyx::char_type ucs2_to_ucs4(unsigned short c);
+std::vector<char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
 
-std::vector<lyx::char_type>
-ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str);
+std::vector<char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
 
-std::vector<lyx::char_type>
-ucs2_to_ucs4(unsigned short const * ucs2str, size_t ls);
+// utf16_to_ucs4
 
-// ucs4_to_ucs2
+std::vector<char_type> utf16_to_ucs4(unsigned short const * s, size_t ls);
 
-unsigned short ucs4_to_ucs2(lyx::char_type c);
+// ucs4_to_utf16
 
-std::vector<unsigned short>
-ucs4_to_ucs2(std::vector<lyx::char_type> const & ucs4str);
-
-std::vector<unsigned short> ucs4_to_ucs2(lyx::char_type const * s, size_t ls);
+std::vector<unsigned short> ucs4_to_utf16(char_type const * s, size_t ls);
 
 // ucs4_to_utf8
 
-std::vector<char> ucs4_to_utf8(lyx::char_type c);
+std::vector<char> ucs4_to_utf8(char_type c);
 
-std::vector<char> ucs4_to_utf8(std::vector<lyx::char_type> const & ucs4str);
+std::vector<char> ucs4_to_utf8(std::vector<char_type> const & ucs4str);
 
-std::vector<char> ucs4_to_utf8(lyx::char_type const * ucs4str, size_t ls);
+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<lyx::char_type>
+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_eightbit(lyx::char_type const * ucs4str, size_t ls, std::string const & encoding);
+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;
-extern char const * ucs2_codeset;
 
 
 } // namespace lyx