prevent crash when inserting minipage in table cell,

[lyx.git] / src / insets / insetgraphics.C

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index cf6917c091473d8c1652009b22a5b9f6378fb57d..c2b4a355f7e43ec987f3d1cdb60b42c8b5e72877 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -82,13 +82,13 @@ TODO
 
 #include <algorithm> // For the std::max
 
-extern string system_tempdir;
 // set by Exporters
 
 using namespace lyx::support;
 
 using std::ostream;
 using std::endl;
+using std::auto_ptr;
 
 
 namespace {
@@ -143,7 +143,7 @@ InsetGraphics::InsetGraphics()
 
 
 InsetGraphics::InsetGraphics(InsetGraphics const & ig)
-       : Inset(ig),
+       : InsetOld(ig),
          boost::signals::trackable(),
          graphic_label(uniqueID()),
          graphic_(new GraphicRenderer(*ig.graphic_))
@@ -153,9 +153,9 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig)
 }
 
 
-InsetBase * InsetGraphics::clone() const
+auto_ptr<InsetBase> InsetGraphics::clone() const
 {
-       return new InsetGraphics(*this);
+       return auto_ptr<InsetBase>(new InsetGraphics(*this));
 }
 
 
@@ -177,9 +177,9 @@ dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
-               string const bufpath = cmd.view()->buffer()->filePath();
+               Buffer const & buffer = *cmd.view()->buffer();
                InsetGraphicsParams p;
-               InsetGraphicsMailer::string2params(cmd.argument, bufpath, p);
+               InsetGraphicsMailer::string2params(cmd.argument, buffer, p);
                if (!p.filename.empty()) {
                        setParams(p);
                        cmd.view()->updateInset(this);
@@ -197,7 +197,7 @@ dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
                return DISPATCHED;
 
        default:
-               return Inset::localDispatch(cmd);
+               return InsetOld::localDispatch(cmd);
        }
 }
 
@@ -215,7 +215,7 @@ void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-Inset::EDITABLE InsetGraphics::editable() const
+InsetOld::EDITABLE InsetGraphics::editable() const
 {
        return IS_EDITABLE;
 }
@@ -331,8 +331,8 @@ string const InsetGraphics::prepareFile(Buffer const * buf,
 {
        // LaTeX can cope if the graphics file doesn't exist, so just return the
        // filename.
-       string orig_file = params().filename;
-       string const rel_file = MakeRelPath(orig_file, buf->filePath());
+       string orig_file = params().filename.absFilename();
+       string const rel_file = params().filename.relFilename(buf->filePath());
 
        if (!IsFileReadable(orig_file)) {
                lyxerr[Debug::GRAPHICS]
@@ -466,14 +466,15 @@ int InsetGraphics::latex(Buffer const * buf, ostream & os,
        // just output a message about it in the latex output.
        lyxerr[Debug::GRAPHICS]
                << "insetgraphics::latex: Filename = "
-               << params().filename << endl;
+               << params().filename.absFilename() << endl;
 
-       string const relative_file = MakeRelPath(params().filename, buf->filePath());
+       string const relative_file =
+               params().filename.relFilename(buf->filePath());
 
        // A missing (e)ps-extension is no problem for LaTeX, so
        // we have to test three different cases
 #warning uh, but can our cache handle it ? no.
-       string const file_ = params().filename;
+       string const file_ = params().filename.absFilename();
        bool const file_exists =
                !file_.empty() &&
                (IsFileReadable(file_) ||               // original
@@ -543,14 +544,20 @@ int InsetGraphics::ascii(Buffer const *, ostream & os, int) const
        // 1. Convert file to ascii using gifscii
        // 2. Read ascii output file and add it to the output stream.
        // at least we send the filename
-       os << '<' << bformat(_("Graphics file: %1$s"), params().filename) << ">\n";
+       os << '<' << bformat(_("Graphics file: %1$s"),
+                            params().filename.absFilename()) << ">\n";
        return 0;
 }
 
 
-int InsetGraphics::linuxdoc(Buffer const *, ostream &) const
+int InsetGraphics::linuxdoc(Buffer const * buf, ostream & os) const
 {
-       // No graphics in LinuxDoc output. Should check how/what to add.
+       string const file_name = buf->niceFile ?
+                               params().filename.relFilename(buf->filePath()):
+                               params().filename.absFilename();
+
+       os << "<eps file=\"" << file_name << "\">\n";
+       os << "<img src=\"" << file_name << "\">";
        return 0;
 }
 
@@ -575,7 +582,8 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
        if (params().filename.empty())
                return;
 
-       features.includeFile(graphic_label, RemoveExtension(params().filename));
+       features.includeFile(graphic_label,
+                            RemoveExtension(params().filename.absFilename()));
 
        features.require("graphicx");
 
@@ -607,12 +615,6 @@ InsetGraphicsParams const & InsetGraphics::params() const
 }
 
 
-BufferView * InsetGraphics::view() const
-{
-       return graphic_->view();
-}
-
-
 string const InsetGraphicsMailer::name_("graphics");
 
 InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
@@ -620,18 +622,15 @@ InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
 {}
 
 
-string const InsetGraphicsMailer::inset2string() const
+string const InsetGraphicsMailer::inset2string(Buffer const & buffer) const
 {
-       BufferView * bv = inset_.view();
-       if (bv)
-               return params2string(inset_.params(), bv->buffer()->filePath());
-       return string();
+       return params2string(inset_.params(), buffer);
 }
 
 
 void InsetGraphicsMailer::string2params(string const & in,
-                                       string const & buffer_path,
-                                       InsetGraphicsParams & params)
+                                       Buffer const & buffer,
+                                       InsetGraphicsParams & params)
 {
        params = InsetGraphicsParams();
 
@@ -651,7 +650,7 @@ void InsetGraphicsMailer::string2params(string const & in,
 
        if (lex.isOK()) {
                InsetGraphics inset;
-               inset.readInsetGraphics(lex, buffer_path);
+               inset.readInsetGraphics(lex, buffer.filePath());
                params = inset.params();
        }
 }
@@ -659,11 +658,11 @@ void InsetGraphicsMailer::string2params(string const & in,
 
 string const
 InsetGraphicsMailer::params2string(InsetGraphicsParams const & params,
-                                  string const & buffer_path)
+                                  Buffer const & buffer)
 {
        ostringstream data;
        data << name_ << ' ';
-       params.Write(data, buffer_path);
+       params.Write(data, buffer.filePath());
        data << "\\end_inset\n";
        return STRCONV(data.str());
 }