X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=d8d1dd1ca87a512388f024ad87506127ace1d9ab;hb=bb80bd78f981c888efcc030168bd4e366b0ca6cd;hp=9b8a53df7eb851aba2b24af69b7b6245b4ef44f9;hpb=e032cd934d7d94aa37d7951411660dc32a4b9f0e;p=lyx.git

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 9b8a53df7e..d8d1dd1ca8 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -329,6 +329,10 @@ bool Converters::convert(Buffer const * buffer,
 	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
@@ -604,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."));
 	}
@@ -631,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);
 	}
 }
 
@@ -738,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");