Work around qt bug that prevents the glyph LATIN CAPITAL LETTER SHARP S from being...

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

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 29fe1caf8d6c9483c76fded6bce0427e8e4d6877..5eea0111a3a6f06bd450344d28e99fc7ccdd2dec 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -4,7 +4,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
  * \author Georg Baum
  *
  * Full author contact details are available in file CREDITS.
@@ -19,7 +19,11 @@
 
 namespace lyx {
 
-/// String type for storing the main text in UCS4 encoding
+/**
+ * String type for storing the main text in UCS4 encoding.
+ * Use std::string only in cases 7-bit ASCII is to be manipulated
+ * within the variable.
+ */
 typedef std::basic_string<char_type> docstring;
 
 /// Creates a docstring from a C string of ASCII characters
@@ -53,6 +57,14 @@ docstring const from_filesystem8bit(std::string const & s);
 /// convert \p s from ucs4 to the encoding of the file system.
 std::string const to_filesystem8bit(docstring const & s);
 
+/// convert \p s from ucs4 to the \p encoding.
+std::string const to_iconv_encoding(docstring const & s,
+                                   std::string const & encoding);
+
+/// convert \p s from \p encoding to ucs4.
+docstring const from_iconv_encoding(std::string const & s,
+                                   std::string const & encoding);
+
 /// normalize \p s to precomposed form c
 docstring const normalize_c(docstring const & s);