Provide do_put methods for inserting all remaining basic type values

[lyx.git] / src / support / unicode.h

diff --git a/src/support/unicode.h b/src/support/unicode.h
index fa9b4c897b0a4207147fff58a9865db333149957..16c4e00a03ad48da47387db36b7ea4701d3cfb92 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -15,12 +15,50 @@
 
 #include "support/types.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <string>
 #include <vector>
 
 
 namespace lyx {
 
-// utf8_to_ucs4
+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();
+
+       /// 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();
+
+       std::string tocode_;
+       std::string fromcode_;
+
+       struct Private;
+       boost::scoped_ptr<Private> pimpl_;
+};
+
+/// This is implemented in lyx_main.C for the LyX program 
+/// and in client.C for the LyX client program.
+extern IconvProcessor & utf8ToUcs4();
 
 // A single codepoint conversion for utf8_to_ucs4 does not make
 // sense, so that function is left out.
@@ -29,24 +67,13 @@ 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<lyx::char_type>
-ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str);
-
-std::vector<lyx::char_type>
-ucs2_to_ucs4(unsigned short const * ucs2str, size_t ls);
-
-// ucs4_to_ucs2
+// utf16_to_ucs4
 
-unsigned short ucs4_to_ucs2(lyx::char_type c);
+std::vector<char_type> utf16_to_ucs4(unsigned short const * s, size_t ls);
 
-std::vector<unsigned short>
-ucs4_to_ucs2(std::vector<lyx::char_type> const & ucs4str);
+// ucs4_to_utf16
 
-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
 
@@ -66,18 +93,7 @@ eightbit_to_ucs4(char const * s, size_t ls, std::string const & encoding);
 std::vector<char>
 ucs4_to_eightbit(lyx::char_type const * ucs4str, size_t ls, std::string const & encoding);
 
-/// convert any data from \c fromcode to \c tocode unicode format.
-/// \return the number of bytes of the converted output buffer.
-extern int iconv_convert(int & cd,
-             char const * tocode,
-             char const * fromcode,
-             char const * buf, ///< maximum input buffer
-             size_t buflen,    ///< maximum input buffer size in bytes
-                 char * outbuf,    ///< maximum output buffer
-                 size_t maxoutsize);    ///< maximum output buffer size in bytes
-
 extern char const * ucs4_codeset;
-extern char const * ucs2_codeset;
 
 
 } // namespace lyx