X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Funicode.h;h=6e83180c10692edcbe03fcba4af10fb7a6d6c407;hb=c48091f33a773732fa6c789927e5833e44108d9d;hp=055dd7029df8878bbfd21b35b18967f6eddc4a25;hpb=826c31a80d3ad7dc310790c99ac20427f33fb905;p=lyx.git

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 055dd7029d..6e83180c10 100644
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -13,9 +13,9 @@
 #ifndef LYX_SUPPORT_UNICODE_H
 #define LYX_SUPPORT_UNICODE_H
 
-#include "support/types.h"
+#include "support/strfwd.h"
 
-#include <string>
+#include <cstddef>
 #include <vector>
 
 
@@ -24,79 +24,78 @@ namespace lyx {
 class IconvProcessor
 {
 public:
-	IconvProcessor(
-		char const * tocode = "",
-		char const * fromcode = "");
+	IconvProcessor(char const * tocode = "", char const * fromcode = "");
+	/// copy constructor needed because of pimpl_
+	IconvProcessor(IconvProcessor const &);
+	/// assignment operator needed because of pimpl_
+	void operator=(IconvProcessor const &);
+	/// destructor
 	~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);
+	int convert(char const * in_buffer, size_t in_size,
+		char * out_buffer, size_t max_out_size);
+
+	/// source encoding
+	std::string from() const;
+	/// target encoding
+	std::string to() const;
+
 private:
 	/// open iconv.
 	/// \return true if the processor is ready to use.
 	bool init();
-
-	std::string const tocode_;
-	std::string const fromcode_;
-
-	struct Private;
-	Private * pimpl_;
+	/// hide internals
+	struct Impl;
+	Impl * 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);
+std::vector<char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
 
-// ucs2_to_ucs4
+std::vector<char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
 
-lyx::char_type ucs2_to_ucs4(unsigned short c);
+// utf16_to_ucs4
 
-std::vector<lyx::char_type>
-ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str);
+std::vector<char_type> utf16_to_ucs4(unsigned short const * s, size_t ls);
 
-std::vector<lyx::char_type>
-ucs2_to_ucs4(unsigned short const * ucs2str, size_t ls);
+// ucs4_to_utf16
 
-// ucs4_to_ucs2
-
-unsigned short ucs4_to_ucs2(lyx::char_type c);
-
-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);
+std::vector<char> 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;
 
+/// How many bytes does one UCS4 code point use at most in encoding \p encoding?
+int max_encoded_bytes(std::string const & encoding);
 
 } // namespace lyx