Force redraw after completion

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 747dd88ada8e5824d29ced4da4a50e1d938c6a1c..7bb998d5a9589a6372de09cb1a00d650fe61ef14 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -23,6 +23,7 @@
 #include "LaTeX.h"
 #include "LyXRC.h"
 #include "Mover.h"
+#include "OutputParams.h"
 #include "ParagraphList.h"
 #include "Session.h"
 
@@ -59,7 +60,7 @@ string const token_orig_path("$$r");
 string const token_orig_from("$$f");
 string const token_encoding("$$e");
 string const token_latex_encoding("$$E");
-
+string const token_python("$${python}");
 
 string const add_options(string const & command, string const & options)
 {
@@ -147,6 +148,12 @@ void Converter::readFlags()
 }
 
 
+void Converter::setCommand(std::string const & command)
+{
+       command_ = subst(command, token_python, os::python());
+}
+
+
 Converter const * Converters::getConverter(string const & from,
                                            string const & to) const
 {
@@ -258,28 +265,28 @@ void Converters::updateLast(Formats const & formats)
 }
 
 
-OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
+Flavor Converters::getFlavor(Graph::EdgePath const & path,
                                           Buffer const * buffer) const
 {
        for (auto const & edge : path) {
                Converter const & conv = converterlist_[edge];
                if (conv.latex() || conv.need_aux()) {
                        if (conv.latex_flavor() == "latex")
-                               return OutputParams::LATEX;
+                               return Flavor::LaTeX;
                        if (conv.latex_flavor() == "xelatex")
-                               return OutputParams::XETEX;
+                               return Flavor::XeTeX;
                        if (conv.latex_flavor() == "lualatex")
-                               return OutputParams::LUATEX;
+                               return Flavor::LuaTeX;
                        if (conv.latex_flavor() == "dvilualatex")
-                               return OutputParams::DVILUATEX;
+                               return Flavor::DviLuaTeX;
                        if (conv.latex_flavor() == "pdflatex")
-                               return OutputParams::PDFLATEX;
+                               return Flavor::PdfLaTeX;
                }
                if (conv.docbook())
-                       return OutputParams::DOCBOOK5;
+                       return Flavor::DocBook5;
        }
        return buffer ? buffer->params().getOutputFlavor()
-                     : OutputParams::LATEX;
+                     : Flavor::LaTeX;
 }
 
 
@@ -477,7 +484,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                         || suffixIs(bp.bufferFormat(), "-ja"))
                        && bp.encoding().package() == Encoding::japanese;
                runparams.use_indices = bp.use_indices;
-               runparams.bibtex_command = bp.bibtexCommand();
+               runparams.bibtex_command = bp.bibtexCommand(true);
                runparams.index_command = (bp.index_command == "default") ?
                        string() : bp.index_command;
                runparams.document_language = bp.language->lang();
@@ -601,16 +608,16 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                                LASSERT(buffer, return FAILURE);
                                string command;
                                switch (runparams.flavor) {
-                               case OutputParams::DVILUATEX:
+                               case Flavor::DviLuaTeX:
                                        command = dvilualatex_command_;
                                        break;
-                               case OutputParams::LUATEX:
+                               case Flavor::LuaTeX:
                                        command = lualatex_command_;
                                        break;
-                               case OutputParams::PDFLATEX:
+                               case Flavor::PdfLaTeX:
                                        command = pdflatex_command_;
                                        break;
-                               case OutputParams::XETEX:
+                               case Flavor::XeTeX:
                                        command = xelatex_command_;
                                        break;
                                default:
@@ -643,6 +650,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                        command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName())));
                        command = subst(command, token_orig_from, quoteName(onlyFileName(orig_from.absFileName())));
                        command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
+                       command = subst(command, token_python, os::python());
 
                        if (!conv.parselog().empty())
                                command += " 2> " + quoteName(infile2 + ".out");
@@ -683,11 +691,11 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                                if (res == Systemcall::KILLED) {
                                        frontend::Alert::warning(
                                                _("Converter killed"),
-                                               bformat(_("The following converter was killed by the user.\n %1$s\n"), 
+                                               bformat(_("The following converter was killed by the user.\n %1$s\n"),
                                                        from_utf8(command)));
                                        return KILLED;
                                }
-                               
+
                                if (!real_outfile.empty()) {
                                        Mover const & mover = getMover(conv.to());
                                        if (!mover.rename(outfile, real_outfile))
@@ -712,7 +720,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                                        if (res == Systemcall::KILLED) {
                                                frontend::Alert::warning(
                                                        _("Converter killed"),
-                                                       bformat(_("The following converter was killed by the user.\n %1$s\n"), 
+                                                       bformat(_("The following converter was killed by the user.\n %1$s\n"),
                                                                from_utf8(command)));
                                                return KILLED;
                                        }
@@ -727,13 +735,13 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                                                bformat(_("The conversion process was killed while running:\n%1$s"),
                                                        wrapParas(from_utf8(command))));
                                        return KILLED;
-                               } 
+                               }
                                if (res == Systemcall::TIMEOUT) {
                                        Alert::information(_("Process Timed Out"),
                                                bformat(_("The conversion process:\n%1$s\ntimed out before completing."),
                                                        wrapParas(from_utf8(command))));
                                        return KILLED;
-                               } 
+                               }
                                if (conv.to() == "program") {
                                        Alert::error(_("Build errors"),
                                                _("There were errors during the build process."));
@@ -832,7 +840,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
                         FileName const & filename, ErrorList & errorList)
 {
        OutputParams runparams(nullptr);
-       runparams.flavor = OutputParams::LATEX;
+       runparams.flavor = Flavor::LaTeX;
        LaTeX latex("", runparams, filename);
        TeXErrors terr;
        int const result = latex.scanLogFile(terr);
@@ -852,7 +860,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
 
        // do the LaTeX run(s)
        string const name = buffer.latexName();
-       LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
+       LaTeX latex(command, runparams, makeAbsPath(name),
                    buffer.filePath(), buffer.layoutPos(),
                    buffer.isClone(), buffer.freshStartRequired());
        TeXErrors terr;