X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=ee17f57445e1b61bed6f33ee0e4c308d003e65dd;hb=0430132aa049f2a97280bcbcff69f71d42ed7d98;hp=3d3181aae0ab6339d42465c0a98ec5d738f3c679;hpb=03b17b5272e052f75161c85bf744165b1bad456c;p=lyx.git

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 3d3181aae0..ee17f57445 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -29,6 +29,7 @@
 #include "support/FileNameList.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
@@ -306,8 +307,9 @@ bool Converters::convert(Buffer const * buffer,
 			LYXERR(Debug::FILES, "No converter defined! "
 				   "I use convertDefault.py:\n\t" << command);
 			Systemcall one;
-			one.startscript(Systemcall::Wait, command, buffer ?
-					buffer->filePath() : string());
+			one.startscript(Systemcall::Wait, command,
+			                buffer ? buffer->filePath() : string(),
+			                buffer ? buffer->layoutPos() : string());
 			if (to_file.isReadableFile()) {
 				if (conversionflags & try_cache)
 					ConverterCache::get().add(orig_from,
@@ -474,13 +476,16 @@ bool Converters::convert(Buffer const * buffer,
 			if (dummy) {
 				res = one.startscript(Systemcall::DontWait,
 					to_filesystem8bit(from_utf8(command)),
-					buffer ? buffer->filePath() : string());
+					buffer ? buffer->filePath() : string(),
+					buffer ? buffer->layoutPos() : string());
 				// We're not waiting for the result, so we can't do anything
 				// else here.
 			} else {
 				res = one.startscript(Systemcall::Wait,
 						to_filesystem8bit(from_utf8(command)),
 						buffer ? buffer->filePath()
+						       : string(),
+						buffer ? buffer->layoutPos()
 						       : string());
 				if (!real_outfile.empty()) {
 					Mover const & mover = getMover(conv.to());
@@ -501,7 +506,8 @@ bool Converters::convert(Buffer const * buffer,
 						" > " + quoteName(logfile);
 					one.startscript(Systemcall::Wait,
 						to_filesystem8bit(from_utf8(command2)),
-						buffer->filePath());
+						buffer->filePath(),
+						buffer->layoutPos());
 					if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
 						return false;
 				}
@@ -644,7 +650,8 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
 	// do the LaTeX run(s)
 	string const name = buffer.latexName();
 	LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
-		    buffer.filePath());
+	            buffer.filePath(), buffer.layoutPos(),
+	            buffer.lastPreviewError());
 	TeXErrors terr;
 	ShowMessage show(buffer);
 	latex.message.connect(show);
@@ -701,6 +708,8 @@ void Converters::buildGraph()
 	for (; it != end ; ++it) {
 		int const from = formats.getNumber(it->from());
 		int const to   = formats.getNumber(it->to());
+		LASSERT(from >= 0, continue);
+		LASSERT(to >= 0, continue);
 		G_.addEdge(from, to);
 	}
 }