Reorder a bit status messages, but they are still cleared at the end of LyXFunc

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 9c905355c6dfcb322f5e98adc0c8430b0e8d0cc3..d8d1dd1ca87a512388f024ad87506127ace1d9ab 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -608,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."));
        }
@@ -635,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);
        }
 }
 
@@ -742,6 +746,7 @@ vector<string> Converters::savers() const
        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");