* src/encoding.C (latexChar,read):

[lyx.git] / src / support / filename.C

diff --git a/src/support/filename.C b/src/support/filename.C
index 8762717ec1a98a74fd0ebc8322f8b6fcb0a5e67e..533a14cd0bc1cf7ed30562cbffac6e58f68db9ec 100644 (file)
--- a/src/support/filename.C
+++ b/src/support/filename.C
@@ -14,6 +14,9 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/os.h"
+#include "support/qstring_helpers.h"
+
+#include <QFile>
 
 #include <boost/assert.hpp>
 
@@ -42,7 +45,9 @@ FileName::FileName(string const & abs_filename)
        : name_(abs_filename)
 {
        BOOST_ASSERT(empty() || absolutePath(name_));
+#if defined(_WIN32)
        BOOST_ASSERT(!contains(name_, '\\'));
+#endif
 }
 
 
@@ -50,7 +55,9 @@ void FileName::set(string const & name)
 {
        name_ = name;
        BOOST_ASSERT(absolutePath(name_));
+#if defined(_WIN32)
        BOOST_ASSERT(!contains(name_, '\\'));
+#endif
 }
 
 
@@ -62,8 +69,15 @@ void FileName::erase()
 
 string const FileName::toFilesystemEncoding() const
 {
-       // FIXME UNICODE: correct encoding not implemented yet
-       return name_;
+       QByteArray const encoded = QFile::encodeName(toqstr(name_));
+       return string(encoded.begin(), encoded.end());
+}
+
+
+FileName const FileName::fromFilesystemEncoding(string const & name)
+{
+       QByteArray const encoded(name.c_str(), name.length());
+       return FileName(fromqstr(QFile::decodeName(encoded)));
 }
 
 
@@ -107,10 +121,15 @@ DocFileName::DocFileName(string const & abs_filename, bool save_abs)
 {}
 
 
+DocFileName::DocFileName(FileName const & abs_filename, bool save_abs)
+       : FileName(abs_filename), save_abs_path_(save_abs), zipped_valid_(false)
+{}
+
+
 void DocFileName::set(string const & name, string const & buffer_path)
 {
        save_abs_path_ = absolutePath(name);
-       name_ = save_abs_path_ ? name : makeAbsPath(name, buffer_path);
+       name_ = save_abs_path_ ? name : makeAbsPath(name, buffer_path).absFilename();
        zipped_valid_ = false;
 }
 
@@ -124,13 +143,15 @@ void DocFileName::erase()
 
 string const DocFileName::relFilename(string const & path) const
 {
-       return makeRelPath(name_, path);
+       // FIXME UNICODE
+       return to_utf8(makeRelPath(from_utf8(name_), from_utf8(path)));
 }
 
 
 string const DocFileName::outputFilename(string const & path) const
 {
-       return save_abs_path_ ? name_ : makeRelPath(name_, path);
+       // FIXME UNICODE
+       return save_abs_path_ ? name_ : to_utf8(makeRelPath(from_utf8(name_), from_utf8(path)));
 }
 
 
@@ -148,14 +169,19 @@ string const DocFileName::mangledFilename(std::string const & dir) const
        string mname = os::internal_path(name_);
        // Remove the extension.
        mname = changeExtension(name_, string());
-       // Replace '/' in the file name with '_'
-       mname = subst(mname, "/", "_");
-       // Replace '.' in the file name with '_'
-       mname = subst(mname, ".", "_");
-       // Replace ' ' in the file name with '_'
-       mname = subst(mname, " ", "_");
-       // Replace ':' in the file name with '_'
-       mname = subst(mname, ":", "_");
+       // The mangled name must be a valid LaTeX name.
+       // The list of characters to keep is probably over-restrictive,
+       // but it is not really a problem.
+       // Apart from non-ASCII characters, at least the following characters
+       // are forbidden: '/', '.', ' ', and ':'.
+       // On windows it is not possible to create files with '<', '>' or '?'
+       // in the name.
+       static string const keep = "abcdefghijklmnopqrstuvwxyz"
+                                  "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                  "+,-0123456789;=";
+       string::size_type pos = 0;
+       while ((pos = mname.find_first_not_of(keep, pos)) != string::npos)
+               mname[pos++] = '_';
        // Add the extension back on
        mname = changeExtension(mname, getExtension(name_));