Fix bug #6649 - fix texrow structure generated by InsetIndex

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 03814f10b5240f3244318764898c40be5f1ee231..d8d1dd1ca87a512388f024ad87506127ace1d9ab 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -27,10 +27,8 @@
 #include "support/debug.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
-#include "support/FileZipListDir.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/Path.h"
@@ -50,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");
 
 
 
@@ -66,8 +65,8 @@ string const dvipdfm_options(BufferParams const & bp)
        string result;
 
        if (bp.papersize != PAPER_CUSTOM) {
-               string const paper_size = bp.paperSizeName();
-               if (paper_size != "b5" && paper_size != "foolscap")
+               string const paper_size = bp.paperSizeName(BufferParams::DVIPDFM);
+               if (!paper_size.empty())
                        result = "-p "+ paper_size;
 
                if (bp.orientation == ORIENTATION_LANDSCAPE)
@@ -255,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)
@@ -304,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"
@@ -316,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.
@@ -388,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())
@@ -497,8 +517,8 @@ bool Converters::move(string const & fmt,
        string const to_base = removeExtension(to.absFilename());
        string const to_extension = getExtension(to.absFilename());
 
-       FileNameList const files = FileName(path).dirList(getExtension(from.absFilename()));
-       for (FileNameList::const_iterator it = files.begin();
+       support::FileNameList const files = FileName(path).dirList(getExtension(from.absFilename()));
+       for (support::FileNameList::const_iterator it = files.begin();
             it != files.end(); ++it) {
                string const from2 = it->absFilename();
                string const file2 = onlyFilename(from2);
@@ -588,13 +608,13 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
                buffer.bufferErrors(terr, errorList);
 
        // check return value from latex.run().
-       if ((result & LaTeX::NO_LOGFILE)) {
+       if ((result & LaTeX::NO_LOGFILE) && !buffer.isClone()) {
                docstring const str =
                        bformat(_("LaTeX did not run successfully. "
                                               "Additionally, LyX could not locate "
                                               "the LaTeX log %1$s."), from_utf8(name));
                Alert::error(_("LaTeX failed"), str);
-       } else if (result & LaTeX::NO_OUTPUT) {
+       } else if ((result & LaTeX::NO_OUTPUT) && !buffer.isClone()) {
                Alert::warning(_("Output is empty"),
                               _("An empty output file was generated."));
        }
@@ -615,13 +635,17 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
 
 void Converters::buildGraph()
 {
+       // clear graph's data structures
        G_.init(formats.size());
-       ConverterList::iterator beg = converterlist_.begin();
+       // each of the converters knows how to convert one format to another
+       // so, for each of them, we create an arrow on the graph, going from 
+       // the one to the other
+       ConverterList::iterator it = converterlist_.begin();
        ConverterList::iterator const end = converterlist_.end();
-       for (ConverterList::iterator it = beg; it != end ; ++it) {
-               int const s = formats.getNumber(it->from);
-               int const t = formats.getNumber(it->to);
-               G_.addEdge(s,t);
+       for (; it != end ; ++it) {
+               int const from = formats.getNumber(it->from);
+               int const to   = formats.getNumber(it->to);
+               G_.addEdge(from, to);
        }
 }
 
@@ -691,6 +715,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;
@@ -701,4 +739,20 @@ 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("xhtml");
+       v.push_back("pdflatex");
+       v.push_back("platex");
+       v.push_back("text");
+       v.push_back("xetex");
+       return v;
+}
+
+
 } // namespace lyx