Introduce new function copyInsetToTemp

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index b4340c8f520ba8b7deee261c8623561401e7c320..172b2a20914ea7c97d4df8089b41966c0f4e625c 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -15,6 +15,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "ConverterCache.h"
+#include "TextClass.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
@@ -58,9 +59,11 @@ string const token_to("$$o");
 string const token_path("$$p");
 string const token_orig_path("$$r");
 string const token_orig_from("$$f");
+string const token_textclass("$$c");
+string const token_modules("$$m");
 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)
 {
@@ -148,6 +151,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
 {
@@ -466,7 +475,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                return FAILURE;
        }
 
-       // buffer is only invalid for importing, and then runparams is not
+       // buffer can only be null for importing, and then runparams is not
        // used anyway.
        OutputParams runparams(buffer ? &buffer->params().encoding() : nullptr);
        runparams.flavor = getFlavor(edgepath, buffer);
@@ -478,7 +487,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();
@@ -643,7 +652,16 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                        command = subst(command, token_path, quoteName(onlyPath(infile.absFileName())));
                        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_textclass,
+                                       buffer ? quoteName(buffer->params().documentClass().name())
+                                              : string());
+                       command = subst(command, token_modules,
+                                       buffer ? quoteName(buffer->params().getModules().asString())
+                                              : string());
+                       command = subst(command, token_encoding,
+                                       buffer ? quoteName(buffer->params().encoding().iconvName())
+                                              : string());
+                       command = subst(command, token_python, os::python());
 
                        if (!conv.parselog().empty())
                                command += " 2> " + quoteName(infile2 + ".out");
@@ -684,11 +702,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))
@@ -713,7 +731,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;
                                        }
@@ -728,13 +746,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."));
@@ -853,7 +871,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;