*
* \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 "insets/graphicinset.h"
+#include "insets/ExternalSupport.h"
+#include "insets/ExternalTemplate.h"
+#include "insets/render_button.h"
+#include "insets/render_graphic.h"
#include "buffer.h"
#include "BufferView.h"
-#include "converter.h"
#include "debug.h"
-#include "ExternalTemplate.h"
#include "funcrequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "latexrunparams.h"
-#include "lyx_main.h"
#include "lyxlex.h"
#include "lyxrc.h"
-#include "Lsstream.h"
+#include "metricsinfo.h"
#include "frontends/lyx_gui.h"
#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "support/filetools.h"
#include "support/lstrings.h"
-#include "support/lyxalgo.h"
-#include "support/path.h"
-#include "support/forkedcall.h"
-#include "support/FileInfo.h"
+#include "support/lyxlib.h"
+#include "support/tostr.h"
+#include "support/translator.h"
#include <boost/bind.hpp>
-#include <cstdio>
-#include <utility>
+#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()
- : graphic_(new GraphicInset)
+namespace lyx {
+namespace graphics {
+
+/// The translator between the DisplayType and the corresponding lyx string.
+extern Translator<DisplayType, string> displayTranslator;
+
+} // namespace graphics
+} // namespace lyx
+
+
+namespace {
+
+lyx::graphics::DisplayType const defaultDisplayType = lyx::graphics::NoDisplay;
+
+unsigned int defaultLyxScale = 100;
+
+} // namespace anon
+
+
+namespace lyx {
+namespace external {
+
+TempName::TempName()
+{
+ tempname_ = support::tempName(string(), "lyxext");
+ support::unlink(tempname_);
+ // must have an extension for the converter code to work correctly.
+ tempname_ += ".tmp";
+}
+
+
+TempName::TempName(TempName const &)
+{
+ tempname_ = TempName()();
+}
+
+
+TempName::~TempName()
+{
+ support::unlink(tempname_);
+}
+
+
+TempName &
+TempName::operator=(TempName const & other)
+{
+ if (this != &other)
+ tempname_ = TempName()();
+ return *this;
+}
+
+} // namespace external
+} // namespace lyx
+
+
+InsetExternalParams::InsetExternalParams()
+ : display(defaultDisplayType),
+ lyxscale(defaultLyxScale)
+{}
+
+
+namespace {
+
+template <typename T>
+void clearIfNotFound(T & data, external::TransformID value,
+ vector<external::TransformID> const & ids)
+{
+ 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 InsetExternalParams::settemplate(string const & name)
+{
+ 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 InsetExternalParams::write(Buffer const & buffer, ostream & os) const
+{
+ 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";
+ }
+
+ 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)
{
- graphic_->connect(boost::bind(&InsetExternal::statusChanged, this));
- params_.templ = ExternalTemplateManager::get().getTemplates().begin()->second;
+ 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()) {
+ 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 (!found_end)
+ lex.printError("ExternalInset::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);
+ }
+
+ return !read_error;
}
+InsetExternal::InsetExternal()
+ : renderer_(new RenderButton)
+{}
+
+
InsetExternal::InsetExternal(InsetExternal const & other)
- : Inset(other),
+ : InsetOld(other),
boost::signals::trackable(),
params_(other.params_),
- graphic_(new GraphicInset(*other.graphic_))
+ renderer_(other.renderer_->clone())
{
- graphic_->connect(boost::bind(&InsetExternal::statusChanged, this));
+ RenderGraphic * ptr =
+ dynamic_cast<RenderGraphic *>(renderer_.get());
+ if (ptr)
+ ptr->connect(boost::bind(&InsetExternal::statusChanged, this));
}
-Inset * InsetExternal::clone() const
+auto_ptr<InsetBase> InsetExternal::clone() const
{
- InsetExternal * inset = new InsetExternal(*this);
- return inset;
+ return auto_ptr<InsetBase>(new InsetExternal(*this));
}
InsetExternal::~InsetExternal()
{
- if (!tempname_.empty())
- lyx::unlink(tempname_);
- InsetExternalMailer mailer(*this);
- mailer.hideDialog();
+ InsetExternalMailer(*this).hideDialog();
}
-void InsetExternal::statusChanged()
+void InsetExternal::cache(BufferView * view) const
{
- BufferView * bv = graphic_->view();
- if (bv)
- bv->updateInset(this);
+ BOOST_ASSERT(view);
+ view_ = view->owner()->view();
}
-
-InsetExternal::Params const & InsetExternal::params() const
+BufferView * InsetExternal::view() const
{
- return params_;
+ return view_.lock().get();
+}
+
+
+void InsetExternal::statusChanged() const
+{
+ BufferView * const bv = view();
+ if (bv)
+ bv->updateInset(this);
}
{
switch (cmd.action) {
+ case LFUN_EXTERNAL_EDIT: {
+ BOOST_ASSERT(cmd.view());
+
+ 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: {
- InsetExternal::Params p;
- InsetExternalMailer::string2params(cmd.argument, p);
- setParams(p, cmd.view()->buffer()->filePath());
+ 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;
}
}
-void InsetExternal::cache(BufferView * bv) const
-{
- graphic_->view(bv);
-}
-
-
void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
{
- graphic_->metrics(mi, dim);
+ renderer_->metrics(mi, dim);
+ dim_ = dim;
}
void InsetExternal::draw(PainterInfo & pi, int x, int y) const
{
- graphic_->draw(pi, x, y);
+ cache(pi.base.bv);
+ renderer_->draw(pi, x, y);
}
namespace {
-grfx::Params get_grfx_params(InsetExternal::Params const & eparams,
- string const & filepath)
+lyx::graphics::Params get_grfx_params(InsetExternalParams const & eparams)
{
- grfx::Params gparams;
-
- if (!eparams.filename.empty()) {
- lyx::Assert(AbsolutePath(filepath));
- gparams.filename = MakeAbsPath(eparams.filename, filepath);
- }
+ lyx::graphics::Params gparams;
+ gparams.filename = eparams.filename.absFilename();
gparams.scale = eparams.lyxscale;
- gparams.display = eparams.display;
+ if (eparams.clipdata.clip)
+ gparams.bb = eparams.clipdata.bbox;
+ gparams.angle = eparams.rotationdata.angle();
- if (gparams.display == grfx::DefaultDisplay)
+ 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 = grfx::NoDisplay;
+ gparams.display = lyx::graphics::NoDisplay;
return gparams;
}
-} // namespace anon
-
-void InsetExternal::setParams(Params const & p, string const & filepath)
+string const getScreenLabel(InsetExternalParams const & params,
+ Buffer const & buffer)
{
- params_.filename = p.filename;
- params_.parameters = p.parameters;
- params_.templ = p.templ;
- params_.display = p.display;
- params_.lyxscale = p.lyxscale;
-
- // Update the display using the new parameters.
- if (params_.filename.empty() || !filepath.empty())
- graphic_->update(get_grfx_params(params_, filepath));
- string const msg = doSubstitution(0, params_.templ.guiName);
- graphic_->setNoDisplayMessage(msg);
+ 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);
}
-
-string const InsetExternal::editMessage() const
-{
- return doSubstitution(0, params_.templ.guiName);
-}
+} // namespace anon
-void InsetExternal::write(Buffer const *, ostream & os) const
+InsetExternalParams const & InsetExternal::params() const
{
- os << "External " << params_.templ.lyxName << ",\""
- << params_.filename << "\",\""
- << params_.parameters << "\","
- << params_.display << ','
- << params_.lyxscale << '\n';
+ return params_;
}
-void InsetExternal::read(Buffer const * buffer, LyXLex & lex)
+void InsetExternal::setParams(InsetExternalParams const & p,
+ Buffer const & buffer)
{
- string format;
- string token;
-
- // Read inset data from lex and store in format
- if (lex.eatLine()) {
- format = lex.getString();
- } else {
- lex.printError("InsetExternal: Parse error: `$$Token'");
- }
+ // 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);
+ }
- while (lex.isOK()) {
- lex.nextToken();
- token = lex.getString();
- if (token == "\\end_inset")
- break;
- }
- if (token != "\\end_inset") {
- lex.printError("Missing \\end_inset at this point. "
- "Read: `$$Token'");
- }
+ button_ptr->update(getScreenLabel(params_, buffer), true);
- // Parse string format...
- string::size_type const pos1 = format.find(',');
- params_.templ = ExternalTemplateManager::get().getTemplateByName(format.substr(0, pos1));
- string::size_type const file_start = pos1 + 2;
- string::size_type const pos2 = format.find("\",\"", file_start);
- string::size_type const file_size = pos2 - file_start;
- params_.filename = format.substr(file_start, file_size);
-
- string::size_type const params_start = pos2 + 3;
- string::size_type const pos3 = format.find("\"", params_start);
- string::size_type const params_size = pos3 == pos3 - params_start;
- params_.parameters = format.substr(params_start, params_size);
-
- params_.display = grfx::NoDisplay;
- params_.lyxscale = 100;
-
- string::size_type const display_start = pos3 + 2;
- if (display_start < format.size()) {
- string::size_type const pos4 = format.find(',', display_start);
- string::size_type const display_size = pos4 - display_start;
- string const display = format.substr(display_start, display_size);
- if (isStrUnsignedInt(display)) {
- unsigned int const tmp = strToUnsignedInt(display);
- params_.display = static_cast<grfx::DisplayType>(tmp);
+ } 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);
}
- string::size_type const scale_start = pos4 + 1;
- string::size_type const scale_size = format.size() - scale_start;
- string const scale = format.substr(scale_start, scale_size);
- if (isStrUnsignedInt(scale)) {
- params_.lyxscale = strToUnsignedInt(scale);
- }
+ graphic_ptr->update(get_grfx_params(params_));
}
-
- lyxerr[Debug::INFO] << "InsetExternal::Read: "
- << "template: '" << params_.templ.lyxName
- << "' filename: '" << params_.filename
- << "' params: '" << params_.parameters
- << "' display: '" << params_.display
- << "' scale: '" << params_.lyxscale
- << '\'' << endl;
-
- // Update the display using the new parameters.
- if (buffer)
- graphic_->update(get_grfx_params(params_, buffer->filePath()));
- string const msg = doSubstitution(0, params_.templ.guiName);
- graphic_->setNoDisplayMessage(msg);
}
-int InsetExternal::write(string const & format,
- Buffer const * buf, ostream & os,
- bool external_in_tmpdir) const
+void InsetExternal::write(Buffer const & buffer, 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;
- }
+ params_.write(buffer, os);
+}
+
- updateExternal(format, buf, external_in_tmpdir);
- string const str = doSubstitution(buf, cit->second.product);
- os << str;
- return int(lyx::count(str.begin(), str.end(),'\n') + 1);
+void InsetExternal::read(Buffer const & buffer, LyXLex & lex)
+{
+ InsetExternalParams params;
+ if (params.read(buffer, lex))
+ setParams(params, buffer);
}
-int InsetExternal::latex(Buffer const * buf, ostream & os,
+int InsetExternal::latex(Buffer const & buf, ostream & os,
LatexRunParams const & runparams) const
{
// "nice" means that the buffer is exported to LaTeX format but not
// 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->tmppath.empty() && !runparams.nice;
+ 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) {
- ExternalTemplate const & et = params_.templ;
- ExternalTemplate::Formats::const_iterator cit =
+ 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 write("PDFLaTeX", buf, os, external_in_tmpdir);
+ return external::writeExternal(params_, "PDFLaTeX",
+ buf, os, external_in_tmpdir);
}
- return write("LaTeX", buf, os, external_in_tmpdir);
+ return external::writeExternal(params_, "LaTeX",
+ buf, os, external_in_tmpdir);
}
-int InsetExternal::ascii(Buffer const * buf, ostream & os, int) const
+int InsetExternal::ascii(Buffer const & buf, ostream & os, int) const
{
- return write("Ascii", buf, os);
+ return external::writeExternal(params_, "Ascii", buf, os);
}
-int InsetExternal::linuxdoc(Buffer const * buf, ostream & os) const
+int InsetExternal::linuxdoc(Buffer const & buf, ostream & os) const
{
- return write("LinuxDoc", buf, os);
+ return external::writeExternal(params_, "LinuxDoc", buf, os);
}
-int InsetExternal::docbook(Buffer const * buf, ostream & os, bool) const
+int InsetExternal::docbook(Buffer const & buf, ostream & os, bool) const
{
- return write("DocBook", buf, os);
+ return external::writeExternal(params_, "DocBook", buf, os);
}
void InsetExternal::validate(LaTeXFeatures & features) const
{
- ExternalTemplate const & et = params_.templ;
- ExternalTemplate::Formats::const_iterator cit =
- et.formats.find("LaTeX");
-
- if (cit == et.formats.end())
+ external::Template const * const et_ptr =
+ external::getTemplatePtr(params_);
+ if (!et_ptr)
return;
+ external::Template const & et = *et_ptr;
- if (!cit->second.requirement.empty()) {
- features.require(cit->second.requirement);
- }
- if (!cit->second.preamble.empty()) {
- features.addExternalPreamble(cit->second.preamble + "\n");
- }
-}
-
-
-string const InsetExternal::getScreenLabel(Buffer const *) const
-{
- ExternalTemplate const & et = params_.templ;
- if (et.guiName.empty())
- return _("External");
- else
- return doSubstitution(0, et.guiName);
-}
-
-
-string const InsetExternal::doSubstitution(Buffer const * buffer,
- string const & s) const
-{
- string result;
- string const basename = ChangeExtension(params_.filename, string());
- string filepath;
- bool external_in_tmpdir = false;
- if (buffer && !buffer->tmppath.empty() && !buffer->niceFile) {
- filepath = buffer->filePath();
- if (lyxrc.use_tempdir)
- external_in_tmpdir = true;
- }
- if (tempname_.empty()) {
- string const path = external_in_tmpdir ? buffer->tmppath : string();
- tempname_ = lyx::tempName(path, "lyxext");
- lyx::unlink(tempname_);
- // must have an extension for the converter code to work correctly.
- tempname_ += ".tmp";
- }
- 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) {
- Path p(buffer->filePath());
- if (!IsFileReadable(file))
- Path p(buffer->tmppath);
- if (IsFileReadable(file))
- contents = GetFileContents(file);
- } else {
- contents = GetFileContents(file);
- }
- result = subst(result,
- ("$$Contents(\"" + file + "\")").c_str(),
- contents);
- }
-
- return result;
-}
-
-
-void InsetExternal::updateExternal() const
-{
- BufferView const * bv = graphic_->view();
- Buffer const * buffer = bv ? bv->buffer() : 0;
- updateExternal("LaTeX", buffer, false);
-}
-
-
-void InsetExternal::updateExternal(string const & format,
- Buffer const * buf,
- bool external_in_tmpdir) const
-{
- ExternalTemplate const & et = params_.templ;
- if (!et.automaticProduction)
- return;
-
- ExternalTemplate::Formats::const_iterator cit =
- et.formats.find(format);
+ external::Template::Formats::const_iterator cit =
+ et.formats.find("LaTeX");
if (cit == et.formats.end())
return;
- ExternalTemplate::FormatTemplate const & outputFormat = cit->second;
- if (outputFormat.updateResult.empty())
- return;
-
- string from_format = et.inputFormat;
- if (from_format.empty())
- return;
-
- string from_file = params_.filename.empty() ?
- string() : MakeAbsPath(params_.filename, buf->filePath());
-
- if (from_format == "*") {
- if (from_file.empty())
- return;
-
- // Try and ascertain the file format from its contents.
- from_format = getExtFromContents(from_file);
- if (from_format.empty())
- return;
- }
-
- string const to_format = outputFormat.updateFormat;
- if (to_format.empty())
- return;
-
- if (!converters.isReachable(from_format, to_format)) {
- lyxerr << "InsetExternal::updateExternal. "
- "Unable to convert from "
- << from_format << " to " << to_format << endl;
- return;
- }
-
- if (external_in_tmpdir && !from_file.empty()) {
- // We are running stuff through LaTeX
- from_file = copyFileToDir(buf->tmppath, from_file);
- if (from_file.empty())
- return;
- }
-
- string const to_file = doSubstitution(buf, outputFormat.updateResult);
-
- FileInfo fi(from_file);
- string abs_to_file = to_file;
- if (!AbsolutePath(to_file))
- abs_to_file = MakeAbsPath(to_file, OnlyPath(from_file));
- FileInfo fi2(abs_to_file);
- if (fi2.exist() && fi.exist() &&
- difftime(fi2.getModificationTime(),
- fi.getModificationTime()) >= 0) {
- } else {
- string const to_filebase = ChangeExtension(to_file, string());
- converters.convert(buf, from_file, to_filebase,
- from_format, to_format);
- }
-}
-
-
-void InsetExternal::editExternal() const
-{
- ExternalTemplate const & et = params_.templ;
- if (et.editCommand.empty())
- return;
-
- BufferView const * bv = graphic_->view();
- Buffer const * buffer = bv ? bv->buffer() : 0;
- if (!buffer)
- return;
+ if (!cit->second.requirement.empty())
+ features.require(cit->second.requirement);
- string const command = doSubstitution(buffer, et.editCommand);
+ external::TemplateManager & etm = external::TemplateManager::get();
- Path p(buffer->filePath());
- Forkedcall call;
- if (lyxerr.debugging()) {
- lyxerr << "Executing '" << command << "' in '"
- << buffer->filePath() << '\'' << endl;
+ 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);
}
- call.startscript(Forkedcall::DontWait, command);
}
{}
-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()) {
- 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.setParams(params, string());
ostringstream data;
data << name_ << ' ';
- inset.write(0, data);
+ params.write(buffer, data);
data << "\\end_inset\n";
- return STRCONV(data.str());
+ return data.str();
}