The following does not work:
- open a doc with a figure in .eps format
- View->Postscript
- View->PDF(pdflatex)
Reason: The .eps file gets copied to the temp dir to produce the postscript
version of the document. When the pdf version is produced, the .eps file is
already in the temp dir, and conversion_needed in prepareFile() is false,
and therefore the .eps is not converted to .pdf.
The solution is to remove the conversion_needed variable, but since I don't
know why it was introduced I ask here wether this is correct.
Georg
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/insets/ChangeLog lyx-1.4-cvs/src/insets/ChangeLog
--- lyx-1.4-clean/src/insets/ChangeLog 2004-06-19 16:38:55.000000000 +0200
+++ lyx-1.4-cvs/src/insets/ChangeLog 2004-06-18 09:14:41.000000000 +0200
@@ -1,3 +1,12 @@
+2004-06-20 Georg Baum <[EMAIL PROTECTED]>
+
+ * insetgraphics.C (prepareFile): remove conversion_needed flag.
+ It made the following fail for a .eps graphics file:
+ 1) view->ps
+ 2) view->pdf (pdflatex)
+ because the .eps file was already in the temp dir when the pdflatex
+ export happened and therefore no .eps -> pdf conversion was done.
+
2004-06-18 Georg Baum <[EMAIL PROTECTED]>
* insetgraphics.C, insettabular.C: s/wether/whether/g
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/insets/insetgraphics.C lyx-1.4-cvs/src/insets/insetgraphics.C
--- lyx-1.4-clean/src/insets/insetgraphics.C 2004-06-19 16:38:57.000000000 +0200
+++ lyx-1.4-cvs/src/insets/insetgraphics.C 2004-06-18 09:11:15.000000000 +0200
@@ -455,16 +455,12 @@ string const InsetGraphics::prepareFile(
// This is necessary for DVI export.
string const temp_path = m_buffer->temppath();
- bool conversion_needed = true;
-
CopyStatus status;
boost::tie(status, temp_file) =
copyToDirIfNeeded(orig_file, temp_path, zipped);
if (status == FAILURE)
return orig_file;
- else if (status == IDENTICAL_CONTENTS)
- conversion_needed = false;
// a relative filename should be relative to the master
// buffer.
@@ -551,8 +547,7 @@ string const InsetGraphics::prepareFile(
// Do we need to perform the conversion?
// Yes if to_file does not exist or if temp_file is newer than to_file
- if (!conversion_needed ||
- compare_timestamps(temp_file, to_file) < 0) {
+ if (compare_timestamps(temp_file, to_file) < 0) {
lyxerr[Debug::GRAPHICS]
<< bformat(_("No conversion of %1$s is needed after all"),
rel_file)
