-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+/**
+ * \file insetexternal.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * ====================================================== */
+ * \author Asger Alstrup Nielsen
+ *
+ * Full author contact details are available in file CREDITS
+ */
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include FORMS_H_LOCATION
-#include <cstdio>
-
#include "insetexternal.h"
-#include "ExternalTemplate.h"
-#include "lyx_gui_misc.h" // CancelCloseBoxCB
-#include "BufferView.h"
+#include "insets/renderers.h"
+
#include "buffer.h"
-#include "filedlg.h"
-#include "lyx_main.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 "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
+
+#include "support/FileInfo.h"
#include "support/filetools.h"
+#include "support/forkedcall.h"
#include "support/lstrings.h"
+#include "support/lyxalgo.h"
#include "support/path.h"
-#include "support/syscall.h"
+#include "support/path_defines.h"
+#include "support/tostr.h"
+#include "support/LAssert.h"
+#include "support/translator.h"
+
+#include <boost/bind.hpp>
+#include <cstdio>
+#include <utility>
+
+using namespace lyx::support;
+
+using std::ostream;
using std::endl;
+using std::auto_ptr;
-InsetExternal::InsetExternal()
- : form_external(0)
-{
- tempname = TmpFileName();
+namespace lyx {
+namespace graphics {
+/// The translator between the DisplayType and the corresponding lyx string.
+extern Translator<DisplayType, string> displayTranslator;
}
-
-InsetExternal::~InsetExternal() {
- remove(tempname.c_str());
}
+namespace {
-extern "C" void ExternalTemplateCB(FL_OBJECT * ob, long data)
-{
- InsetExternal::templateCB(ob, data);
-}
+lyx::graphics::DisplayType const defaultDisplayType = lyx::graphics::NoDisplay;
+unsigned int defaultLyxScale = 100;
-extern "C" void ExternalBrowseCB(FL_OBJECT * ob, long data)
-{
- InsetExternal::browseCB(ob, data);
-}
+/// Substitute meta-variables in string s, makeing use of params and buffer.
+string const doSubstitution(InsetExternal::Params const & params,
+ Buffer const * buffer, string const & s);
+/// Invoke the external editor.
+void editExternal(InsetExternal::Params const & params, Buffer const * buffer);
-extern "C" void ExternalEditCB(FL_OBJECT * ob, long data)
+} // namespace anon
+
+
+InsetExternal::Params::Params()
+ : display(defaultDisplayType),
+ lyxscale(defaultLyxScale)
{
- InsetExternal::editCB(ob, data);
+ tempname = tempName(string(), "lyxext");
+ unlink(tempname);
+ // must have an extension for the converter code to work correctly.
+ tempname += ".tmp";
}
-extern "C" void ExternalViewCB(FL_OBJECT * ob, long data)
+InsetExternal::Params::~Params()
{
- InsetExternal::viewCB(ob, data);
+ unlink(tempname);
}
-extern "C" void ExternalUpdateCB(FL_OBJECT * ob, long data)
+InsetExternal::InsetExternal()
+ : renderer_(new ButtonRenderer)
+{}
+
+
+InsetExternal::InsetExternal(InsetExternal const & other)
+ : InsetOld(other),
+ boost::signals::trackable(),
+ params_(other.params_),
+ renderer_(other.renderer_->clone())
{
- InsetExternal::updateCB(ob, data);
+ GraphicRenderer * ptr = dynamic_cast<GraphicRenderer *>(renderer_.get());
+ if (ptr) {
+ ptr->connect(boost::bind(&InsetExternal::statusChanged, this));
+ }
}
-extern "C" void ExternalOKCB(FL_OBJECT * ob, long data)
+auto_ptr<InsetBase> InsetExternal::clone() const
{
- InsetExternal::okCB(ob, data);
+ return auto_ptr<InsetBase>(new InsetExternal(*this));
}
-extern "C" void ExternalCancelCB(FL_OBJECT * ob, long data)
+InsetExternal::~InsetExternal()
{
- InsetExternal::cancelCB(ob, data);
+ InsetExternalMailer(*this).hideDialog();
}
-void InsetExternal::templateCB(FL_OBJECT * ob, long)
+void InsetExternal::statusChanged()
{
- Holder * holder = static_cast<Holder*>(ob->form->u_vdata);
- InsetExternal * inset = holder->inset;
- ExternalTemplate et = inset->getTemplate(inset->getCurrentTemplate());
- // Update the help text
- fl_clear_browser(inset->form_external->helptext);
- fl_addto_browser(inset->form_external->helptext, et.helpText.c_str());
- fl_set_browser_topline(inset->form_external->helptext, 0);
+ BufferView * bv = renderer_->view();
+ if (bv)
+ bv->updateInset(this);
}
-void InsetExternal::browseCB(FL_OBJECT * ob, long)
+dispatch_result InsetExternal::localDispatch(FuncRequest const & cmd)
{
- Holder * holder = static_cast<Holder*>(ob->form->u_vdata);
- InsetExternal * inset = holder->inset;
-
- static string current_path;
- static int once = 0;
- LyXFileDlg fileDlg;
-
- string p = inset->filename;
- string buf = MakeAbsPath(holder->view->buffer()->fileName());
- string buf2 = OnlyPath(buf);
- if (!p.empty()) {
- buf = MakeAbsPath(p, buf2);
- buf = OnlyPath(buf);
- } else {
- buf = OnlyPath(holder->view->buffer()->fileName().c_str());
+ switch (cmd.action) {
+
+ case LFUN_EXTERNAL_EDIT: {
+ Assert(cmd.view());
+
+ Buffer const & buffer = *cmd.view()->buffer();
+ InsetExternal::Params p;
+ InsetExternalMailer::string2params(cmd.argument, buffer, p);
+ editExternal(p, &buffer);
+ return DISPATCHED_NOUPDATE;
}
-
- fileDlg.SetButton(0, _("Document"), buf);
-
- /// Determine the template file extension
- ExternalTemplate et = inset->getTemplate(inset->getCurrentTemplate());
- string regexp = et.fileRegExp;
- if (regexp.empty()) {
- regexp = "*";
+
+ case LFUN_INSET_MODIFY: {
+ Assert(cmd.view());
+
+ Buffer const * buffer = cmd.view()->buffer();
+ InsetExternal::Params p;
+ InsetExternalMailer::string2params(cmd.argument, *buffer, p);
+ setParams(p, buffer);
+ cmd.view()->updateInset(this);
+ return DISPATCHED;
}
- bool error = false;
- do {
- // ProhibitInput(current_view);
- if (once) {
- p = fileDlg.Select(_("External inset file"),
- current_path,
- regexp, string());
- } else {
- p = fileDlg.Select(_("External inset file"), buf,
- regexp, string());
- }
- // AllowInput(current_view);
-
- if (p.empty()) return;
-
- buf = MakeRelPath(p, buf2);
- current_path = OnlyPath(p);
- once = 1;
-
- if (contains(p, "#") || contains(p, "~") || contains(p, "$")
- || contains(p, "%")) {
- WriteAlert(_("Filename can't contain any "
- "of these characters:"),
- // xgettext:no-c-format
- _("'#', '~', '$' or '%'."));
- error = true;
- }
- } while (error);
+ 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;
- if (inset->form_external)
- fl_set_input(inset->form_external->filename, buf.c_str());
-
+ default:
+ return UNDISPATCHED;
+ }
}
-void InsetExternal::editCB(FL_OBJECT * ob, long)
+void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
{
- Holder * holder = static_cast<Holder*>(ob->form->u_vdata);
- InsetExternal * inset = holder->inset;
- inset->doApply(holder->view);
- inset->doEdit(holder->view);
+ renderer_->metrics(mi, dim);
+ dim_ = dim;
}
-void InsetExternal::viewCB(FL_OBJECT * ob, long)
+void InsetExternal::draw(PainterInfo & pi, int x, int y) const
{
- Holder * holder = static_cast<Holder*>(ob->form->u_vdata);
- InsetExternal * inset = holder->inset;
- inset->doApply(holder->view);
- inset->doView(holder->view);
+ renderer_->draw(pi, x, y);
}
-void InsetExternal::updateCB(FL_OBJECT * ob, long)
+namespace {
+
+lyx::graphics::Params get_grfx_params(InsetExternal::Params const & eparams)
{
- Holder * holder = static_cast<Holder*>(ob->form->u_vdata);
- InsetExternal * inset = holder->inset;
- inset->doApply(holder->view);
- inset->doUpdate(holder->view);
+ lyx::graphics::Params gparams;
+
+ gparams.filename = eparams.filename.absFilename();
+ gparams.scale = eparams.lyxscale;
+ 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;
}
-void InsetExternal::okCB(FL_OBJECT * ob, long data)
+ExternalTemplate const * getTemplatePtr(InsetExternal::Params const & params)
{
- Holder * holder = static_cast<Holder*>(ob->form->u_vdata);
- InsetExternal * inset = holder->inset;
- inset->doApply(holder->view);
- cancelCB(ob,data);
+ ExternalTemplateManager & etm = ExternalTemplateManager::get();
+ ExternalTemplate const & templ = etm.getTemplateByName(params.templatename);
+ if (templ.lyxName.empty())
+ return 0;
+ return &templ;
}
-void InsetExternal::doApply(BufferView * bufview)
+string const getScreenLabel(InsetExternal::Params const & params,
+ Buffer const * buffer)
{
- bool update = false;
- if (templatename != getCurrentTemplate()) {
- templatename = getCurrentTemplate();
- update = true;
- }
- if (filename != fl_get_input(form_external->filename)) {
- filename = fl_get_input(form_external->filename);
- update = true;
- }
- if (parameters != fl_get_input(form_external->parameters)) {
- parameters = fl_get_input(form_external->parameters);
- update = true;
- }
+ ExternalTemplate const * const ptr = getTemplatePtr(params);
+ if (!ptr)
+ return bformat(_("External template %1$s is not installed"),
+ params.templatename);
+ return doSubstitution(params, buffer, ptr->guiName);
+}
- if (update) {
- // The text might have change, so we should update the button look
- bufview->updateInset(this, true);
- }
+} // namespace anon
+
+
+InsetExternal::Params const & InsetExternal::params() const
+{
+ return params_;
}
-void InsetExternal::cancelCB(FL_OBJECT * ob, long)
+void InsetExternal::setParams(Params const & p, Buffer const * buffer)
{
- Holder * holder = static_cast<Holder*>(ob->form->u_vdata);
+ // The stored params; what we would like to happen in an ideal world.
+ params_.filename = p.filename;
+ params_.templatename = p.templatename;
+ params_.display = p.display;
+ params_.lyxscale = p.lyxscale;
- InsetExternal * inset = holder->inset;
- // BufferView * bv = holder->view;
+ // We display the inset as a button by default.
+ bool display_button = (!getTemplatePtr(params_) ||
+ params_.filename.empty() ||
+ params_.display == lyx::graphics::NoDisplay);
+
+ if (display_button) {
+ ButtonRenderer * button_ptr =
+ dynamic_cast<ButtonRenderer *>(renderer_.get());
+ if (!button_ptr) {
+ button_ptr = new ButtonRenderer;
+ renderer_.reset(button_ptr);
+ }
- if (inset->form_external) {
- fl_hide_form(inset->form_external->form_external);
- fl_free_form(inset->form_external->form_external);
- inset->form_external = 0;
+ button_ptr->update(getScreenLabel(params_, buffer), true);
+
+ } else {
+ GraphicRenderer * graphic_ptr =
+ dynamic_cast<GraphicRenderer *>(renderer_.get());
+ if (!graphic_ptr) {
+ graphic_ptr = new GraphicRenderer;
+ graphic_ptr->connect(
+ boost::bind(&InsetExternal::statusChanged, this));
+ renderer_.reset(graphic_ptr);
+ }
+
+ graphic_ptr->update(get_grfx_params(params_));
}
}
-const char * InsetExternal::EditMessage() const
+void InsetExternal::write(Buffer const * buffer, ostream & os) const
{
- ExternalTemplate const & et = getTemplate(templatename);
- return doSubstitution(0, et.guiName).c_str();
+ os << "External\n"
+ << "\ttemplate " << params_.templatename << '\n';
+
+ if (!params_.filename.empty())
+ os << "\tfilename "
+ << params_.filename.outputFilename(buffer->filePath())
+ << '\n';
+
+ if (params_.display != defaultDisplayType)
+ os << "\tdisplay " << lyx::graphics::displayTranslator.find(params_.display)
+ << '\n';
+
+ if (params_.lyxscale != defaultLyxScale)
+ os << "\tlyxscale " << tostr(params_.lyxscale) << '\n';
}
-void InsetExternal::Edit(BufferView * bv,
- int /*x*/, int /*y*/, unsigned int /*button*/)
+void InsetExternal::read(Buffer const * buffer, LyXLex & lex)
{
- static int ow = -1, oh;
-
- if (bv->buffer()->isReadonly())
- WarnReadonly(bv->buffer()->fileName());
-
- if (!form_external) {
- form_external = create_form_form_external();
- holder.inset = this;
- // form_external->ok->u_vdata = &holder;
- form_external->form_external->u_vdata = &holder;
- fl_set_form_atclose(form_external->form_external,
- CancelCloseBoxCB, 0);
- }
- holder.view = bv;
- fl_addto_choice(form_external->templatechoice, getTemplateString().c_str());
- fl_set_input(form_external->filename, filename.c_str());
- fl_set_input(form_external->parameters, parameters.c_str());
- if (!templatename.empty()) {
- fl_set_choice(form_external->templatechoice, getTemplateNumber(templatename));
- }
- // Update the help text
- templateCB(form_external->templatechoice, 0);
+ enum ExternalTags {
+ EX_TEMPLATE = 1,
+ EX_FILENAME,
+ EX_DISPLAY,
+ EX_LYXSCALE,
+ EX_END
+ };
- ExternalTemplate const & et = getTemplate(templatename);
- if (et.automaticProduction) {
- fl_deactivate_object(form_external->update);
- fl_set_object_lcol(form_external->update, FL_INACTIVE);
- } else {
- fl_activate_object(form_external->update);
- fl_set_object_lcol(form_external->update, FL_BLACK);
- }
+ keyword_item external_tags[] = {
+ { "\\end_inset", EX_END },
+ { "display", EX_DISPLAY},
+ { "filename", EX_FILENAME},
+ { "lyxscale", EX_LYXSCALE},
+ { "template", EX_TEMPLATE }
+ };
- if (form_external->form_external->visible) {
- fl_raise_form(form_external->form_external);
- } else {
- fl_show_form(form_external->form_external,
- FL_PLACE_MOUSE | FL_FREE_SIZE,
- FL_FULLBORDER, _("Insert external inset"));
- if (ow < 0) {
- ow = form_external->form_external->w;
- oh = form_external->form_external->h;
+ pushpophelper pph(lex, external_tags, EX_END);
+
+ bool found_end = false;
+ bool read_error = false;
+
+ InsetExternal::Params params;
+ while (lex.isOK()) {
+ switch (lex.lex()) {
+ case EX_TEMPLATE: {
+ lex.next();
+ params.templatename = lex.getString();
+ break;
+ }
+
+ case EX_FILENAME: {
+ lex.next();
+ string const name = lex.getString();
+ params.filename.set(name, buffer->filePath());
+ break;
}
- fl_set_form_minsize(form_external->form_external, ow, oh);
+
+ case EX_DISPLAY: {
+ lex.next();
+ string const name = lex.getString();
+ params.display = lyx::graphics::displayTranslator.find(name);
+ break;
+ }
+
+ case EX_LYXSCALE: {
+ lex.next();
+ params.lyxscale = lex.getInteger();
+ 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.");
}
-}
+ // Replace the inset's store
+ setParams(params, buffer);
-void InsetExternal::Write(Buffer const *, std::ostream & os) const
-{
- os << "External " << templatename << ",\"" << filename
- << "\",\"" << parameters << "\"\n";
+ lyxerr[Debug::INFO] << "InsetExternal::Read: "
+ << "template: '" << params_.templatename
+ << "' filename: '" << params_.filename.absFilename()
+ << "' display: '" << params_.display
+ << "' scale: '" << params_.lyxscale
+ << '\'' << endl;
}
-void InsetExternal::Read(Buffer const *, LyXLex & lex)
+int InsetExternal::write(string const & format,
+ Buffer const * buf, ostream & os,
+ bool external_in_tmpdir) const
{
- lex.EatLine();
- string format = lex.GetString();
- int pos1 = format.find(",");
- templatename = format.substr(0, pos1);
- int pos2 = format.find("\",\"", pos1);
- filename = format.substr(pos1 + 2, pos2 - (pos1 + 2));
- parameters = format.substr(pos2 + 3, format.length() - (pos2 + 4));
-
- lyxerr << templatename << " " << filename << " " << parameters << endl;
-}
+ ExternalTemplate const * const et_ptr = getTemplatePtr(params_);
+ if (!et_ptr)
+ return 0;
+ ExternalTemplate const & et = *et_ptr;
-int InsetExternal::write(string const & format, Buffer const * buf,
- std::ostream & os) const {
- ExternalTemplate const & et = getTemplate(templatename);
ExternalTemplate::Formats::const_iterator cit =
et.formats.find(format);
- if (et.automaticProduction) {
- executeCommand(doSubstitution(buf, (*cit).second.updateCommand), buf);
+ if (cit == et.formats.end()) {
+ lyxerr << "External template format '" << format
+ << "' not specified in template "
+ << params_.templatename << endl;
+ return 0;
}
-
- os << doSubstitution(buf, (*cit).second.product);
- return 0; // CHECK
-
+
+ updateExternal(format, buf, external_in_tmpdir);
+ string const str = doSubstitution(params_, buf, cit->second.product);
+ os << str;
+ return int(lyx::count(str.begin(), str.end(),'\n') + 1);
}
-int InsetExternal::Latex(Buffer const * buf, std::ostream & os, bool, bool) const
+
+int InsetExternal::latex(Buffer const * buf, ostream & os,
+ LatexRunParams const & runparams) const
{
- return write("LaTeX", buf, os);
+ // "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->tmppath.empty() && !runparams.nice;
+
+ // If the template has specified a PDFLaTeX output, then we try and
+ // use that.
+ if (runparams.flavor == LatexRunParams::PDFLATEX) {
+ ExternalTemplate const * const et_ptr = getTemplatePtr(params_);
+ if (!et_ptr)
+ return 0;
+ ExternalTemplate const & et = *et_ptr;
+
+ ExternalTemplate::Formats::const_iterator cit =
+ et.formats.find("PDFLaTeX");
+ if (cit != et.formats.end())
+ return write("PDFLaTeX", buf, os, external_in_tmpdir);
+ }
+
+ return write("LaTeX", buf, os, external_in_tmpdir);
}
-int InsetExternal::Ascii(Buffer const * buf, std::ostream & os) const
+int InsetExternal::ascii(Buffer const * buf, ostream & os, int) const
{
return write("Ascii", buf, os);
}
-int InsetExternal::Linuxdoc(Buffer const * buf, std::ostream & os) const
+int InsetExternal::linuxdoc(Buffer const * buf, ostream & os) const
{
return write("LinuxDoc", buf, os);
}
-int InsetExternal::DocBook(Buffer const * buf, std::ostream & os) const
+int InsetExternal::docbook(Buffer const * buf, ostream & os, bool) const
{
return write("DocBook", buf, os);
}
-void InsetExternal::Validate(LaTeXFeatures & features) const
+void InsetExternal::validate(LaTeXFeatures & features) const
{
- ExternalTemplate const & et = getTemplate(templatename);
+ ExternalTemplate const * const et_ptr = getTemplatePtr(params_);
+ if (!et_ptr)
+ return;
+ ExternalTemplate const & et = *et_ptr;
+
ExternalTemplate::Formats::const_iterator cit =
et.formats.find("LaTeX");
- if (!(*cit).second.requirement.empty()) {
- features.require((*cit).second.requirement);
+
+ if (cit == et.formats.end())
+ return;
+
+ if (!cit->second.requirement.empty()) {
+ features.require(cit->second.requirement);
}
- if (!(*cit).second.preamble.empty()) {
- features.externalPreambles += (*cit).second.preamble + "\n";
+ if (!cit->second.preamble.empty()) {
+ features.addExternalPreamble(cit->second.preamble + "\n");
}
}
-Inset * InsetExternal::Clone() const
+void InsetExternal::updateExternal(string const & format,
+ Buffer const * buf,
+ bool external_in_tmpdir) const
{
- InsetExternal * inset = new InsetExternal();
- inset->templatename = templatename;
- inset->filename = filename;
- inset->parameters = parameters;
- return inset;
-}
-
+ ExternalTemplate const * const et_ptr = getTemplatePtr(params_);
+ if (!et_ptr)
+ return;
+ ExternalTemplate const & et = *et_ptr;
-string InsetExternal::getScreenLabel() const
-{
- if (templatename.empty()) {
- return _("External");
- } else {
- ExternalTemplate const & et = getTemplate(templatename);
- return doSubstitution(0, et.guiName);
- }
-}
+ if (!et.automaticProduction)
+ return;
-
-void InsetExternal::doUpdate(BufferView const * bv) const
-{
- ExternalTemplate const & et = getTemplate(getCurrentTemplate());
ExternalTemplate::Formats::const_iterator cit =
- et.formats.find("LaTeX");
- executeCommand(doSubstitution(bv->buffer(), (*cit).second.updateCommand), bv->buffer());
-}
+ et.formats.find(format);
+ if (cit == et.formats.end())
+ return;
+ ExternalTemplate::FormatTemplate const & outputFormat = cit->second;
+ if (outputFormat.updateResult.empty())
+ return;
-void InsetExternal::doView(BufferView const * bv) const
-{
- automaticUpdate(bv);
- ExternalTemplate const & et = getTemplate(getCurrentTemplate());
- executeCommand(doSubstitution(bv->buffer(), et.viewCommand), bv->buffer());
-}
+ string from_format = et.inputFormat;
+ if (from_format.empty())
+ return;
+ string from_file = params_.filename.absFilename();
-void InsetExternal::doEdit(BufferView const * bv) const
-{
- automaticUpdate(bv);
- ExternalTemplate const & et = getTemplate(getCurrentTemplate());
- executeCommand(doSubstitution(bv->buffer(),et.editCommand), bv->buffer());
-}
+ 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;
+ }
-void InsetExternal::executeCommand(string const & s, Buffer const * buffer) const
-{
- string buf = MakeAbsPath(buffer->fileName());
- string path = OnlyPath(buf);
- Path p(path);
- Systemcalls one;
- if (lyxerr.debugging()) {
- lyxerr << "Executing '" << s << "' in '" << path << "'" << endl;
+ 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;
}
- one.startscript(Systemcalls::Wait, s);
-}
+ 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;
+ }
-void InsetExternal::automaticUpdate(BufferView const * bv) const
-{
- ExternalTemplate const & et = getTemplate(templatename);
- if (et.automaticProduction) {
- doUpdate(bv);
+ string const to_file = doSubstitution(params_, 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);
}
}
-string InsetExternal::doSubstitution(Buffer const * buffer, string const & s) const
+namespace {
+
+/// Substitute meta-variables in this string
+string const doSubstitution(InsetExternal::Params const & params,
+ Buffer const * buffer, string const & s)
{
string result;
- string basename = ChangeExtension(filename, string());
+ string const buffer_path = buffer ? buffer->filePath() : string();
+ string const filename = params.filename.outputFilename(buffer_path);
+ string const basename = ChangeExtension(filename, string());
+ string const filepath = OnlyPath(filename);
+
result = subst(s, "$$FName", filename);
result = subst(result, "$$Basename", basename);
- result = subst(result, "$$Parameters", parameters);
- result = ReplaceEnvironmentPath(result);
- result = subst(result, "$$Tempname", tempname);
- result = subst(result, "$$Sysdir", system_lyxdir);
-
+ result = subst(result, "$$FPath", filepath);
+ result = subst(result, "$$Tempname", params.tempname);
+ result = subst(result, "$$Sysdir", system_lyxdir());
+
// Handle the $$Contents(filename) syntax
if (contains(result, "$$Contents(\"")) {
- int pos = result.find("$$Contents(\"");
- int end = result.find("\")", pos);
- string file = result.substr(pos + 12, end - (pos + 12));
+ 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
- string buf = MakeAbsPath(buffer->fileName());
- string path = OnlyPath(buf);
- Path p(path);
- contents = GetFileContents(file);
+ 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);
+ result = subst(result,
+ ("$$Contents(\"" + file + "\")").c_str(),
+ contents);
}
return result;
}
-string InsetExternal::getCurrentTemplate() const
+void editExternal(InsetExternal::Params const & params, Buffer const * buffer)
{
- return getTemplateName(fl_get_choice(form_external->templatechoice));
-}
+ if (!buffer)
+ return;
+ ExternalTemplate const * const et_ptr = getTemplatePtr(params);
+ if (!et_ptr)
+ return;
+ ExternalTemplate const & et = *et_ptr;
-ExternalTemplate InsetExternal::getTemplate(string const & name) const
-{
- ExternalTemplateManager::Templates::const_iterator i =
- ExternalTemplateManager::get().getTemplates().find(name);
- // Make sure that the template exists in the map
- if (i == ExternalTemplateManager::get().getTemplates().end()) {
- lyxerr << "Unknown external material template!" << endl;
- return ExternalTemplate();
+ if (et.editCommand.empty())
+ return;
+
+ string const command = doSubstitution(params, buffer, et.editCommand);
+
+ Path p(buffer->filePath());
+ Forkedcall call;
+ if (lyxerr.debugging()) {
+ lyxerr << "Executing '" << command << "' in '"
+ << buffer->filePath() << '\'' << endl;
}
- return (*i).second;
+ call.startscript(Forkedcall::DontWait, command);
}
+} // namespace anon
+
+string const InsetExternalMailer::name_("external");
+
+InsetExternalMailer::InsetExternalMailer(InsetExternal & inset)
+ : inset_(inset)
+{}
-int InsetExternal::getTemplateNumber(string const & name) const
+
+string const InsetExternalMailer::inset2string(Buffer const & buffer) const
{
- int i = 1;
- ExternalTemplateManager::Templates::const_iterator i1, i2;
- i1 = ExternalTemplateManager::get().getTemplates().begin();
- i2 = ExternalTemplateManager::get().getTemplates().end();
- for (; i1 != i2; ++i1) {
- if ((*i1).second.lyxName == name)
- return i;
- ++i;
- }
- // This should never happen
- Assert(false);
- return 0;
+ return params2string(inset_.params(), buffer);
}
-string InsetExternal::getTemplateName(int i) const
+void InsetExternalMailer::string2params(string const & in,
+ Buffer const & buffer,
+ InsetExternal::Params & params)
{
- ExternalTemplateManager::Templates::const_iterator i1;
- i1 = ExternalTemplateManager::get().getTemplates().begin();
- for (int n = 1; n < i; ++n) {
- ++i1;
+ params = InsetExternal::Params();
+
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(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()) {
+ InsetExternal inset;
+ inset.read(&buffer, lex);
+ params = inset.params();
}
- return (*i1).second.lyxName;
}
-string InsetExternal::getTemplateString() const
+string const
+InsetExternalMailer::params2string(InsetExternal::Params const & params,
+ Buffer const & buffer)
{
- string result;
- bool first = true;
- ExternalTemplateManager::Templates::const_iterator i1, i2;
- i1 = ExternalTemplateManager::get().getTemplates().begin();
- i2 = ExternalTemplateManager::get().getTemplates().end();
- for (; i1 != i2; ++i1) {
- if (!first) {
- result += "|";
- } else {
- first = false;
- }
- result += (*i1).second.lyxName;
- }
- return result;
+ InsetExternal inset;
+ inset.setParams(params, &buffer);
+ ostringstream data;
+ data << name_ << ' ';
+ inset.write(&buffer, data);
+ data << "\\end_inset\n";
+ return STRCONV(data.str());
}