]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetexternal.C
ws changes only
[lyx.git] / src / insets / insetexternal.C
index dd735bef019050e615cdd27337d03afe06181369..2fb0b6b2d44a482f5267ff06e6656edaa97f2a41 100644 (file)
-/* This file is part of
- * ======================================================
+/**
+ * \file insetexternal.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Asger Alstrup Nielsen
  *
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #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 "buffer.h"
-#include "frontends/LyXView.h"
-#include "lyx_main.h"
-#include "LaTeXFeatures.h"
-#include "gettext.h"
+#include "BufferView.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+#include "metricsinfo.h"
 
-#include "frontends/Dialogs.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.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/tostr.h"
+#include "support/translator.h"
 
-#include <cstdio>
-#include <utility>
+#include <boost/bind.hpp>
 
+#include "support/std_sstream.h"
+
+namespace support = lyx::support;
+namespace external = lyx::external;
 
-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)
-{
-       tempname_ = lyx::tempName(string(), "lyxext");
-       //ExternalTemplateManager::Templates::const_iterator i1;
-       params_.templ = ExternalTemplateManager::get().getTemplates().begin()->second;
-}
+namespace lyx {
+namespace graphics {
 
+/// The translator between the DisplayType and the corresponding lyx string.
+extern Translator<DisplayType, string> displayTranslator;
+
+} // namespace graphics
+} // namespace lyx
 
-InsetExternal::~InsetExternal()
-{
-       lyx::unlink(tempname_);
-       hideDialog();
-}
 
+namespace {
 
-InsetExternal::Params InsetExternal::params() const
+lyx::graphics::DisplayType const defaultDisplayType = lyx::graphics::NoDisplay;
+
+unsigned int defaultLyxScale = 100;
+
+} // namespace anon
+
+
+namespace lyx {
+namespace external {
+
+TempName::TempName()
 {
-       return params_;
+       tempname_ = support::tempName(string(), "lyxext");
+       support::unlink(tempname_);
+       // must have an extension for the converter code to work correctly.
+       tempname_ += ".tmp";
 }
 
 
-void InsetExternal::setFromParams(Params const & p)
+TempName::TempName(TempName const &)
 {
-       params_.filename = p.filename;
-       params_.parameters = p.parameters;
-       params_.templ = p.templ;
+       tempname_ = TempName()();
 }
 
 
-string const InsetExternal::editMessage() const
+TempName::~TempName()
 {
-       return doSubstitution(0, params_.templ.guiName);
+       support::unlink(tempname_);
 }
 
 
-void InsetExternal::edit(BufferView * bv,
-                        int /*x*/, int /*y*/, mouse_button::state)
+TempName &
+TempName::operator=(TempName const & other)
 {
-       view_ = bv;
-       view_->owner()->getDialogs()->showExternal(this);
+       if (this != &other)
+               tempname_ = TempName()();
+       return *this;
 }
 
+} // namespace external
+} // namespace lyx
 
-void InsetExternal::edit(BufferView * bv, bool)
+
+InsetExternalParams::InsetExternalParams()
+       : display(defaultDisplayType),
+         lyxscale(defaultLyxScale)
+{}
+
+
+namespace {
+
+template <typename T>
+void clearIfNotFound(T & data, external::TransformID value,
+                    vector<external::TransformID> const & ids)
 {
-       edit(bv, 0, 0, mouse_button::none);
+       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 "
+                  << lyx::graphics::displayTranslator.find(display)
+                  << '\n';
+
+       if (lyxscale != defaultLyxScale)
+               os << "\tlyxscale " << tostr(lyxscale) << '\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.angle() << '\n';
+               if (rotationdata.origin() != external::RotationData::DEFAULT)
+                       os << "\trotateOrigin "
+                          << rotationdata.originString() << '\n';
        }
 
+       if (!resizedata.no_resize()) {
+               using support::float_equal;
+
+               if (!float_equal(resizedata.scale, 0.0, 0.05)) {
+                       if (!float_equal(resizedata.scale, 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_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},
+               { "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 = lyx::graphics::displayTranslator.find(name);
+                       break;
+               }
+
+               case EX_LYXSCALE:
+                       lex.next();
+                       lyxscale = lex.getInteger();
+                       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.getFloat());
+                       break;
+
+               case EX_ROTATEORIGIN:
+                       lex.next();
+                       rotationdata.origin(lex.getString());
+                       break;
+
+               case EX_SCALE:
+                       lex.next();
+                       resizedata.scale = lex.getFloat();
+                       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'");
        }
 
-       // 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));
+       if (!found_end)
+               lex.printError("ExternalInset::read: Missing \\end_inset.");
 
-       lyxerr[Debug::INFO] << "InsetExternal::Read: " << params_.templ.lyxName
-                           << " " << params_.filename
-                           << " " << params_.parameters << endl;
+       // 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);
+       }
+
+       return !read_error;
 }
 
 
-int InsetExternal::write(string const & format,
-                        Buffer const * buf, ostream & os) const
-{
-       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;
-       }
+InsetExternal::InsetExternal()
+       : renderer_(new RenderButton)
+{}
+
 
-       updateExternal(format, buf);
-       os << doSubstitution(buf, cit->second.product);
-       return 0; // CHECK  (FIXME check what ? - jbl)
+InsetExternal::InsetExternal(InsetExternal const & other)
+       : InsetOld(other),
+         boost::signals::trackable(),
+         params_(other.params_),
+         renderer_(other.renderer_->clone())
+{
+       RenderGraphic * ptr =
+               dynamic_cast<RenderGraphic *>(renderer_.get());
+       if (ptr)
+               ptr->connect(boost::bind(&InsetExternal::statusChanged, this));
 }
 
 
-int InsetExternal::latex(Buffer const * buf,
-                        ostream & os, bool, bool) const
+auto_ptr<InsetBase> InsetExternal::clone() const
 {
-       return write("LaTeX", buf, os);
+       return auto_ptr<InsetBase>(new InsetExternal(*this));
 }
 
 
-int InsetExternal::ascii(Buffer const * buf, ostream & os, int) const
+InsetExternal::~InsetExternal()
 {
-       return write("Ascii", buf, os);
+       InsetExternalMailer(*this).hideDialog();
 }
 
 
-int InsetExternal::linuxdoc(Buffer const * buf, ostream & os) const
+void InsetExternal::cache(BufferView * view) const
 {
-       return write("LinuxDoc", buf, os);
+       BOOST_ASSERT(view);
+       view_ = view->owner()->view();
 }
 
+BufferView * InsetExternal::view() const
+{
+       return view_.lock().get();
+}
 
-int InsetExternal::docbook(Buffer const * buf, ostream & os) const
+
+void InsetExternal::statusChanged() const
 {
-       return write("DocBook", buf, os);
+       BufferView * const bv = view();
+       if (bv)
+               bv->updateInset(this);
 }
 
 
-void InsetExternal::validate(LaTeXFeatures & features) const
+dispatch_result InsetExternal::localDispatch(FuncRequest const & cmd)
 {
-       ExternalTemplate const & et = params_.templ;
-       ExternalTemplate::Formats::const_iterator cit =
-               et.formats.find("LaTeX");
+       switch (cmd.action) {
 
-       if (cit == et.formats.end())
-               return;
+       case LFUN_EXTERNAL_EDIT: {
+               BOOST_ASSERT(cmd.view());
 
-       if (!cit->second.requirement.empty()) {
-               features.require(cit->second.requirement);
+               Buffer const & buffer = *cmd.view()->buffer();
+               InsetExternalParams p;
+               InsetExternalMailer::string2params(cmd.argument, buffer, p);
+               external::editExternal(p, buffer);
+               return DISPATCHED_NOUPDATE;
+       }
+
+       case LFUN_INSET_MODIFY: {
+               BOOST_ASSERT(cmd.view());
+
+               Buffer const & buffer = *cmd.view()->buffer();
+               InsetExternalParams p;
+               InsetExternalMailer::string2params(cmd.argument, buffer, p);
+               setParams(p, buffer);
+               cmd.view()->updateInset(this);
+               return DISPATCHED;
        }
-       if (!cit->second.preamble.empty()) {
-               features.addExternalPreamble(cit->second.preamble + "\n");
+
+       case LFUN_INSET_DIALOG_UPDATE:
+               InsetExternalMailer(*this).updateDialog(cmd.view());
+               return DISPATCHED;
+
+       case LFUN_MOUSE_RELEASE:
+       case LFUN_INSET_EDIT:
+               InsetExternalMailer(*this).showDialog(cmd.view());
+               return DISPATCHED;
+
+       default:
+               return UNDISPATCHED;
        }
 }
 
 
-Inset * InsetExternal::clone(Buffer const &, bool same_id) const
+void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       InsetExternal * inset = new InsetExternal;
-       inset->params_ = params_;
-       inset->view_ = view_;
-       if (same_id)
-               inset->id_ = id_;
-       return inset;
+       renderer_->metrics(mi, dim);
+       dim_ = dim;
 }
 
 
-string const InsetExternal::getScreenLabel(Buffer const *) const
+void InsetExternal::draw(PainterInfo & pi, int x, int y) const
 {
-       ExternalTemplate const & et = params_.templ;
-       if (et.guiName.empty())
-               return _("External");
-       else
-               return doSubstitution(0, et.guiName);
+       cache(pi.base.bv);
+       renderer_->draw(pi, x, y);
 }
 
 
-void InsetExternal::executeCommand(string const & s,
-                                  Buffer const * buffer) const
+namespace {
+
+lyx::graphics::Params get_grfx_params(InsetExternalParams const & eparams)
 {
-       Path p(buffer->filePath());
-       Systemcall one;
-       if (lyxerr.debugging()) {
-               lyxerr << "Executing '" << s << "' in '"
-                      << buffer->filePath() << "'" << endl;
-       }
-       one.startscript(Systemcall::Wait, s);
+       lyx::graphics::Params gparams;
+
+       gparams.filename = eparams.filename.absFilename();
+       gparams.scale = eparams.lyxscale;
+       if (eparams.clipdata.clip)
+               gparams.bb = eparams.clipdata.bbox;
+       gparams.angle = eparams.rotationdata.angle();
+
+       gparams.display = eparams.display;
+       if (gparams.display == lyx::graphics::DefaultDisplay)
+               gparams.display = lyxrc.display_graphics;
+       // Override the above if we're not using a gui
+       if (!lyx_gui::use_gui)
+               gparams.display = lyx::graphics::NoDisplay;
+
+       return gparams;
 }
 
 
-string const InsetExternal::doSubstitution(Buffer const * buffer,
-                                          string const & s) const
+string const getScreenLabel(InsetExternalParams const & params,
+                           Buffer const & buffer)
 {
-       string result;
-       string const basename = ChangeExtension(params_.filename, string());
-       string filepath;
-       if (buffer && !buffer->tmppath.empty() && !buffer->niceFile) {
-               filepath = buffer->filePath();
-       }
-       result = subst(s, "$$FName", params_.filename);
-       result = subst(result, "$$Basename", basename);
-       result = subst(result, "$$Parameters", params_.parameters);
-       result = subst(result, "$$FPath", filepath);
-       result = ReplaceEnvironmentPath(result);
-       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);
+       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);
+}
+
+} // namespace anon
+
+
+InsetExternalParams const & InsetExternal::params() const
+{
+       return params_;
+}
+
+
+void InsetExternal::setParams(InsetExternalParams const & p,
+                             Buffer const & buffer)
+{
+       // The stored params; what we would like to happen in an ideal world.
+       params_ = p;
+
+       // We display the inset as a button by default.
+       bool display_button = (!external::getTemplatePtr(params_) ||
+                              params_.filename.empty() ||
+                              params_.display == lyx::graphics::NoDisplay);
+
+       if (display_button) {
+               RenderButton * button_ptr =
+                       dynamic_cast<RenderButton *>(renderer_.get());
+               if (!button_ptr) {
+                       button_ptr = new RenderButton;
+                       renderer_.reset(button_ptr);
                }
-               result = subst(result,
-                              ("$$Contents(\"" + file + "\")").c_str(),
-                              contents);
-       }
 
-       return result;
+               button_ptr->update(getScreenLabel(params_, buffer), true);
+
+       } else {
+               RenderGraphic * graphic_ptr =
+                       dynamic_cast<RenderGraphic *>(renderer_.get());
+               if (!graphic_ptr) {
+                       graphic_ptr = new RenderGraphic;
+                       graphic_ptr->connect(
+                               boost::bind(&InsetExternal::statusChanged, this));
+                       renderer_.reset(graphic_ptr);
+               }
+
+               graphic_ptr->update(get_grfx_params(params_));
+       }
 }
 
 
-void InsetExternal::updateExternal() const
+void InsetExternal::write(Buffer const & buffer, ostream & os) const
 {
-       updateExternal("LaTeX", view_->buffer());
+       params_.write(buffer, os);
 }
 
-void InsetExternal::updateExternal(string const & format,
-                                  Buffer const * buf) const
+
+void InsetExternal::read(Buffer const & buffer, LyXLex & lex)
 {
-       ExternalTemplate const & et = params_.templ;
-       ExternalTemplate::Formats::const_iterator cit =
-               et.formats.find(format);
+       InsetExternalParams params;
+       if (params.read(buffer, lex))
+               setParams(params, buffer);
+}
 
-       if (cit == et.formats.end() ||
-           cit->second.updateCommand.empty() ||
-           !et.automaticProduction)
-               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;
-               }
+int InsetExternal::latex(Buffer const & buf, ostream & os,
+                        LatexRunParams const & runparams) const
+{
+       // "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 =
+               lyxrc.use_tempdir && !buf.temppath().empty() && !runparams.nice;
+
+       // If the template has specified a PDFLaTeX output, then we try and
+       // use that.
+       if (runparams.flavor == LatexRunParams::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, external_in_tmpdir);
        }
 
-       executeCommand(doSubstitution(buf, cit->second.updateCommand), buf);
+       return external::writeExternal(params_, "LaTeX",
+                                      buf, os, external_in_tmpdir);
 }
 
 
-void InsetExternal::viewExternal() const
+int InsetExternal::ascii(Buffer const & buf, ostream & os, int) const
 {
-       ExternalTemplate const & et = params_.templ;
-       if (et.viewCommand.empty())
-               return;
+       return external::writeExternal(params_, "Ascii", buf, os);
+}
+
 
-       updateExternal();
-       executeCommand(doSubstitution(view_->buffer(),
-                                     et.viewCommand),
-                      view_->buffer());
+int InsetExternal::linuxdoc(Buffer const & buf, ostream & os) const
+{
+       return external::writeExternal(params_, "LinuxDoc", buf, os);
 }
 
 
-void InsetExternal::editExternal() const
+int InsetExternal::docbook(Buffer const & buf, ostream & os, bool) const
 {
-       ExternalTemplate const & et = params_.templ;
-       if (et.editCommand.empty())
+       return external::writeExternal(params_, "DocBook", buf, os);
+}
+
+
+void InsetExternal::validate(LaTeXFeatures & features) const
+{
+       external::Template const * const et_ptr =
+               external::getTemplatePtr(params_);
+       if (!et_ptr)
+               return;
+       external::Template const & et = *et_ptr;
+
+       external::Template::Formats::const_iterator cit =
+               et.formats.find("LaTeX");
+       if (cit == et.formats.end())
                return;
 
-       updateExternal();
-       executeCommand(doSubstitution(view_->buffer(),
-                                     et.editCommand),
-                      view_->buffer());
+       if (!cit->second.requirement.empty())
+               features.require(cit->second.requirement);
+
+       external::TemplateManager & etm = external::TemplateManager::get();
+
+       vector<string>::const_iterator it  = cit->second.preambleNames.begin();
+       vector<string>::const_iterator end = cit->second.preambleNames.end();
+       for (; it != end; ++it) {
+               string const preamble = etm.getPreambleDefByName(*it);
+               if (!preamble.empty())
+                       features.addExternalPreamble(preamble);
+       }
+}
+
+
+string const InsetExternalMailer::name_("external");
+
+InsetExternalMailer::InsetExternalMailer(InsetExternal & inset)
+       : inset_(inset)
+{}
+
+
+string const InsetExternalMailer::inset2string(Buffer const & buffer) const
+{
+       return params2string(inset_.params(), buffer);
 }
 
 
-bool operator==(InsetExternal::Params const & left,
-               InsetExternal::Params const & right)
+void InsetExternalMailer::string2params(string const & in,
+                                       Buffer const & buffer,
+                                       InsetExternalParams & params)
 {
-       return ((left.filename   == right.filename) &&
-               (left.parameters == right.parameters) &&
-               (left.templ.lyxName == right.templ.lyxName));
+       params = InsetExternalParams();
+
+       if (in.empty())
+               return;
+
+       istringstream data(in);
+       LyXLex lex(0,0);
+       lex.setStream(data);
+
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != name_)
+                       return;
+       }
+
+       // 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;
+       }
+
+       if (lex.isOK()) {
+               params.read(buffer, lex);
+       }
 }
 
 
-bool operator!=(InsetExternal::Params const & left,
-               InsetExternal::Params const & right)
+string const
+InsetExternalMailer::params2string(InsetExternalParams const & params,
+                                  Buffer const & buffer)
 {
-       return  !(left == right);
+       ostringstream data;
+       data << name_ << ' ';
+       params.write(buffer, data);
+       data << "\\end_inset\n";
+       return data.str();
 }