Remove black box around GuiWorkarea? which is visible with Qt4.5.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index ab7e51f912e2c7fbe782207a52a8404dce1fe609..9c905355c6dfcb322f5e98adc0c8430b0e8d0cc3 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)
@@ -302,6 +305,14 @@ bool Converters::convert(Buffer const * buffer,
                                return true;
                        }
                }
+
+               // only warn once per session and per file type
+               static std::map<string, string> warned;
+               if (warned.find(from_format) != warned.end() && warned.find(from_format)->second == to_format) {
+                       return false;
+               }
+               warned.insert(make_pair(from_format, to_format));
+
                Alert::error(_("Cannot convert file"),
                             bformat(_("No information for converting %1$s "
                                                    "format files to %2$s.\n"
@@ -314,6 +325,15 @@ 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;
+               runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
+                       string() : buffer->params().bibtex_command;
+               runparams.index_command = (buffer->params().index_command == "default") ?
+                       string() : buffer->params().index_command;
+       }
 
        // Some converters (e.g. lilypond) can only output files to the
        // current directory, so we need to change the current directory.
@@ -386,6 +406,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())
@@ -689,6 +711,20 @@ vector<Format const *> Converters::importableFormats()
 }
 
 
+vector<Format const *> Converters::exportableFormats(bool only_viewable)
+{
+       vector<string> s = savers();
+       vector<Format const *> result = getReachable(s[0], only_viewable, true);
+       for (vector<string>::const_iterator it = s.begin() + 1;
+            it != s.end(); ++it) {
+               vector<Format const *> r =
+                       getReachable(*it, only_viewable, false);
+               result.insert(result.end(), r.begin(), r.end());
+       }
+       return result;
+}
+
+
 vector<string> Converters::loaders() const
 {
        vector<string> v;
@@ -699,4 +735,19 @@ vector<string> Converters::loaders() const
 }
 
 
+vector<string> Converters::savers() const
+{
+       vector<string> v;
+       v.push_back("docbook");
+       v.push_back("latex");
+       v.push_back("literate");
+       v.push_back("lyx");
+       v.push_back("pdflatex");
+       v.push_back("platex");
+       v.push_back("text");
+       v.push_back("xetex");
+       return v;
+}
+
+
 } // namespace lyx