X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=1563242f147095c13216f64f1aafa206192b54a1;hb=34c26f89bbe81f08ab5c8bb1e8176e22e32208fd;hp=5174d5bc3d9aabfccda87979c85caa576043d4c5;hpb=62ca7f3ae55ad2e0c395cb554d71afab87de1ee3;p=lyx.git

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 5174d5bc3d..1563242f14 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -12,10 +12,11 @@
 
 #include "Converter.h"
 
-#include "ConverterCache.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
+#include "ConverterCache.h"
+#include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
 #include "Language.h"
@@ -49,7 +50,7 @@ string const token_base("$$b");
 string const token_to("$$o");
 string const token_path("$$p");
 string const token_orig_path("$$r");
-
+string const token_encoding("$$e");
 
 
 string const add_options(string const & command, string const & options)
@@ -107,9 +108,11 @@ void Converter::readFlags()
 		string flag_name, flag_value;
 		flag_list = split(flag_list, flag_value, ',');
 		flag_value = split(flag_value, flag_name, '=');
-		if (flag_name == "latex")
+		if (flag_name == "latex") {
 			latex = true;
-		else if (flag_name == "xml")
+			latex_flavor = flag_value.empty() ?
+				"latex" : flag_value;
+		} else if (flag_name == "xml")
 			xml = true;
 		else if (flag_name == "needaux")
 			need_aux = true;
@@ -185,11 +188,12 @@ void Converters::add(string const & from, string const & to,
 	}
 	converter.readFlags();
 
-	if (converter.latex && (latex_command_.empty() || to == "dvi"))
-		latex_command_ = subst(command, token_from, "");
 	// If we have both latex & pdflatex, we set latex_command to latex.
 	// The latex_command is used to update the .aux file when running
 	// a converter that uses it.
+	if (converter.latex
+	    && (latex_command_.empty() || converter.latex_flavor == "latex"))
+		latex_command_ = subst(command, token_from, "");
 
 	if (it == converterlist_.end()) {
 		converterlist_.push_back(converter);
@@ -254,9 +258,11 @@ 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"))
+			if (conv.latex_flavor == "xelatex")
 				return OutputParams::XETEX;
-			if (contains(conv.to, "pdf"))
+			if (conv.latex_flavor == "lualatex")
+				return OutputParams::LUATEX;
+			if (conv.latex_flavor == "pdflatex")
 				return OutputParams::PDFLATEX;
 		if (conv.xml)
 			return OutputParams::XML;
@@ -325,7 +331,7 @@ 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;
@@ -367,7 +373,7 @@ bool Converters::convert(Buffer const * buffer,
 			: addName(subst(conv.result_dir,
 					token_base, from_base),
 				  subst(conv.result_file,
-					token_base, onlyFilename(from_base))));
+					token_base, onlyFileName(from_base))));
 
 		// if input and output files are equal, we use a
 		// temporary file as intermediary (JMarc)
@@ -397,9 +403,9 @@ bool Converters::convert(Buffer const * buffer,
 			}
 
 			// FIXME UNICODE
-			string const infile2 = 
+			string const infile2 =
 				to_utf8(makeRelPath(from_utf8(infile.absFileName()), from_utf8(path)));
-			string const outfile2 = 
+			string const outfile2 =
 				to_utf8(makeRelPath(from_utf8(outfile.absFileName()), from_utf8(path)));
 
 			string command = conv.command;
@@ -408,6 +414,7 @@ bool Converters::convert(Buffer const * buffer,
 			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 = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
 			command = libScriptSearch(command);
 
 			if (!conv.parselog.empty())
@@ -468,8 +475,8 @@ bool Converters::convert(Buffer const * buffer,
 // FIXME: this should go out of here. For example, here we cannot say if
 // it is a document (.lyx) or something else. Same goes for elsewhere.
 					Alert::error(_("Cannot convert file"),
-						bformat(_("An error occurred whilst running %1$s"),
-						from_utf8(command.substr(0, 50))));
+						bformat(_("An error occurred while running:\n%1$s"),
+						wrapParas(from_utf8(command))));
 				}
 				return false;
 			}
@@ -513,7 +520,7 @@ bool Converters::move(string const & fmt,
 
 	bool no_errors = true;
 	string const path = onlyPath(from.absFileName());
-	string const base = onlyFilename(removeExtension(from.absFileName()));
+	string const base = onlyFileName(removeExtension(from.absFileName()));
 	string const to_base = removeExtension(to.absFileName());
 	string const to_extension = getExtension(to.absFileName());
 
@@ -521,7 +528,7 @@ bool Converters::move(string const & fmt,
 	for (support::FileNameList::const_iterator it = files.begin();
 	     it != files.end(); ++it) {
 		string const from2 = it->absFileName();
-		string const file2 = onlyFilename(from2);
+		string const file2 = onlyFileName(from2);
 		if (prefixIs(file2, base)) {
 			string const to2 = changeExtension(
 				to_base + file2.substr(base.length()),
@@ -745,6 +752,7 @@ vector<string> Converters::savers() const
 	v.push_back("docbook");
 	v.push_back("latex");
 	v.push_back("literate");
+	v.push_back("luatex");
 	v.push_back("lyx");
 	v.push_back("xhtml");
 	v.push_back("pdflatex");