Add new layout translations to be reviewed

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index ed5f893f7b942795bb2977303eed3c47f623e21c..a3df839054bd77c1ed9319c904234976b64a2a99 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -32,7 +32,7 @@
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 #include "support/Systemcall.h"
 
 using namespace std;
@@ -99,7 +99,7 @@ Converter::Converter(string const & f, string const & t,
                     string const & c, string const & l)
        : from(f), to(t), command(c), flags(l),
          From(0), To(0), latex(false), xml(false),
-         need_aux(false)
+         need_aux(false), nice(false)
 {}
 
 
@@ -125,6 +125,8 @@ void Converter::readFlags()
                        result_file = flag_value;
                else if (flag_name == "parselog")
                        parselog = flag_value;
+               else if (flag_name == "nice")
+                       nice = true;
        }
        if (!result_dir.empty() && result_file.empty())
                result_file = "index." + formats.extension(to);
@@ -252,7 +254,9 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
        for (Graph::EdgePath::const_iterator cit = path.begin();
             cit != path.end(); ++cit) {
                Converter const & conv = converterlist_[*cit];
-               if (conv.latex)
+               if (conv.latex) {
+                       if (conv.latex_flavor == "latex")
+                               return OutputParams::LATEX;
                        if (conv.latex_flavor == "xelatex")
                                return OutputParams::XETEX;
                        if (conv.latex_flavor == "lualatex")
@@ -261,6 +265,7 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
                                return OutputParams::DVILUATEX;
                        if (conv.latex_flavor == "pdflatex")
                                return OutputParams::PDFLATEX;
+               }
                if (conv.xml)
                        return OutputParams::XML;
        }
@@ -398,6 +403,7 @@ bool Converters::convert(Buffer const * buffer,
                        command = subst(command, token_from, "");
                        command = subst(command, token_latex_encoding, buffer ?
                                buffer->params().encoding().latexName() : string());
+                       command = libScriptSearch(command);
                        LYXERR(Debug::FILES, "Running " << command);
                        if (!runLaTeX(*buffer, command, runparams, errorList))
                                return false;
@@ -721,7 +727,7 @@ vector<Format const *> const
 Converters::getReachable(string const & from, bool const only_viewable,
                         bool const clear_visited, set<string> const & excludes)
 {
-       set<int> excluded_numbers;;
+       set<int> excluded_numbers;
 
        set<string>::const_iterator sit = excludes.begin();
        set<string>::const_iterator const end = excludes.end();