* src/frontends/qt4/QTocDialog.C (updateGui):

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index 0956e100d2740756d6eb67935cfb63f1deca466d..392e6acf7a7699f8ae22e041d734dd16adec41d5 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -153,14 +153,15 @@ bool Exporter::Export(Buffer * buffer, string const & format,
        runparams.flavor = OutputParams::LATEX;
        runparams.linelen = lyxrc.ascii_linelen;
        vector<string> backends = Backends(*buffer);
-       // FIXME: Without this test export to lyx13 would be through
-       // latex -> lyx -> lyx13, because the first backend below with a
+       // FIXME: Without this test export to lyx1[34] would be through
+       // latex -> lyx -> lyx1[34], because the first backend below with a
        // working conversion path is used. We should replace this test and
        // the explicit loop below with a method
        // getShortestPath(vector<string> const & from, string const & to)
        // which returns the shortest path from one of the formats in 'from'
        // to 'to'.
-       if (format == "lyx13x" && !converters.getPath("lyx", format).empty())
+       if ((format == "lyx13x" || format == "lyx14x") &&
+           !converters.getPath("lyx", format).empty())
                backend_format = "lyx";
        else if (find(backends.begin(), backends.end(), format) == backends.end()) {
                for (vector<string>::const_iterator it = backends.begin();
@@ -192,19 +193,19 @@ bool Exporter::Export(Buffer * buffer, string const & format,
 
        // Ascii backend
        if (backend_format == "text")
-               writeFileAscii(*buffer, filename, runparams);
+               writeFileAscii(*buffer, FileName(filename), runparams);
        // no backend
        else if (backend_format == "lyx")
                buffer->writeFile(FileName(filename));
        // Docbook backend
        else if (buffer->isDocBook()) {
                runparams.nice = !put_in_tempdir;
-               buffer->makeDocBookFile(filename, runparams);
+               buffer->makeDocBookFile(FileName(filename), runparams);
        }
        // LaTeX backend
        else if (backend_format == format) {
                runparams.nice = true;
-               if (!buffer->makeLaTeXFile(filename, string(), runparams))
+               if (!buffer->makeLaTeXFile(FileName(filename), string(), runparams))
                        return false;
        } else if (!lyxrc.tex_allows_spaces
                   && contains(buffer->filePath(), ' ')) {
@@ -213,7 +214,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
                return false;
        } else {
                runparams.nice = false;
-               if (!buffer->makeLaTeXFile(filename, buffer->filePath(), runparams))
+               if (!buffer->makeLaTeXFile(FileName(filename), buffer->filePath(), runparams))
                        return false;
        }
 
@@ -243,7 +244,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
                        string const fmt =
                                formats.getFormatFromFile(it->sourceName);
                        status = copyFile(fmt, it->sourceName,
-                                         FileName(makeAbsPath(it->exportName, dest)),
+                                         makeAbsPath(it->exportName, dest),
                                          it->exportName, status == FORCE);
                }
                if (status == CANCEL) {