listerrors.lyx : Update a link.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 0f0f4b44eb77090b3085723e345fb08861f7501a..23c277ac9640947238cb3b974693551cfd0b473c 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -51,6 +51,7 @@ string const token_to("$$o");
 string const token_path("$$p");
 string const token_orig_path("$$r");
 string const token_encoding("$$e");
+string const token_latex_encoding("$$E");
 
 
 string const add_options(string const & command, string const & options)
@@ -131,21 +132,6 @@ void Converter::readFlags()
 }
 
 
-bool operator<(Converter const & a, Converter const & b)
-{
-       // use the compare_ascii_no_case instead of compare_no_case,
-       // because in turkish, 'i' is not the lowercase version of 'I',
-       // and thus turkish locale breaks parsing of tags.
-       int const i = compare_ascii_no_case(a.From->prettyname(),
-                                           b.From->prettyname());
-       if (i == 0)
-               return compare_ascii_no_case(a.To->prettyname(),
-                                            b.To->prettyname()) < 0;
-       else
-               return i < 0;
-}
-
-
 Converter const * Converters::getConverter(string const & from,
                                            string const & to) const
 {
@@ -250,12 +236,6 @@ void Converters::updateLast(Formats const & formats)
 }
 
 
-void Converters::sort()
-{
-       std::sort(converterlist_.begin(), converterlist_.end());
-}
-
-
 OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
 {
        for (Graph::EdgePath::const_iterator cit = path.begin();
@@ -266,6 +246,8 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
                                return OutputParams::XETEX;
                        if (conv.latex_flavor == "lualatex")
                                return OutputParams::LUATEX;
+                       if (conv.latex_flavor == "dvilualatex")
+                               return OutputParams::DVILUATEX;
                        if (conv.latex_flavor == "pdflatex")
                                return OutputParams::PDFLATEX;
                if (conv.xml)
@@ -307,7 +289,8 @@ bool Converters::convert(Buffer const * buffer,
                        LYXERR(Debug::FILES, "No converter defined! "
                                   "I use convertDefault.py:\n\t" << command);
                        Systemcall one;
-                       one.startscript(Systemcall::Wait, command);
+                       one.startscript(Systemcall::Wait, command, buffer ?
+                                       buffer->filePath() : string());
                        if (to_file.isReadableFile()) {
                                if (conversionflags & try_cache)
                                        ConverterCache::get().add(orig_from,
@@ -337,7 +320,7 @@ bool Converters::convert(Buffer const * buffer,
        runparams.flavor = getFlavor(edgepath);
 
        if (buffer) {
-               runparams.use_japanese = buffer->bufferFormat() == "platex";
+               runparams.use_japanese = buffer->params().bufferFormat() == "platex";
                runparams.use_indices = buffer->params().use_indices;
                runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
                        string() : buffer->params().bibtex_command;
@@ -350,6 +333,8 @@ bool Converters::convert(Buffer const * buffer,
        // This has the added benefit that all other files that may be
        // generated by the converter are deleted when LyX closes and do not
        // clutter the real working directory.
+       // FIXME: This does not work if path is an UNC path on windows
+       //        (bug 6127).
        string const path(onlyPath(from_file.absFileName()));
        // Prevent the compiler from optimizing away p
        FileName pp(path);
@@ -372,7 +357,7 @@ bool Converters::convert(Buffer const * buffer,
                               << conv.from << " to " << conv.to);
                }
                infile = outfile;
-               outfile = FileName(conv.result_dir.empty()
+               outfile = FileName(conv.result_file.empty()
                        ? changeExtension(from_file.absFileName(), conv.To->extension())
                        : addName(subst(conv.result_dir,
                                        token_base, from_base),
@@ -382,6 +367,9 @@ bool Converters::convert(Buffer const * buffer,
                // if input and output files are equal, we use a
                // temporary file as intermediary (JMarc)
                FileName real_outfile;
+               if (!conv.result_file.empty())
+                       real_outfile = FileName(changeExtension(from_file.absFileName(),
+                               conv.To->extension()));
                if (outfile == infile) {
                        real_outfile = infile;
                        // when importing, a buffer does not necessarily exist
@@ -394,7 +382,10 @@ bool Converters::convert(Buffer const * buffer,
 
                if (conv.latex) {
                        run_latex = true;
-                       string const command = subst(conv.command, token_from, "");
+                       string command = conv.command;
+                       command = subst(command, token_from, "");
+                       command = subst(command, token_latex_encoding, buffer ?
+                               buffer->params().encoding().latexName() : string());
                        LYXERR(Debug::FILES, "Running " << command);
                        if (!runLaTeX(*buffer, command, runparams, errorList))
                                return false;
@@ -443,12 +434,15 @@ bool Converters::convert(Buffer const * buffer,
                        int res;
                        if (dummy) {
                                res = one.startscript(Systemcall::DontWait,
-                                       to_filesystem8bit(from_utf8(command)));
+                                       to_filesystem8bit(from_utf8(command)),
+                                       buffer ? buffer->filePath() : string());
                                // We're not waiting for the result, so we can't do anything
                                // else here.
                        } else {
                                res = one.startscript(Systemcall::Wait,
-                                               to_filesystem8bit(from_utf8(command)));
+                                               to_filesystem8bit(from_utf8(command)),
+                                               buffer ? buffer->filePath()
+                                                      : string());
                                if (!real_outfile.empty()) {
                                        Mover const & mover = getMover(conv.to);
                                        if (!mover.rename(outfile, real_outfile))
@@ -468,7 +462,8 @@ bool Converters::convert(Buffer const * buffer,
                                                " < " + quoteName(infile2 + ".out") +
                                                " > " + quoteName(logfile);
                                        one.startscript(Systemcall::Wait,
-                                               to_filesystem8bit(from_utf8(command2)));
+                                               to_filesystem8bit(from_utf8(command2)),
+                                               buffer->filePath());
                                        if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
                                                return false;
                                }
@@ -612,7 +607,8 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
 
        // do the LaTeX run(s)
        string const name = buffer.latexName();
-       LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
+       LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
+                   buffer.filePath());
        TeXErrors terr;
        ShowMessage show(buffer);
        latex.message.connect(show);
@@ -770,6 +766,7 @@ vector<string> Converters::savers() const
        v.push_back("latex");
        v.push_back("literate");
        v.push_back("luatex");
+       v.push_back("dviluatex");
        v.push_back("lyx");
        v.push_back("xhtml");
        v.push_back("pdflatex");