Norwegian Intro.lyx: - fix image paths to make it compilable

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index fd4e7856f76f644219d1b938279c156e0b141f95..7c71cff525b188dd0ebe882c1975cd1513c1e7ef 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -254,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)
@@ -323,6 +325,11 @@ bool Converters::convert(Buffer const * buffer,
        // used anyway.
        OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
        runparams.flavor = getFlavor(edgepath);
+       
+       runparams.use_indices = buffer->params().use_indices;
+
+       if (buffer)
+               runparams.use_japanese = buffer->bufferFormat() == "platex";
 
        // Some converters (e.g. lilypond) can only output files to the
        // current directory, so we need to change the current directory.