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

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 16c4e00a03..12f112c44d 100644
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -56,16 +56,12 @@ 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.
 
-std::vector<lyx::char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
+std::vector<char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
 
-std::vector<lyx::char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
+std::vector<char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
 
 // utf16_to_ucs4
 
@@ -77,21 +73,29 @@ 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;