do not create invalid .lyx files when importing \i{}, \j{}, \l{} or \L{}.

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 127da2e97ac3d5f18a8db06f0a3be679c997654f..a7a061f0fec10cb86551174814370dec5513aafc 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -45,6 +45,7 @@ using support::getExtension;
 using support::isFileReadable;
 using support::libFileSearch;
 using support::libScriptSearch;
+using support::makeAbsPath;
 using support::makeRelPath;
 using support::onlyFilename;
 using support::onlyPath;
@@ -449,7 +450,7 @@ bool Converters::convert(Buffer const * buffer,
                                        " < " + quoteName(infile2 + ".out") +
                                        " > " + quoteName(logfile);
                                one.startscript(Systemcall::Wait, command2);
-                               if (!scanLog(*buffer, command, logfile, errorList))
+                               if (!scanLog(*buffer, command, FileName(makeAbsPath(logfile, path)), errorList))
                                        return false;
                        }
 
@@ -510,7 +511,9 @@ bool Converters::move(string const & fmt,
        string const to_base = changeExtension(to.absFilename(), string());
        string const to_extension = getExtension(to.absFilename());
 
-       vector<string> files = dirList(onlyPath(from.absFilename()), getExtension(from.absFilename()));
+       vector<string> const files = dirList(
+                       FileName(onlyPath(from.absFilename())),
+                       getExtension(from.absFilename()));
        for (vector<string>::const_iterator it = files.begin();
             it != files.end(); ++it)
                if (prefixIs(*it, base)) {
@@ -550,11 +553,11 @@ bool Converters::formatIsUsed(string const & format)
 
 
 bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
-                        string const & filename, ErrorList & errorList)
+                        FileName const & filename, ErrorList & errorList)
 {
        OutputParams runparams;
        runparams.flavor = OutputParams::LATEX;
-       LaTeX latex("", runparams, filename, "");
+       LaTeX latex("", runparams, filename);
        TeXErrors terr;
        int const result = latex.scanLogFile(terr);
 
@@ -591,7 +594,7 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
 
        // do the LaTeX run(s)
        string const name = buffer.getLatexName();
-       LaTeX latex(command, runparams, name, buffer.filePath());
+       LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
        TeXErrors terr;
        showMessage show(buffer);
        latex.message.connect(show);