X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FExternalSupport.cpp;h=33c14d38be935a6a0b957346bd8e320faaf49e24;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=0d2615883bd745cf42fe2d99a4a66d58586040f8;hpb=09a6f725d02e7d1885b9b920a82f66e686b4b83e;p=lyx.git

diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index 0d2615883b..33c14d38be 100644
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -22,6 +22,7 @@
 #include "Exporter.h"
 #include "Format.h"
 #include "Mover.h"
+#include "texstream.h"
 
 #include "frontends/alert.h"
 
@@ -29,7 +30,6 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
 #include "support/os.h"
 #include "support/Package.h"
 
@@ -50,8 +50,8 @@ Template const * getTemplatePtr(InsetExternalParams const & params)
 
 void editExternal(InsetExternalParams const & params, Buffer const & buffer)
 {
-	formats.edit(buffer, params.filename.availableFile(),
-		     formats.getFormatFromFile(params.filename));
+	theFormats().edit(buffer, params.filename,
+		theFormats().getFormatFromFile(params.filename));
 }
 
 
@@ -74,7 +74,7 @@ string const subst_path(string const & input,
 	return subst(input, placeholder, path2);
 }
 
-} // namespace anon
+} // namespace
 
 
 string const doSubstitution(InsetExternalParams const & params,
@@ -83,18 +83,32 @@ string const doSubstitution(InsetExternalParams const & params,
 			    bool external_in_tmpdir,
 			    Substitute what)
 {
+	string result = s;
+	if (what != PATHS && contains(result, "$$pngOrjpg")) {
+		// This is for raster images and pdflatex:
+		// Since pdflatex supports both jpg and png, we choose the best format:
+		// jpg if the original file is jpg to retain the compression, else png.
+		string format = theFormats().getFormatFromFile(params.filename);
+		if (format == "jpg")
+			result = subst(result, "$$pngOrjpg", "jpg");
+		else
+			result = subst(result, "$$pngOrjpg", "png");
+	}
+
+	if (what == FORMATS)
+		return result;
+
 	Buffer const * masterBuffer = buffer.masterBuffer();
 	string const parentpath = external_in_tmpdir ?
 		masterBuffer->temppath() :
 		buffer.filePath();
 	string const filename = external_in_tmpdir ?
-		params.filename.mangledFilename() :
-		params.filename.outputFilename(parentpath);
+		params.filename.mangledFileName() :
+		params.filename.outputFileName(parentpath);
 	string const basename = changeExtension(
-			onlyFilename(filename), string());
-	string const absname = makeAbsPath(filename, parentpath).absFilename();
+			onlyFileName(filename), string());
+	string const absname = makeAbsPath(filename, parentpath).absFileName();
 
-	string result = s;
 	if (what != ALL_BUT_PATHS) {
 		string const filepath = onlyPath(filename);
 		string const abspath = onlyPath(absname);
@@ -130,7 +144,7 @@ string const doSubstitution(InsetExternalParams const & params,
 				    relToParentPath, use_latex_path,
 				    PROTECT_EXTENSION,
 				    ESCAPE_DOTS);
-		if (FileName(filename).isAbsolute()) {
+		if (FileName::isAbsolute(filename)) {
 			result = subst_path(result, "$$AbsOrRelPathMaster",
 					    abspath, use_latex_path,
 					    PROTECT_EXTENSION,
@@ -160,9 +174,9 @@ string const doSubstitution(InsetExternalParams const & params,
 			    PROTECT_EXTENSION, ESCAPE_DOTS);
 	result = subst_path(result, "$$Extension",
 			'.' + getExtension(filename), use_latex_path);
-	result = subst_path(result, "$$Tempname", params.tempname().absFilename(), use_latex_path);
+	result = subst_path(result, "$$Tempname", params.tempname().absFileName(), use_latex_path);
 	result = subst_path(result, "$$Sysdir",
-				package().system_support().absFilename(), use_latex_path);
+				package().system_support().absFileName(), use_latex_path);
 
 	// Handle the $$Contents(filename) syntax
 	if (contains(result, "$$Contents(\"")) {
@@ -185,7 +199,7 @@ string const doSubstitution(InsetExternalParams const & params,
 
 		size_t const pos = result.find("$$Contents(\"");
 		size_t const end = result.find("\")", pos);
-		result.replace(pos, end + 2, contents);
+		result.replace(pos, end + 2- pos, contents);
 	}
 
 	return result;
@@ -198,7 +212,7 @@ namespace {
     If \p external_in_tmpdir == true, then the generated file is
     placed in the buffer's temporary directory.
 */
-void updateExternal(InsetExternalParams const & params,
+RetVal updateExternal(InsetExternalParams const & params,
 		    string const & format,
 		    Buffer const & buffer,
 		    ExportData & exportdata,
@@ -207,37 +221,38 @@ void updateExternal(InsetExternalParams const & params,
 {
 	Template const * const et_ptr = getTemplatePtr(params);
 	if (!et_ptr)
-		return; // FAILURE
+		return FAILURE;
 	Template const & et = *et_ptr;
 
 	if (!et.automaticProduction)
-		return; // NOT_NEEDED
+		return NOT_NEEDED;
 
 	Template::Formats::const_iterator cit = et.formats.find(format);
 	if (cit == et.formats.end())
-		return; // FAILURE
+		return FAILURE;
 
 	Template::Format const & outputFormat = cit->second;
 	if (outputFormat.updateResult.empty())
-		return; // NOT_NEEDED
+		return NOT_NEEDED;
 
 	string from_format = et.inputFormat;
 	if (from_format.empty())
-		return; // NOT_NEEDED
+		return NOT_NEEDED;
 
 	if (from_format == "*") {
 		if (params.filename.empty())
-			return; // NOT_NEEDED
+			return NOT_NEEDED;
 
 		// Try and ascertain the file format from its contents.
-		from_format = formats.getFormatFromFile(params.filename);
+		from_format = theFormats().getFormatFromFile(params.filename);
 		if (from_format.empty())
-			return; // FAILURE
+			return FAILURE;
 	}
 
-	string const to_format = outputFormat.updateFormat;
+	string const to_format = doSubstitution(params, buffer,
+		outputFormat.updateFormat, false, external_in_tmpdir, FORMATS);
 	if (to_format.empty())
-		return; // NOT_NEEDED
+		return NOT_NEEDED;
 
 	// The master buffer. This is useful when there are multiple levels
 	// of include files
@@ -245,19 +260,20 @@ void updateExternal(InsetExternalParams const & params,
 
 	// We copy the source file to the temp dir and do the conversion
 	// there if necessary
+	bool const isDir = params.filename.isDirectory();
 	FileName const temp_file(
-		makeAbsPath(params.filename.mangledFilename(),
+		makeAbsPath(params.filename.mangledFileName(),
 				     masterBuffer->temppath()));
-	if (!params.filename.empty() && !params.filename.isDirectory()) {
+	if (!params.filename.empty() && !isDir) {
 		unsigned long const from_checksum = params.filename.checksum();
 		unsigned long const temp_checksum = temp_file.checksum();
 
 		if (from_checksum != temp_checksum) {
 			Mover const & mover = getMover(from_format);
-			if (!mover.copy(params.filename.availableFile(), temp_file)) {
+			if (!mover.copy(params.filename, temp_file)) {
 				LYXERR(Debug::EXTERNAL, "external::updateExternal. "
 					<< "Unable to copy " << params.filename << " to " << temp_file);
-				return; // FAILURE
+				return FAILURE;
 			}
 		}
 	}
@@ -296,29 +312,37 @@ void updateExternal(InsetExternalParams const & params,
 						      ALL_BUT_PATHS);
 				// if file is a relative name, it is interpreted
 				// relative to the master document.
-				exportdata.addExternalFile(rit->first, source, file);
+				if (makeAbsPath(file, masterBuffer->filePath()) !=
+					params.filename.absFileName())
+						exportdata.addExternalFile(rit->first, source, file);
 			}
 		}
 	}
 
 	// Do we need to perform the conversion?
 	// Yes if to_file does not exist or if from_file is newer than to_file
-	if (compare_timestamps(temp_file, abs_to_file) < 0)
-		return; // SUCCESS
+	// or if from_file is a directory (bug 9925)
+	if (!isDir && compare_timestamps(temp_file, abs_to_file) < 0)
+		return SUCCESS;
 
 	// FIXME (Abdel 12/08/06): Is there a need to show these errors?
 	ErrorList el;
-	bool const success =
+	Converters::RetVal const success =
 		theConverters().convert(&buffer, temp_file, abs_to_file,
-				   params.filename.availableFile(), from_format, to_format, el,
+				   params.filename, from_format, to_format, el,
 				   Converters::try_default | Converters::try_cache);
-
-	if (!success) {
+	switch (success) {
+	case Converters::SUCCESS:
+		return SUCCESS;
+	case Converters::FAILURE:
 		LYXERR(Debug::EXTERNAL, "external::updateExternal. "
 			<< "Unable to convert from " << from_format << " to " << to_format);
+			return FAILURE;
+	case Converters::KILLED:
+		return KILLED;
 	}
-
-	// return success
+	// squash warning
+	return SUCCESS;
 }
 
 
@@ -328,51 +352,64 @@ string const substituteCommands(InsetExternalParams const & params,
 string const substituteOptions(InsetExternalParams const & params,
 			       string const & input, string const & format);
 
-} // namespace anon
+} // namespace
 
 
-int writeExternal(InsetExternalParams const & params,
-		  string const & format,
-		  Buffer const & buffer, odocstream & os,
-		  ExportData & exportdata,
-		  bool external_in_tmpdir,
-		  bool dryrun)
+RetVal writeExternal(InsetExternalParams const & params,
+		   string const & format,
+		   Buffer const & buffer, otexstream & os,
+		   ExportData & exportdata,
+		   bool external_in_tmpdir,
+		   bool dryrun)
 {
 	Template const * const et_ptr = getTemplatePtr(params);
 	if (!et_ptr)
-		return 0;
+		return FAILURE;
 	Template const & et = *et_ptr;
 
 	Template::Formats::const_iterator cit = et.formats.find(format);
 	if (cit == et.formats.end()) {
 		LYXERR(Debug::EXTERNAL, "External template format '" << format
 			<< "' not specified in template " << params.templatename());
-		return 0;
+		return FAILURE;
 	}
 
-	if (!dryrun || contains(cit->second.product, "$$Contents"))
-		updateExternal(params, format, buffer, exportdata,
-			       external_in_tmpdir, dryrun);
+	if (!dryrun || contains(cit->second.product, "$$Contents")) {
+		RetVal const success = 
+			updateExternal(params, format, buffer, exportdata, 
+				external_in_tmpdir, dryrun);
+		if (success == FAILURE || success == KILLED)
+			return success;
+	}
 
 	bool const use_latex_path = format == "LaTeX";
 	string str = doSubstitution(params, buffer, cit->second.product,
 				    use_latex_path, external_in_tmpdir);
 
 	string const absname = makeAbsPath(
-		params.filename.outputFilename(buffer.filePath()), buffer.filePath()).absFilename();
-
-	if (!external_in_tmpdir && !isValidLaTeXFilename(absname)) {
-		lyx::frontend::Alert::warning(_("Invalid filename"),
-					      _("The following filename is likely to cause trouble "
-						"when running the exported file through LaTeX: ") +
-					      from_utf8(absname));
+		params.filename.outputFileName(buffer.filePath()), buffer.filePath()).absFileName();
+
+	if (!dryrun && !external_in_tmpdir) {
+		if (!isValidLaTeXFileName(absname)) {
+			lyx::frontend::Alert::warning(_("Invalid filename"),
+			         _("The following filename will cause troubles "
+			         "when running the exported file through LaTeX: ") +
+			      from_utf8(absname));
+		}
+		if (!isValidDVIFileName(absname)) {
+			lyx::frontend::Alert::warning(_("Problematic filename for DVI"),
+			         _("The following filename can cause troubles "
+			         "when running the exported file through LaTeX "
+			         "and opening the resulting DVI: ") +
+			       from_utf8(absname), true);
+		}
 	}
 
 	str = substituteCommands(params, str, format);
 	str = substituteOptions(params, str, format);
 	// FIXME UNICODE
 	os << from_utf8(str);
-	return int(count(str.begin(), str.end(),'\n'));
+	return SUCCESS;
 }
 
 namespace {
@@ -406,7 +443,7 @@ string const substituteIt<TransformCommand>(string const & input,
 	else if (id == Resize)
 		ptr = store.getCommandTransformer(params.resizedata);
 
-	if (!ptr.get())
+	if (!ptr)
 		return input;
 
 	string result =
@@ -443,9 +480,11 @@ string const substituteIt<TransformOption>(string const & input,
 	case Resize:
 		ptr = store.getOptionTransformer(params.resizedata);
 		break;
+	case None:
+		break;
 	}
 
-	if (!ptr.get())
+	if (!ptr)
 		return input;
 
 	return subst(input, ptr->placeholder(), ptr->option());
@@ -524,7 +563,7 @@ string const substituteOptions(InsetExternalParams const & params,
 	return output;
 }
 
-} // namespace anon
+} // namespace
 
 } // namespace external