Also find external material files when the document is moved and origin is known

[lyx.git] / src / insets / InsetExternal.cpp

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index e73a6c02f63e5dc25bb97fb388fb35d3caa7a2e3..3d286b6f6041785837bdab4c9a04bbc6f505641b 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -45,6 +45,7 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
+#include "support/TempFile.h"
 
 #include <sstream>
 #include <vector>
@@ -67,33 +68,39 @@ namespace Alert = frontend::Alert;
 
 namespace external {
 
-TempName::TempName()
+TempName::TempName() : tempfile_(new support::TempFile("lyxextXXXXXX.tmp"))
 {
-       FileName const tempname = FileName::tempName("lyxext");
        // must have an extension for the converter code to work correctly.
-       tempname_ = FileName(tempname.absFileName() + ".tmp");
 }
 
 
-TempName::TempName(TempName const &)
+TempName::TempName(TempName const & that) : tempfile_(0)
 {
-       tempname_ = TempName()();
+       *this = that;
 }
 
 
 TempName::~TempName()
 {
-       tempname_.removeFile();
+       delete tempfile_;
 }
 
 
 TempName & TempName::operator=(TempName const & other)
 {
-       if (this != &other)
-               tempname_ = TempName()();
+       if (this != &other) {
+               delete tempfile_;
+               tempfile_ = new support::TempFile("lyxextXXXXXX.tmp");
+       }
        return *this;
 }
 
+
+support::FileName TempName::operator()() const
+{
+       return tempfile_->name();
+}
+
 } // namespace external
 
 
@@ -265,7 +272,7 @@ bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
                case EX_FILENAME: {
                        lex.eatLine();
                        string const name = lex.getString();
-                       filename.set(name, buffer.filePath());
+                       filename.set(name, buffer.originFilePath());
                        break;
                }
                
@@ -542,8 +549,7 @@ static void add_preview_and_start_loading(RenderMonitoredPreview & renderer,
 {
        InsetExternalParams const & params = inset.params();
 
-       if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
-           isPreviewWanted(params)) {
+       if (RenderPreview::previewText() && isPreviewWanted(params)) {
                renderer.setAbsFile(params.filename);
                docstring const snippet = latexString(inset);
                renderer.addPreview(snippet, buffer);
@@ -577,7 +583,7 @@ void InsetExternal::setParams(InsetExternalParams const & p)
                || !lyxrc.display_graphics
                || params_.preview_mode == PREVIEW_OFF
                || (params_.preview_mode == PREVIEW_INSTANT
-                   && RenderPreview::status() == LyXRC::PREVIEW_OFF)) {
+                   && !RenderPreview::previewText())) {
                RenderButton * button_ptr = renderer_->asButton();
                if (!button_ptr) {
                        renderer_.reset(new RenderButton);
@@ -593,6 +599,7 @@ void InsetExternal::setParams(InsetExternalParams const & p)
                LASSERT(false, return);
                break;
        case PREVIEW_INSTANT: {
+               //FIXME: why is the value below immediately forgotten?
                RenderMonitoredPreview * preview_ptr = renderer_->asMonitoredPreview();
                renderer_.reset(new RenderMonitoredPreview(this));
                preview_ptr = renderer_->asMonitoredPreview();
@@ -622,7 +629,7 @@ void InsetExternal::fileChanged() const
                return;
 
        RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview();
-       LASSERT(ptr, /**/);
+       LASSERT(ptr, return);
 
        ptr->removePreview(*buffer);
        add_preview_and_start_loading(*ptr, *this, *buffer);
@@ -673,29 +680,33 @@ void InsetExternal::latex(otexstream & os, OutputParams const & runparams) const
                        et.formats.find("PDFLaTeX");
 
                if (cit != et.formats.end()) {
-                       int l = external::writeExternal(params_, "PDFLaTeX",
-                                                       buffer(), os.os(),
-                                                       *(runparams.exportdata),
-                                                       external_in_tmpdir,
-                                                       dryrun);
-                       os.texrow().newlines(l);
+                       external::writeExternal(params_, "PDFLaTeX",
+                                               buffer(), os,
+                                               *(runparams.exportdata),
+                                               external_in_tmpdir,
+                                               dryrun);
                        return;
                }
        }
 
-       int l = external::writeExternal(params_, "LaTeX", buffer(), os.os(),
-                                       *(runparams.exportdata),
-                                       external_in_tmpdir,
-                                       dryrun);
-       os.texrow().newlines(l);
+       external::writeExternal(params_, "LaTeX", buffer(), os,
+                               *(runparams.exportdata),
+                               external_in_tmpdir,
+                               dryrun);
 }
 
 
 int InsetExternal::plaintext(odocstringstream & os,
                             OutputParams const & runparams, size_t) const
 {
-       os << '\n'; // output external material on a new line
-       external::writeExternal(params_, "Ascii", buffer(), os,
+       // this is too slow for constant use
+       if (runparams.for_tooltip)
+               return 0;
+
+       TexRow texrow;
+       otexstream ots(os, texrow);
+       ots << '\n'; // output external material on a new line
+       external::writeExternal(params_, "Ascii", buffer(), ots,
                                *(runparams.exportdata), false,
                                runparams.dryrun || runparams.inComment);
        return PLAINTEXT_NEWLINE;
@@ -705,9 +716,14 @@ int InsetExternal::plaintext(odocstringstream & os,
 int InsetExternal::docbook(odocstream & os,
                           OutputParams const & runparams) const
 {
-       return external::writeExternal(params_, "DocBook", buffer(), os,
-                                      *(runparams.exportdata), false,
-                                      runparams.dryrun || runparams.inComment);
+       TexRow texrow;
+       odocstringstream ods;
+       otexstream ots(ods, texrow);
+       external::writeExternal(params_, "DocBook", buffer(), ots,
+                               *(runparams.exportdata), false,
+                               runparams.dryrun || runparams.inComment);
+       os << ods.str();
+       return int(count(ods.str().begin(), ods.str().end(), '\n'));
 }