remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the...

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 63f74837cd5700e480b0935244dd2de3b768fa9b..42e2a00756f4bb15c4c784e2aa081835e27e1ee8 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -537,14 +537,16 @@ docstring const LaTeXFeatures::getLyXSGMLEntities() const
 docstring const LaTeXFeatures::getIncludedFiles(string const & fname) const
 {
        odocstringstream sgmlpreamble;
-       string const basename = onlyPath(fname);
+       // FIXME UNICODE
+       docstring const basename(from_utf8(onlyPath(fname)));
 
        FileMap::const_iterator end = IncludedFiles_.end();
        for (FileMap::const_iterator fi = IncludedFiles_.begin();
             fi != end; ++fi)
+               // FIXME UNICODE
                sgmlpreamble << "\n<!ENTITY " << fi->first
                             << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
-                            << from_ascii(makeRelPath(fi->second, basename)) << "\">";
+                            << makeRelPath(from_utf8(fi->second), basename) << "\">";
 
        return sgmlpreamble.str();
 }