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

diff --git a/src/Converter.cpp b/src/Converter.cpp
index b9c31bd00e..d8d1dd1ca8 100644
--- 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)
@@ -322,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.
@@ -394,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())
@@ -594,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."));
 	}
@@ -621,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);
 	}
 }
 
@@ -697,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;
@@ -707,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