whitespace only

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index b9c31bd00e5ed4ac0f62a2fd7b87b2280939dd76..6d42d10ee417ecb4eb1fb5e36786abc4955599f2 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -48,6 +48,7 @@ string const token_from("$$i");
 string const token_base("$$b");
 string const token_to("$$o");
 string const token_path("$$p");
+string const token_orig_path("$$r");
 
 
 
@@ -253,6 +254,8 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path)
             cit != path.end(); ++cit) {
                Converter const & conv = converterlist_[*cit];
                if (conv.latex)
+                       if (contains(conv.from, "xetex"))
+                               return OutputParams::XETEX;
                        if (contains(conv.to, "pdf"))
                                return OutputParams::PDFLATEX;
                if (conv.xml)
@@ -322,6 +325,11 @@ bool Converters::convert(Buffer const * buffer,
        // used anyway.
        OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
        runparams.flavor = getFlavor(edgepath);
+       
+       if (buffer) {
+               runparams.use_japanese = buffer->bufferFormat() == "platex";
+               runparams.use_indices = buffer->params().use_indices;
+       }
 
        // Some converters (e.g. lilypond) can only output files to the
        // current directory, so we need to change the current directory.
@@ -394,6 +402,8 @@ bool Converters::convert(Buffer const * buffer,
                        command = subst(command, token_from, quoteName(infile2));
                        command = subst(command, token_base, quoteName(from_base));
                        command = subst(command, token_to, quoteName(outfile2));
+                       command = subst(command, token_path, quoteName(infile.onlyPath().absFilename()));
+                       command = subst(command, token_orig_path, quoteName(orig_from.onlyPath().absFilename()));
                        command = libScriptSearch(command);
 
                        if (!conv.parselog.empty())