Make script inset much tighter in texted.

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

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 7123d81fe916266caae1b438f25fd0e66f279b77..f604a1fb9d2e0028005a57524e643037b60e35c9 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -18,6 +18,7 @@
 
 #include "Buffer.h"
 #include "BufferView.h"
+#include "Converter.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "Exporter.h"
@@ -450,12 +451,6 @@ bool InsetExternal::setMouseHover(BufferView const * bv, bool mouse_hover) const
 }
 
 
-void InsetExternal::statusChanged() const
-{
-       updateFrontend();
-}
-
-
 void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
@@ -524,12 +519,18 @@ bool InsetExternal::showInsetDialog(BufferView * bv) const
 
 void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       if (!isRendererValid())
+               updatePreview();
+
        renderer_->metrics(mi, dim);
 }
 
 
 void InsetExternal::draw(PainterInfo & pi, int x, int y) const
 {
+       if (!isRendererValid())
+               updatePreview();
+
        if (renderer_->asButton())
                renderer_->setRenderState(mouse_hover_[pi.base.bv]);
        renderer_->draw(pi, x, y);
@@ -595,9 +596,22 @@ InsetExternalParams const & InsetExternal::params() const
 }
 
 
-void InsetExternal::updatePreview()
+bool InsetExternal::isPreviewed() const
+{
+       return (external::getTemplatePtr(params_) && !params_.filename.empty()
+               && params_.display
+               && lyxrc.display_graphics
+               && params_.preview_mode != PREVIEW_OFF
+               && (params_.preview_mode != PREVIEW_INSTANT
+                   || RenderPreview::previewText()));
+}
+
+
+bool InsetExternal::isRendererValid() const
 {
-       setParams(params_);
+       if (!renderer_->asButton())
+               return isPreviewed();
+       return !isPreviewed();
 }
 
 
@@ -609,12 +623,13 @@ void InsetExternal::setParams(InsetExternalParams const & p)
        // will use this.
        defaultTemplateName = params_.templatename();
 
-       if (!external::getTemplatePtr(params_) || params_.filename.empty()
-               || !params_.display
-               || !lyxrc.display_graphics
-               || params_.preview_mode == PREVIEW_OFF
-               || (params_.preview_mode == PREVIEW_INSTANT
-                   && !RenderPreview::previewText())) {
+       updatePreview();
+}
+
+
+void InsetExternal::updatePreview() const
+{
+       if (!isPreviewed()) {
                RenderButton * button_ptr = renderer_->asButton();
                if (!button_ptr) {
                        renderer_.reset(new RenderButton);
@@ -708,19 +723,26 @@ void InsetExternal::latex(otexstream & os, OutputParams const & runparams) const
                        et.formats.find("PDFLaTeX");
 
                if (cit != et.formats.end()) {
-                       external::writeExternal(params_, "PDFLaTeX",
-                                               buffer(), os,
-                                               *(runparams.exportdata),
-                                               external_in_tmpdir,
-                                               dryrun);
+                       external::RetVal retval =
+                               external::writeExternal(params_, "PDFLaTeX", buffer(), os,
+                                   *(runparams.exportdata), external_in_tmpdir, dryrun);
+                       if (retval == external::KILLED) {
+                               LYXERR0("External template preparation killed.");
+                               if (buffer().isClone() && buffer().isExporting())
+                                       throw ConversionException();
+                       }
                        return;
                }
        }
 
-       external::writeExternal(params_, "LaTeX", buffer(), os,
-                               *(runparams.exportdata),
-                               external_in_tmpdir,
-                               dryrun);
+       external::RetVal retval =
+               external::writeExternal(params_, "LaTeX", buffer(), os,
+                   *(runparams.exportdata), external_in_tmpdir, dryrun);
+       if (retval == external::KILLED) {
+               LYXERR0("External template preparation killed.");
+               if (buffer().isClone() && buffer().isExporting())
+                       throw ConversionException();
+       }
 }
 
 
@@ -735,8 +757,14 @@ int InsetExternal::plaintext(odocstringstream & os,
        bool const dryrun = runparams.dryrun || runparams.inComment;
        otexstream ots(os);
        ots << '\n'; // output external material on a new line
-       external::writeExternal(params_, "Ascii", buffer(), ots,
-                               *(runparams.exportdata), external_in_tmpdir, dryrun);
+       external::RetVal retval =
+               external::writeExternal(params_, "Ascii", buffer(), ots,
+                   *(runparams.exportdata), external_in_tmpdir, dryrun);
+       if (retval == external::KILLED) {
+               LYXERR0("External template preparation killed.");
+               if (buffer().isClone() && buffer().isExporting())
+                       throw ConversionException();
+       }
        return PLAINTEXT_NEWLINE;
 }
 
@@ -748,8 +776,14 @@ int InsetExternal::docbook(odocstream & os,
        bool const dryrun = runparams.dryrun || runparams.inComment;
        odocstringstream ods;
        otexstream ots(ods);
-       external::writeExternal(params_, "DocBook", buffer(), ots,
-                               *(runparams.exportdata), external_in_tmpdir, dryrun);
+       external::RetVal retval =
+               external::writeExternal(params_, "DocBook", buffer(), ots,
+                   *(runparams.exportdata), external_in_tmpdir, dryrun);
+       if (retval == external::KILLED) {
+               LYXERR0("External template preparation killed.");
+               if (buffer().isClone() && buffer().isExporting())
+                       throw ConversionException();
+       }
        os << ods.str();
        return int(count(ods.str().begin(), ods.str().end(), '\n'));
 }
@@ -762,8 +796,14 @@ docstring InsetExternal::xhtml(XHTMLStream & xs,
        bool const dryrun = runparams.dryrun || runparams.inComment;
        odocstringstream ods;
        otexstream ots(ods);
-       external::writeExternal(params_, "XHTML", buffer(), ots,
-                                      *(runparams.exportdata), external_in_tmpdir, dryrun);
+       external::RetVal retval =
+               external::writeExternal(params_, "XHTML", buffer(), ots,
+                   *(runparams.exportdata), external_in_tmpdir, dryrun);
+       if (retval == external::KILLED) {
+               LYXERR0("External template preparation killed.");
+               if (buffer().isClone() && buffer().isExporting())
+                       throw ConversionException();
+       }
        xs << XHTMLStream::ESCAPE_NONE << ods.str();
        return docstring();
 }