status.13x says it all: Enable graphics conversion using the default
convertDefault.sh converter when exporting, even if convertDefault.sh is not
executable.
The patch has been in the 1.4 tree since 28 August. It was created in response
to this thread:
http://article.gmane.org/gmane.editors.lyx.general/11001
--
Angus
Index: status.13x
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v
retrieving revision 1.1.2.105
diff -u -p -r1.1.2.105 status.13x
--- status.13x 31 Jul 2003 10:53:08 -0000 1.1.2.105
+++ status.13x 28 Aug 2003 11:39:37 -0000
@@ -90,3 +90,6 @@ What's new
- do not report failed inlining when compiling with gcc
- fix compilation with new development versions of xforms
+
+- enable graphics conversion using the default convertDefault.sh converter
+ when exporting, even if convertDefault.sh is not executable.
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.552.2.5
diff -u -p -r1.552.2.5 ChangeLog
--- src/insets/ChangeLog 1 Apr 2003 10:38:44 -0000 1.552.2.5
+++ src/insets/ChangeLog 28 Aug 2003 11:39:41 -0000
@@ -1,3 +1,9 @@
+2003-08-28 Angus Leeming <[EMAIL PROTECTED]>
+
+ * insetgraphics.C (prepareFile): prepend "convertDefault.sh" with
+ "sh ", enabling the conversion to be carried out even if the script
+ is not executable.
+
2003-04-01 John Levon <[EMAIL PROTECTED]>
* insetgraphicsParams.C (Read): fix reading of subcaptions that
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.146.2.1
diff -u -p -r1.146.2.1 insetgraphics.C
--- src/insets/insetgraphics.C 25 Feb 2003 13:42:48 -0000 1.146.2.1
+++ src/insets/insetgraphics.C 28 Aug 2003 11:39:42 -0000
@@ -668,7 +668,7 @@ string const InsetGraphics::prepareFile(
// from ImageMagic: convert from:inname.from to:outname.to
if (!converters.convert(buf, temp_file, outfile_base, from, to)) {
string const command =
- LibFileSearch("scripts", "convertDefault.sh") +
+ "sh " + LibFileSearch("scripts", "convertDefault.sh") +
' ' + from + ':' + temp_file + ' ' +
to + ':' + outfile_base + '.' + to;
lyxerr[Debug::GRAPHICS]
