X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=1d5b67c19700e6184a836709c0ff96499763cabf;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=1784d915cd4f4cfb4d53486774415879919f9c78;hpb=55ded55ccfede99816c92de009d82c245ab69514;p=lyx.git

diff --git a/src/converter.C b/src/converter.C
index 1784d915cd..1d5b67c197 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -77,7 +77,7 @@ string const dvipdfm_options(BufferParams const & bp)
 {
 	string result;
 
-	if (bp.papersize2 != VM_PAPER_CUSTOM) {
+	if (bp.papersize != PAPER_CUSTOM) {
 		string const paper_size = bp.paperSizeName();
 		if (paper_size != "b5" && paper_size != "foolscap")
 			result = "-p "+ paper_size;
@@ -294,11 +294,16 @@ bool Converters::convert(Buffer const * buffer,
 		if (try_default) {
 			// if no special converter defined, then we take the
 			// default one from ImageMagic.
-			string const from_ext = formats.extension(from_format);
-			string const command = "sh " +
-				LibFileSearch("scripts", "convertDefault.sh") +
-				' ' + from_ext + ':' + from_file +
-				' ' + to_ext   + ':' + to_file;
+			string const from_ext = from_format.empty() ?
+				GetExtension(from_file) :
+				formats.extension(from_format);
+			string const command =
+				"sh " +
+				QuoteName(LibFileSearch("scripts", "convertDefault.sh")) +
+				' ' +
+				QuoteName(from_ext + ':' + from_file) +
+				' ' +
+				QuoteName(to_ext + ':' + to_file);
 			lyxerr[Debug::FILES]
 				<< "No converter defined! "
 				   "I use convertDefault.sh:\n\t"
@@ -409,6 +414,9 @@ bool Converters::convert(Buffer const * buffer,
 						<< "renaming file " << outfile
 						<< " to " << real_outfile
 						<< endl;
+				// Finally, don't forget to tell any future
+				// converters to use the renamed file...
+				outfile = real_outfile;
 			}
 
 			if (!conv.parselog.empty()) {