Re: Absolute path of graphics file?

[Kayvan A. Sylvan]

On Tue, Mar 26, 2002 at 06:05:56PM +0100, Jean-Marc Lasgouttes wrote:
> >>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:
> 
> Angus> Shouldn't that be wrapped inside MakeAbsPath? Shall I do that?
> 
> Please do not do that. I think the calls to os::external_path should
> be done only at the point when you plan to handover the path to an
> external program. In this case, you need to do that when you output
> the lyx file. I think the right place is in the output to stream.
> 
> JMarc

So that means my patch below is right?

Index: src/insets/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.366
diff -u -r1.366 ChangeLog
--- src/insets/ChangeLog        2002/03/26 15:21:58     1.366
+++ src/insets/ChangeLog        2002/03/26 16:49:47
@@ -1,3 +1,7 @@
+2002-03-26  Kayvan A. Sylvan <[EMAIL PROTECTED]>
+
+       * insetgraphics.C (prepareFile): fix external path for Cygwin.
+
 2002-03-26  Angus Leeming  <[EMAIL PROTECTED]>
 
        * insetgraphicsParams.C (Read): revert Herbert's fix and apply the
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.96
diff -u -r1.96 insetgraphics.C
--- src/insets/insetgraphics.C  2002/03/26 15:21:58     1.96
+++ src/insets/insetgraphics.C  2002/03/26 16:49:47
@@ -99,6 +99,7 @@
 #include "support/LAssert.h"
 #include "support/filetools.h"
 #include "support/lyxalgo.h" // lyx::count
+#include "support/os.h"
 
 #include <algorithm> // For the std::max
 
@@ -610,6 +611,7 @@
        //
        // if it's a zipped one, than let LaTeX do the rest!!!
        string filename_  = MakeAbsPath(params().filename, buf->filePath());
+       filename_ = os::external_path(filename_);
        bool const zipped = zippedFile(filename_);
 
        if ((zipped && params().noUnzip) || buf->niceFile) {

-- 
Kayvan A. Sylvan          | Proud husband of       | Father to my kids:
Sylvan Associates, Inc.   | Laura Isabella Sylvan  | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)

msg35475/pgp00000.pgp
Description: PGP signature