]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetexternal.C
The speed patch: redraw only rows that have changed
[lyx.git] / src / insets / insetexternal.C
index 597b4b3b88acc75e1a7494db301bfa67908fe2a1..4af98bba7798aaabc06d8a9fd1291caf1e7f6f18 100644 (file)
  *
  * \author Asger Alstrup Nielsen
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "insetexternal.h"
-#include "ExternalTemplate.h"
-#include "BufferView.h"
+#include "insets/ExternalSupport.h"
+#include "insets/ExternalTemplate.h"
+#include "insets/render_button.h"
+#include "insets/render_graphic.h"
+#include "insets/render_preview.h"
+
 #include "buffer.h"
+#include "BufferView.h"
+#include "cursor.h"
+#include "debug.h"
+#include "dispatchresult.h"
+#include "exporter.h"
 #include "funcrequest.h"
-#include "lyx_main.h"
-#include "LaTeXFeatures.h"
 #include "gettext.h"
-#include "debug.h"
+#include "LaTeXFeatures.h"
+#include "lyx_main.h"
 #include "lyxlex.h"
-#include "Lsstream.h"
+#include "lyxrc.h"
+#include "metricsinfo.h"
+#include "outputparams.h"
 
+#include "frontends/lyx_gui.h"
 #include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+
+#include "graphics/PreviewLoader.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/path.h"
-#include "support/systemcall.h"
-#include "support/FileInfo.h"
+#include "support/lyxlib.h"
+#include "support/convert.h"
+#include "support/translator.h"
 
-#include <cstdio>
-#include <utility>
+#include <boost/bind.hpp>
+
+#include <sstream>
+
+namespace support = lyx::support;
+namespace external = lyx::external;
+namespace graphics = lyx::graphics;
 
-using std::ostream;
 using std::endl;
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
+using std::vector;
 
 
-InsetExternal::InsetExternal()
-       : view_(0)
+namespace {
+
+external::DisplayType const defaultDisplayType = external::NoDisplay;
+
+unsigned int const defaultLyxScale = 100;
+
+string defaultTemplateName = "RasterImage";
+
+} // namespace anon
+
+
+namespace lyx {
+namespace external {
+
+TempName::TempName()
 {
-       tempname_ = lyx::tempName(string(), "lyxext");
-       //ExternalTemplateManager::Templates::const_iterator i1;
-       params_.templ = ExternalTemplateManager::get().getTemplates().begin()->second;
+       tempname_ = support::tempName(string(), "lyxext");
+       // FIXME: This is unsafe
+       support::unlink(tempname_);
+       // must have an extension for the converter code to work correctly.
+       tempname_ += ".tmp";
 }
 
 
-InsetExternal::~InsetExternal()
+TempName::TempName(TempName const &)
 {
-       lyx::unlink(tempname_);
-       InsetExternalMailer mailer(*this);
-       mailer.hideDialog();
+       tempname_ = TempName()();
 }
 
 
-InsetExternal::Params const & InsetExternal::params() const
+TempName::~TempName()
 {
-       return params_;
+       support::unlink(tempname_);
 }
 
 
-dispatch_result InsetExternal::localDispatch(FuncRequest const & cmd)
+TempName &
+TempName::operator=(TempName const & other)
 {
-       switch (cmd.action) {
+       if (this != &other)
+               tempname_ = TempName()();
+       return *this;
+}
 
-       case LFUN_INSET_MODIFY: {
-               InsetExternal::Params p;
-               InsetExternalMailer::string2params(cmd.argument, p);
-               if (!p.filename.empty()) {
-                       setFromParams(p);
-                       cmd.view()->updateInset(this);
-               }
-               return DISPATCHED;
-       }
 
-       case LFUN_INSET_DIALOG_UPDATE:
-               InsetExternalMailer(*this).updateDialog(cmd.view());
-               return DISPATCHED;
+namespace {
 
-       case LFUN_MOUSE_RELEASE:
-       case LFUN_INSET_EDIT:
-               InsetExternalMailer(*this).showDialog(cmd.view());
-               return DISPATCHED;
+/// The translator between the Display enum and corresponding lyx string.
+Translator<DisplayType, string> const initTranslator()
+{
+       Translator<DisplayType, string> translator(DefaultDisplay, "default");
 
-       default:
-               return UNDISPATCHED;
-       }
+       // Fill the display translator
+       translator.addPair(MonochromeDisplay, "monochrome");
+       translator.addPair(GrayscaleDisplay, "grayscale");
+       translator.addPair(ColorDisplay, "color");
+       translator.addPair(PreviewDisplay, "preview");
+       translator.addPair(NoDisplay, "none");
+
+       return translator;
 }
 
+} // namespace anon
+
 
-void InsetExternal::setFromParams(Params const & p)
+Translator<DisplayType, string> const & displayTranslator()
 {
-       params_.filename = p.filename;
-       params_.parameters = p.parameters;
-       params_.templ = p.templ;
+       static Translator<DisplayType, string> const translator =
+               initTranslator();
+       return translator;
 }
 
+} // namespace external
+} // namespace lyx
+
+
+InsetExternalParams::InsetExternalParams()
+       : display(defaultDisplayType),
+         lyxscale(defaultLyxScale),
+         draft(false),
+         templatename_(defaultTemplateName)
+{}
+
 
-string const InsetExternal::editMessage() const
+namespace {
+
+template <typename T>
+void clearIfNotFound(T & data, external::TransformID value,
+                    vector<external::TransformID> const & ids)
 {
-       return doSubstitution(0, params_.templ.guiName);
+       typedef vector<external::TransformID>::const_iterator
+               const_iterator;
+
+       const_iterator it  = ids.begin();
+       const_iterator end = ids.end();
+       it = std::find(it, end, value);
+       if (it == end)
+               data = T();
 }
 
+} // namespace anon
+
 
-void InsetExternal::write(Buffer const *, ostream & os) const
+void InsetExternalParams::settemplate(string const & name)
 {
-       os << "External " << params_.templ.lyxName << ",\""
-          << params_.filename << "\",\"" << params_.parameters << "\"\n";
+       templatename_ = name;
+
+       external::TemplateManager const & etm =
+               external::TemplateManager::get();
+       external::Template const * const et = etm.getTemplateByName(name);
+       if (!et)
+               // Be safe. Don't lose data.
+               return;
+
+       // Ascertain which transforms the template supports.
+       // Empty all those that it doesn't.
+       vector<external::TransformID> const & ids = et->transformIds;
+       clearIfNotFound(clipdata,     external::Clip,   ids);
+       clearIfNotFound(extradata,    external::Extra,  ids);
+       clearIfNotFound(resizedata,   external::Resize, ids);
+       clearIfNotFound(rotationdata, external::Rotate, ids);
 }
 
 
-void InsetExternal::read(Buffer const *, LyXLex & lex)
+void InsetExternalParams::write(Buffer const & buffer, ostream & os) const
 {
-       string format;
-       string token;
+       os << "External\n"
+          << "\ttemplate " << templatename() << '\n';
+
+       if (!filename.empty())
+               os << "\tfilename "
+                  << filename.outputFilename(buffer.filePath())
+                  << '\n';
+
+       if (display != defaultDisplayType)
+               os << "\tdisplay "
+                  << external::displayTranslator().find(display)
+                  << '\n';
+
+       if (lyxscale != defaultLyxScale)
+               os << "\tlyxscale " << convert<string>(lyxscale) << '\n';
+
+       if (draft)
+               os << "\tdraft\n";
+
+       if (!clipdata.bbox.empty())
+               os << "\tboundingBox " << clipdata.bbox << '\n';
+       if (clipdata.clip)
+               os << "\tclip\n";
+
+       external::ExtraData::const_iterator it  = extradata.begin();
+       external::ExtraData::const_iterator end = extradata.end();
+       for (; it != end; ++it) {
+               if (!it->second.empty())
+                       os << "\textra " << it->first << " \""
+                          << it->second << "\"\n";
+       }
 
-       // Read inset data from lex and store in format
-       if (lex.eatLine()) {
-               format = lex.getString();
-       } else {
-               lex.printError("InsetExternal: Parse error: `$$Token'");
+       if (!rotationdata.no_rotation()) {
+               os << "\trotateAngle " << rotationdata.adjAngle() << '\n';
+               if (rotationdata.origin() != external::RotationData::DEFAULT)
+                       os << "\trotateOrigin "
+                          << rotationdata.originString() << '\n';
        }
 
+       if (!resizedata.no_resize()) {
+               using support::float_equal;
+               double const scl = convert<double>(resizedata.scale);
+               if (!float_equal(scl, 0.0, 0.05)) {
+                       if (!float_equal(scl, 100.0, 0.05))
+                               os << "\tscale "
+                                  << resizedata.scale << '\n';
+               } else {
+                       if (!resizedata.width.zero())
+                               os << "\twidth "
+                                  << resizedata.width.asString() << '\n';
+                       if (!resizedata.height.zero())
+                               os << "\theight "
+                                  << resizedata.height.asString() << '\n';
+               }
+               if (resizedata.keepAspectRatio)
+                       os << "\tkeepAspectRatio\n";
+       }
+}
+
+
+bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
+{
+       enum ExternalTags {
+               EX_TEMPLATE = 1,
+               EX_FILENAME,
+               EX_DISPLAY,
+               EX_LYXSCALE,
+               EX_DRAFT,
+               EX_BOUNDINGBOX,
+               EX_CLIP,
+               EX_EXTRA,
+               EX_HEIGHT,
+               EX_KEEPASPECTRATIO,
+               EX_ROTATEANGLE,
+               EX_ROTATEORIGIN,
+               EX_SCALE,
+               EX_WIDTH,
+               EX_END
+       };
+
+       keyword_item external_tags[] = {
+               { "\\end_inset",     EX_END },
+               { "boundingBox",     EX_BOUNDINGBOX },
+               { "clip",            EX_CLIP },
+               { "display",         EX_DISPLAY},
+               { "draft",           EX_DRAFT},
+               { "extra",           EX_EXTRA },
+               { "filename",        EX_FILENAME},
+               { "height",          EX_HEIGHT },
+               { "keepAspectRatio", EX_KEEPASPECTRATIO },
+               { "lyxscale",        EX_LYXSCALE},
+               { "rotateAngle",     EX_ROTATEANGLE },
+               { "rotateOrigin",    EX_ROTATEORIGIN },
+               { "scale",           EX_SCALE },
+               { "template",        EX_TEMPLATE },
+               { "width",           EX_WIDTH }
+       };
+
+       pushpophelper pph(lex, external_tags, EX_END);
+
+       bool found_end  = false;
+       bool read_error = false;
+
        while (lex.isOK()) {
-               lex.nextToken();
-               token = lex.getString();
-               if (token == "\\end_inset")
+               switch (lex.lex()) {
+               case EX_TEMPLATE:
+                       lex.next();
+                       templatename_ = lex.getString();
+                       break;
+
+               case EX_FILENAME: {
+                       lex.next();
+                       string const name = lex.getString();
+                       filename.set(name, buffer.filePath());
+                       break;
+               }
+
+               case EX_DISPLAY: {
+                       lex.next();
+                       string const name = lex.getString();
+                       display = external::displayTranslator().find(name);
+                       break;
+               }
+
+               case EX_LYXSCALE:
+                       lex.next();
+                       lyxscale = lex.getInteger();
+                       break;
+
+               case EX_DRAFT:
+                       draft = true;
+                       break;
+
+               case EX_BOUNDINGBOX:
+                       lex.next();
+                       clipdata.bbox.xl = lex.getInteger();
+                       lex.next();
+                       clipdata.bbox.yb = lex.getInteger();
+                       lex.next();
+                       clipdata.bbox.xr = lex.getInteger();
+                       lex.next();
+                       clipdata.bbox.yt = lex.getInteger();
+                       break;
+
+               case EX_CLIP:
+                       clipdata.clip = true;
+                       break;
+
+               case EX_EXTRA: {
+                       lex.next();
+                       string const name = lex.getString();
+                       lex.next();
+                       extradata.set(name, lex.getString());
+                       break;
+               }
+
+               case EX_HEIGHT:
+                       lex.next();
+                       resizedata.height = LyXLength(lex.getString());
+                       break;
+
+               case EX_KEEPASPECTRATIO:
+                       resizedata.keepAspectRatio = true;
+                       break;
+
+               case EX_ROTATEANGLE:
+                       lex.next();
+                       rotationdata.angle = lex.getString();
+                       break;
+
+               case EX_ROTATEORIGIN:
+                       lex.next();
+                       rotationdata.origin(lex.getString());
+                       break;
+
+               case EX_SCALE:
+                       lex.next();
+                       resizedata.scale = lex.getString();
+                       break;
+
+               case EX_WIDTH:
+                       lex.next();
+                       resizedata.width = LyXLength(lex.getString());
+                       break;
+
+               case EX_END:
+                       found_end = true;
+                       break;
+
+               default:
+                       lex.printError("ExternalInset::read: "
+                                      "Wrong tag: $$Token");
+                       read_error = true;
+                       break;
+               }
+
+               if (found_end || read_error)
                        break;
        }
-       if (token != "\\end_inset") {
-               lex.printError("Missing \\end_inset at this point. "
-                              "Read: `$$Token'");
+
+       if (!found_end)
+               lex.printError("ExternalInsetParams::read: Missing \\end_inset.");
+
+       // This is a trick to make sure that the data are self-consistent.
+       settemplate(templatename_);
+
+       if (lyxerr.debugging(Debug::EXTERNAL)) {
+               lyxerr  << "InsetExternalParams::read:\n";
+               write(buffer, lyxerr);
        }
 
-       // Parse string format...
-       string::size_type const pos1 = format.find(',');
-       params_.templ = ExternalTemplateManager::get().getTemplateByName(format.substr(0, pos1));
-       string::size_type const pos2 = format.find("\",\"", pos1);
-       params_.filename = format.substr(pos1 + 2, pos2 - (pos1 + 2));
-       params_.parameters = format.substr(pos2 + 3, format.length() - (pos2 + 4));
+       return !read_error;
+}
+
 
-       lyxerr[Debug::INFO] << "InsetExternal::Read: " << params_.templ.lyxName
-                           << ' ' << params_.filename
-                           << ' ' << params_.parameters << endl;
+InsetExternal::InsetExternal()
+       : renderer_(new RenderButton)
+{}
+
+
+InsetExternal::InsetExternal(InsetExternal const & other)
+       : InsetOld(other),
+         boost::signals::trackable(),
+         params_(other.params_),
+         renderer_(other.renderer_->clone(this))
+{}
+
+
+auto_ptr<InsetBase> InsetExternal::doClone() const
+{
+       return auto_ptr<InsetBase>(new InsetExternal(*this));
 }
 
 
-int InsetExternal::write(string const & format,
-                        Buffer const * buf, ostream & os) const
+InsetExternal::~InsetExternal()
 {
-       ExternalTemplate const & et = params_.templ;
-       ExternalTemplate::Formats::const_iterator cit =
-               et.formats.find(format);
-       if (cit == et.formats.end()) {
-               lyxerr << "External template format '" << format
-                      << "' not specified in template "
-                      << params_.templ.lyxName << endl;
-               return 0;
-       }
+       InsetExternalMailer(*this).hideDialog();
+}
 
-       updateExternal(format, buf);
-       os << doSubstitution(buf, cit->second.product);
-       return 0; // CHECK  (FIXME check what ? - jbl)
+
+void InsetExternal::statusChanged() const
+{
+       LyX::cref().updateInset(this);
 }
 
 
-int InsetExternal::latex(Buffer const * buf, ostream & os,
-                        LatexRunParams const &,
-                        bool) const
+void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-       return write("LaTeX", buf, os);
+       switch (cmd.action) {
+
+       case LFUN_EXTERNAL_EDIT: {
+               Buffer const & buffer = cur.buffer();
+               InsetExternalParams p;
+               InsetExternalMailer::string2params(cmd.argument, buffer, p);
+               external::editExternal(p, buffer);
+               break;
+       }
+
+       case LFUN_INSET_MODIFY: {
+               Buffer const & buffer = cur.buffer();
+               InsetExternalParams p;
+               InsetExternalMailer::string2params(cmd.argument, buffer, p);
+               setParams(p, buffer);
+               break;
+       }
+
+       case LFUN_INSET_DIALOG_UPDATE:
+               InsetExternalMailer(*this).updateDialog(&cur.bv());
+               break;
+
+       case LFUN_MOUSE_RELEASE:
+               InsetExternalMailer(*this).showDialog(&cur.bv());
+               break;
+
+       default:
+               InsetBase::doDispatch(cur, cmd);
+       }
 }
 
 
-int InsetExternal::ascii(Buffer const * buf, ostream & os, int) const
+bool InsetExternal::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
 {
-       return write("Ascii", buf, os);
+       switch (cmd.action) {
+
+       case LFUN_EXTERNAL_EDIT:
+       case LFUN_INSET_MODIFY:
+       case LFUN_INSET_DIALOG_UPDATE:
+               flag.enabled(true);
+               return true;
+
+       default:
+               return InsetBase::getStatus(cur, cmd, flag);
+       }
 }
 
 
-int InsetExternal::linuxdoc(Buffer const * buf, ostream & os) const
+void InsetExternal::edit(LCursor & cur, bool)
 {
-       return write("LinuxDoc", buf, os);
+       InsetExternalMailer(*this).showDialog(&cur.bv());
 }
 
 
-int InsetExternal::docbook(Buffer const * buf, ostream & os, bool) const
+void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return write("DocBook", buf, os);
+       renderer_->metrics(mi, dim);
+       dim_ = dim;
 }
 
 
-void InsetExternal::validate(LaTeXFeatures & features) const
+void InsetExternal::draw(PainterInfo & pi, int x, int y) const
 {
-       ExternalTemplate const & et = params_.templ;
-       ExternalTemplate::Formats::const_iterator cit =
-               et.formats.find("LaTeX");
+       setPosCache(pi, x, y);
+       renderer_->draw(pi, x, y);
+}
 
-       if (cit == et.formats.end())
-               return;
 
-       if (!cit->second.requirement.empty()) {
-               features.require(cit->second.requirement);
+namespace {
+
+enum RenderType {
+       RENDERBUTTON,
+       RENDERGRAPHIC,
+       RENDERPREVIEW
+};
+
+
+RenderType getRenderType(InsetExternalParams const & p)
+{
+       if (!external::getTemplatePtr(p) ||
+           p.filename.empty() ||
+           p.display == external::NoDisplay)
+               return RENDERBUTTON;
+
+       if (p.display == external::PreviewDisplay) {
+               if (RenderPreview::status() != LyXRC::PREVIEW_OFF)
+                       return RENDERPREVIEW;
+               return RENDERBUTTON;
        }
-       if (!cit->second.preamble.empty()) {
-               features.addExternalPreamble(cit->second.preamble + "\n");
+
+       if (p.display == external::DefaultDisplay &&
+           lyxrc.display_graphics == graphics::NoDisplay)
+               return RENDERBUTTON;
+       return RENDERGRAPHIC;
+}
+
+
+graphics::Params get_grfx_params(InsetExternalParams const & eparams)
+{
+       graphics::Params gparams;
+
+       gparams.filename = eparams.filename.absFilename();
+       gparams.scale = eparams.lyxscale;
+       if (eparams.clipdata.clip)
+               gparams.bb = eparams.clipdata.bbox;
+       gparams.angle = convert<double>(eparams.rotationdata.adjAngle());
+
+       switch (eparams.display) {
+       case external::DefaultDisplay:
+               gparams.display = graphics::DefaultDisplay;
+               break;
+       case external::MonochromeDisplay:
+               gparams.display = graphics::MonochromeDisplay;
+               break;
+       case external::GrayscaleDisplay:
+               gparams.display = graphics::GrayscaleDisplay;
+               break;
+       case external::ColorDisplay:
+               gparams.display = graphics::ColorDisplay;
+               break;
+       case external::NoDisplay:
+               gparams.display = graphics::NoDisplay;
+               break;
+       default:
+               BOOST_ASSERT(false);
        }
+       if (gparams.display == graphics::DefaultDisplay)
+               gparams.display = lyxrc.display_graphics;
+       // Override the above if we're not using a gui
+       if (!lyx_gui::use_gui)
+               gparams.display = graphics::NoDisplay;
+
+       return gparams;
 }
 
 
-Inset * InsetExternal::clone(Buffer const &, bool same_id) const
+string const getScreenLabel(InsetExternalParams const & params,
+                           Buffer const & buffer)
 {
-       InsetExternal * inset = new InsetExternal;
-       inset->params_ = params_;
-       inset->view_ = view_;
-       if (same_id)
-               inset->id_ = id_;
-       return inset;
+       external::Template const * const ptr =
+               external::getTemplatePtr(params);
+       if (!ptr)
+               return support::bformat(_("External template %1$s is not installed"),
+                                       params.templatename());
+       return external::doSubstitution(params, buffer, ptr->guiName, false);
 }
 
+void add_preview_and_start_loading(RenderMonitoredPreview &,
+                                  InsetExternal const &,
+                                  Buffer const &);
 
-string const InsetExternal::getScreenLabel(Buffer const *) const
+} // namespace anon
+
+
+InsetExternalParams const & InsetExternal::params() const
 {
-       ExternalTemplate const & et = params_.templ;
-       if (et.guiName.empty())
-               return _("External");
-       else
-               return doSubstitution(0, et.guiName);
+       return params_;
 }
 
 
-void InsetExternal::executeCommand(string const & s,
-                                  Buffer const * buffer) const
+void InsetExternal::setParams(InsetExternalParams const & p,
+                             Buffer const & buffer)
 {
-       Path p(buffer->filePath());
-       Systemcall one;
-       if (lyxerr.debugging()) {
-               lyxerr << "Executing '" << s << "' in '"
-                      << buffer->filePath() << '\'' << endl;
+       params_ = p;
+
+       // Subsequent calls to the InsetExternal::Params default constructor
+       // will use this.
+       defaultTemplateName = params_.templatename();
+
+       switch (getRenderType(params_)) {
+       case RENDERBUTTON: {
+               RenderButton * button_ptr = renderer_->asButton();
+               if (!button_ptr) {
+                       renderer_.reset(new RenderButton);
+                       button_ptr = renderer_->asButton();
+               }
+
+               button_ptr->update(getScreenLabel(params_, buffer), true);
+               break;
+
+       } case RENDERGRAPHIC: {
+               RenderGraphic * graphic_ptr = renderer_->asGraphic();
+               if (!graphic_ptr) {
+                       renderer_.reset(new RenderGraphic(this));
+                       graphic_ptr = renderer_->asGraphic();
+               }
+
+               graphic_ptr->update(get_grfx_params(params_));
+
+               break;
+
+       } case RENDERPREVIEW: {
+               RenderMonitoredPreview * preview_ptr =
+                       renderer_->asMonitoredPreview();
+               if (!preview_ptr) {
+                       renderer_.reset(new RenderMonitoredPreview(this));
+                       preview_ptr = renderer_->asMonitoredPreview();
+                       preview_ptr->fileChanged(
+                               boost::bind(&InsetExternal::fileChanged, this));
+               }
+
+               if (preview_ptr->monitoring())
+                       preview_ptr->stopMonitoring();
+               add_preview_and_start_loading(*preview_ptr, *this, buffer);
+
+               break;
        }
-       one.startscript(Systemcall::Wait, s);
+       }
+}
+
+
+void InsetExternal::fileChanged() const
+{
+       Buffer const * const buffer_ptr = LyX::cref().updateInset(this);
+       if (!buffer_ptr)
+               return;
+
+       RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview();
+       BOOST_ASSERT(ptr);
+
+       Buffer const & buffer = *buffer_ptr;
+       ptr->removePreview(buffer);
+       add_preview_and_start_loading(*ptr, *this, buffer);
+}
+
+
+void InsetExternal::write(Buffer const & buffer, ostream & os) const
+{
+       params_.write(buffer, os);
 }
 
 
-string const InsetExternal::doSubstitution(Buffer const * buffer,
-                                          string const & s) const
+void InsetExternal::read(Buffer const & buffer, LyXLex & lex)
 {
-       string result;
-       string const basename = ChangeExtension(params_.filename, string());
-       string filepath;
-       if (buffer && !buffer->tmppath.empty() && !buffer->niceFile) {
-               filepath = buffer->filePath();
+       InsetExternalParams params;
+       if (params.read(buffer, lex))
+               setParams(params, buffer);
+}
+
+
+int InsetExternal::latex(Buffer const & buf, ostream & os,
+                        OutputParams const & runparams) const
+{
+       if (params_.draft) {
+               os << "\\fbox{\\ttfamily{}"
+                  << params_.filename.outputFilename(buf.filePath())
+                  << "}\n";
+               return 1;
        }
-       result = subst(s, "$$FName", params_.filename);
-       result = subst(result, "$$Basename", basename);
-       result = subst(result, "$$Parameters", params_.parameters);
-       result = subst(result, "$$FPath", filepath);
-       result = subst(result, "$$Tempname", tempname_);
-       result = subst(result, "$$Sysdir", system_lyxdir);
-
-       // Handle the $$Contents(filename) syntax
-       if (contains(result, "$$Contents(\"")) {
-
-               string::size_type const pos = result.find("$$Contents(\"");
-               string::size_type const end = result.find("\")", pos);
-               string const file = result.substr(pos + 12, end - (pos + 12));
-               string contents;
-               if (buffer) {
-                       // Make sure we are in the directory of the buffer
-                       Path p(buffer->filePath());
-                       contents = GetFileContents(file);
-               } else {
-                       contents = GetFileContents(file);
-               }
-               result = subst(result,
-                              ("$$Contents(\"" + file + "\")").c_str(),
-                              contents);
+
+       // "nice" means that the buffer is exported to LaTeX format but not
+       // run through the LaTeX compiler.
+       // If we're running through the LaTeX compiler, we should write the
+       // generated files in the bufer's temporary directory.
+       bool const external_in_tmpdir = !runparams.nice;
+
+       // If the template has specified a PDFLaTeX output, then we try and
+       // use that.
+       if (runparams.flavor == OutputParams::PDFLATEX) {
+               external::Template const * const et_ptr =
+                       external::getTemplatePtr(params_);
+               if (!et_ptr)
+                       return 0;
+               external::Template const & et = *et_ptr;
+
+               external::Template::Formats::const_iterator cit =
+                       et.formats.find("PDFLaTeX");
+               if (cit != et.formats.end())
+                       return external::writeExternal(params_, "PDFLaTeX",
+                                                      buf, os,
+                                                      *(runparams.exportdata),
+                                                      external_in_tmpdir);
        }
+       return external::writeExternal(params_, "LaTeX", buf, os,
+                                      *(runparams.exportdata),
+                                      external_in_tmpdir);
+}
+
 
-       return result;
+int InsetExternal::plaintext(Buffer const & buf, ostream & os,
+                        OutputParams const & runparams) const
+{
+       return external::writeExternal(params_, "Ascii", buf, os,
+                                      *(runparams.exportdata));
 }
 
 
-void InsetExternal::updateExternal() const
+int InsetExternal::linuxdoc(Buffer const & buf, ostream & os,
+                           OutputParams const & runparams) const
 {
-       updateExternal("LaTeX", view_->buffer());
+       return external::writeExternal(params_, "LinuxDoc", buf, os,
+                                      *(runparams.exportdata));
 }
 
-void InsetExternal::updateExternal(string const & format,
-                                  Buffer const * buf) const
+
+int InsetExternal::docbook(Buffer const & buf, ostream & os,
+                          OutputParams const & runparams) const
 {
-       ExternalTemplate const & et = params_.templ;
-       ExternalTemplate::Formats::const_iterator cit =
-               et.formats.find(format);
+       return external::writeExternal(params_, "DocBook", buf, os,
+                                      *(runparams.exportdata));
+}
 
-       if (cit == et.formats.end() ||
-           cit->second.updateCommand.empty() ||
-           !et.automaticProduction)
+
+void InsetExternal::validate(LaTeXFeatures & features) const
+{
+       if (params_.draft)
                return;
 
-       if (!cit->second.updateResult.empty()) {
-               string const resultfile = doSubstitution(buf,
-                                                        cit->second.updateResult);
-               FileInfo fi(params_.filename);
-               FileInfo fi2(resultfile);
-               if (fi2.exist() && fi.exist() &&
-                   difftime(fi2.getModificationTime(),
-                            fi.getModificationTime()) >= 0) {
-                       lyxerr[Debug::FILES] << resultfile
-                                            << " is up to date" << endl;
-                       return;
-               }
+       external::Template const * const et_ptr =
+               external::getTemplatePtr(params_);
+       if (!et_ptr)
+               return;
+       external::Template const & et = *et_ptr;
+
+       // FIXME: This is wrong if we export to PDFLaTeX
+       external::Template::Formats::const_iterator cit =
+               et.formats.find("LaTeX");
+       if (cit == et.formats.end())
+               return;
+
+       // FIXME: We don't need that always
+       features.require("lyxdot");
+
+       vector<string>::const_iterator it  = cit->second.requirements.begin();
+       vector<string>::const_iterator end = cit->second.requirements.end();
+       for (; it != end; ++it)
+               features.require(*it);
+
+       external::TemplateManager & etm = external::TemplateManager::get();
+
+       it  = cit->second.preambleNames.begin();
+       end = cit->second.preambleNames.end();
+       for (; it != end; ++it) {
+               string const preamble = etm.getPreambleDefByName(*it);
+               if (!preamble.empty())
+                       features.addExternalPreamble(preamble);
        }
+}
+
+
+//
+// preview stuff
+//
+
+namespace {
+
+bool preview_wanted(InsetExternalParams const & params)
+{
+       string const included_file = params.filename.absFilename();
 
-       executeCommand(doSubstitution(buf, cit->second.updateCommand), buf);
+       return params.display == external::PreviewDisplay &&
+               support::IsFileReadable(included_file);
 }
 
 
-void InsetExternal::viewExternal() const
+string const latex_string(InsetExternal const & inset, Buffer const & buffer)
 {
-       ExternalTemplate const & et = params_.templ;
-       if (et.viewCommand.empty())
-               return;
+       ostringstream os;
+       OutputParams runparams;
+       runparams.flavor = OutputParams::LATEX;
+       inset.latex(buffer, os, runparams);
 
-       updateExternal();
-       executeCommand(doSubstitution(view_->buffer(),
-                                     et.viewCommand),
-                      view_->buffer());
+       return os.str();
 }
 
 
-void InsetExternal::editExternal() const
+void add_preview_and_start_loading(RenderMonitoredPreview & renderer,
+                                  InsetExternal const & inset,
+                                  Buffer const & buffer)
+{
+       InsetExternalParams const & params = inset.params();
+
+       if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
+           preview_wanted(params)) {
+               renderer.setAbsFile(params.filename.absFilename());
+               string const snippet = latex_string(inset, buffer);
+               renderer.addPreview(snippet, buffer);
+               renderer.startLoading(buffer);
+       }
+}
+
+} // namespace anon
+
+
+void InsetExternal::addPreview(graphics::PreviewLoader & ploader) const
 {
-       ExternalTemplate const & et = params_.templ;
-       if (et.editCommand.empty())
+       RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview();
+       if (!ptr)
                return;
 
-       updateExternal();
-       executeCommand(doSubstitution(view_->buffer(),
-                                     et.editCommand),
-                      view_->buffer());
+       if (preview_wanted(params())) {
+               ptr->setAbsFile(params_.filename.absFilename());
+               string const snippet = latex_string(*this, ploader.buffer());
+               ptr->addPreview(snippet, ploader);
+       }
 }
 
 
+/// Mailer stuff
+
 string const InsetExternalMailer::name_("external");
 
 InsetExternalMailer::InsetExternalMailer(InsetExternal & inset)
@@ -351,56 +842,47 @@ InsetExternalMailer::InsetExternalMailer(InsetExternal & inset)
 {}
 
 
-string const InsetExternalMailer::inset2string() const
+string const InsetExternalMailer::inset2string(Buffer const & buffer) const
 {
-       return params2string(inset_.params());
+       return params2string(inset_.params(), buffer);
 }
 
 
 void InsetExternalMailer::string2params(string const & in,
-                                       InsetExternal::Params & params)
+                                       Buffer const & buffer,
+                                       InsetExternalParams & params)
 {
-       params = InsetExternal::Params();
-
+       params = InsetExternalParams();
        if (in.empty())
                return;
 
-       istringstream data(STRCONV(in));
+       istringstream data(in);
        LyXLex lex(0,0);
        lex.setStream(data);
 
-       if (lex.isOK()) {
-               lex.next();
-               string const token = lex.getString();
-               if (token != name_)
-                       return;
-       }
+       string name;
+       lex >> name;
+       if (!lex || name != name_)
+               return print_mailer_error("InsetExternalMailer", in, 1, name_);
 
        // This is part of the inset proper that is usually swallowed
-       // by Buffer::readInset
-       if (lex.isOK()) {
-               lex.next();
-               string const token = lex.getString();
-               if (token != "External")
-                       return;
-       }
+       // by LyXText::readInset
+       string id;
+       lex >> id;
+       if (!lex || id != "External")
+               return print_mailer_error("InsetBoxMailer", in, 2, "External");
 
-       if (lex.isOK()) {
-               InsetExternal inset;
-               inset.read(0, lex);
-               params = inset.params();
-       }
+       params.read(buffer, lex);
 }
 
 
 string const
-InsetExternalMailer::params2string(InsetExternal::Params const & params)
+InsetExternalMailer::params2string(InsetExternalParams const & params,
+                                  Buffer const & buffer)
 {
-       InsetExternal inset;
-       inset.setFromParams(params);
        ostringstream data;
        data << name_ << ' ';
-       inset.write(0, data);
+       params.write(buffer, data);
        data << "\\end_inset\n";
-       return STRCONV(data.str());
+       return data.str();
 }