Fix several filename and environment variable encoding problems

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

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 072e76155b03660a9e9c43bb8659948eff751bc3..ec5f4012c980903e4bf3428cbdf1a6c5499dd4c4 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -16,6 +16,7 @@
 #include "support/types.h"
 
 #include <string>
+#include <typeinfo>
 
 namespace lyx {
 
@@ -37,7 +38,26 @@ docstring const from_utf8(std::string const &);
 /// Creates a UTF8 string from a docstring. This should go eventually.
 std::string const to_utf8(docstring const &);
 
-}
+/// convert \p s from the encoding of the locale to ucs4.
+docstring const from_local8bit(std::string const & s);
+
+/// Exception thrown by to_local8bit if the string could not be converted
+class to_local8bit_failure : public std::bad_cast {
+public:
+       to_local8bit_failure() throw() : std::bad_cast() {}
+       virtual ~to_local8bit_failure() throw() {}
+       virtual const char* what() const throw();
+};
+
+/**
+ * Convert \p s from ucs4 to the encoding of the locale.
+ * This may fail and throw an exception, the caller is expected to act
+ * appropriately.
+ */
+std::string const to_local8bit(docstring const & s);
+
+/// convert \p s from the encoding of the file system to ucs4.
+docstring const from_filesystem8bit(std::string const & s);
 
 /// Compare a docstring with a C string of ASCII characters
 bool operator==(lyx::docstring const &, char const *);
@@ -69,10 +89,12 @@ lyx::docstring & operator+=(lyx::docstring &, char const *);
 /// Append a single ASCII character to a docstring
 lyx::docstring & operator+=(lyx::docstring & l, char r);
 
+} // namespace lyx
+
 
 #if SIZEOF_WCHAR_T != 4 && defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4
 // Missing char_traits methods in gcc 3.3 and older. Taken from gcc 4.2svn.
-namespace std {
+namespace std {$
 
 template<typename T> void
 char_traits<T>::assign(char_type & c1, char_type const & c2)