*
* \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/renderers.h"
+
#include "buffer.h"
+#include "BufferView.h"
+#include "converter.h"
+#include "debug.h"
+#include "ExternalTemplate.h"
#include "funcrequest.h"
-#include "lyx_main.h"
-#include "LaTeXFeatures.h"
#include "gettext.h"
-#include "debug.h"
+#include "LaTeXFeatures.h"
#include "lyxlex.h"
+#include "lyxrc.h"
+#include "support/std_sstream.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+#include "frontends/lyx_gui.h"
#include "support/filetools.h"
+#include "support/forkedcall.h"
#include "support/lstrings.h"
+#include "support/lyxalgo.h"
+#include "support/lyxlib.h"
#include "support/path.h"
-#include "support/systemcall.h"
-#include "support/FileInfo.h"
+#include "support/path_defines.h"
+#include "support/tostr.h"
+#include "support/translator.h"
-#include <cstdio>
-#include <utility>
+#include <boost/bind.hpp>
+namespace support = lyx::support;
-using std::ostream;
using std::endl;
+using std::auto_ptr;
+using std::ostream;
+
+
+namespace lyx {
+namespace graphics {
+/// The translator between the DisplayType and the corresponding lyx string.
+extern Translator<DisplayType, string> displayTranslator;
+}
+}
+
+namespace {
+
+lyx::graphics::DisplayType const defaultDisplayType = lyx::graphics::NoDisplay;
+
+unsigned int defaultLyxScale = 100;
+
+/// 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);
+
+} // namespace anon
+
+
+InsetExternal::Params::Params()
+ : display(defaultDisplayType),
+ lyxscale(defaultLyxScale)
+{
+ tempname = support::tempName(string(), "lyxext");
+ support::unlink(tempname);
+ // must have an extension for the converter code to work correctly.
+ tempname += ".tmp";
+}
+
+
+InsetExternal::Params::~Params()
+{
+ support::unlink(tempname);
+}
InsetExternal::InsetExternal()
- : view_(0)
+ : renderer_(new ButtonRenderer)
+{}
+
+
+InsetExternal::InsetExternal(InsetExternal const & other)
+ : InsetOld(other),
+ boost::signals::trackable(),
+ params_(other.params_),
+ renderer_(other.renderer_->clone())
+{
+ GraphicRenderer * ptr = dynamic_cast<GraphicRenderer *>(renderer_.get());
+ if (ptr) {
+ ptr->connect(boost::bind(&InsetExternal::statusChanged, this));
+ }
+}
+
+
+auto_ptr<InsetBase> InsetExternal::clone() const
{
- tempname_ = lyx::tempName(string(), "lyxext");
- //ExternalTemplateManager::Templates::const_iterator i1;
- params_.templ = ExternalTemplateManager::get().getTemplates().begin()->second;
+ return auto_ptr<InsetBase>(new InsetExternal(*this));
}
InsetExternal::~InsetExternal()
{
- lyx::unlink(tempname_);
- InsetExternalMailer mailer(*this);
- mailer.hideDialog();
+ InsetExternalMailer(*this).hideDialog();
}
-InsetExternal::Params const & InsetExternal::params() const
+void InsetExternal::statusChanged()
{
- return params_;
+ BufferView * bv = renderer_->view();
+ if (bv)
+ bv->updateInset(this);
}
dispatch_result InsetExternal::localDispatch(FuncRequest const & cmd)
{
- dispatch_result result = UNDISPATCHED;
-
switch (cmd.action) {
- case LFUN_INSET_MODIFY: {
- InsetExternal::Params p;
- InsetExternalMailer::string2params(cmd.argument, p);
- if (p.filename.empty())
- break;
- setFromParams(p);
- cmd.view()->updateInset(this, true);
- result = DISPATCHED;
+ case LFUN_EXTERNAL_EDIT: {
+ support::Assert(cmd.view());
+
+ Buffer const & buffer = *cmd.view()->buffer();
+ InsetExternal::Params p;
+ InsetExternalMailer::string2params(cmd.argument, buffer, p);
+ editExternal(p, buffer);
+ return DISPATCHED_NOUPDATE;
}
- break;
- case LFUN_INSET_DIALOG_UPDATE: {
- InsetExternalMailer mailer(*this);
- mailer.updateDialog(cmd.view());
+ case LFUN_INSET_MODIFY: {
+ support::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;
}
- break;
+
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetExternalMailer(*this).updateDialog(cmd.view());
+ return DISPATCHED;
case LFUN_MOUSE_RELEASE:
- edit(cmd.view(), cmd.x, cmd.y, cmd.button());
- break;
+ case LFUN_INSET_EDIT:
+ InsetExternalMailer(*this).showDialog(cmd.view());
+ return DISPATCHED;
default:
- break;
+ return UNDISPATCHED;
}
+}
- return result;
+
+void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+ renderer_->metrics(mi, dim);
+ dim_ = dim;
}
-void InsetExternal::setFromParams(Params const & p)
+void InsetExternal::draw(PainterInfo & pi, int x, int y) const
{
- params_.filename = p.filename;
- params_.parameters = p.parameters;
- params_.templ = p.templ;
+ renderer_->draw(pi, x, y);
}
-string const InsetExternal::editMessage() const
+namespace {
+
+lyx::graphics::Params get_grfx_params(InsetExternal::Params const & eparams)
{
- return doSubstitution(0, params_.templ.guiName);
+ 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::edit(BufferView * bv, int, int, mouse_button::state)
+ExternalTemplate const * getTemplatePtr(InsetExternal::Params const & params)
{
- InsetExternalMailer mailer(*this);
- mailer.showDialog(bv);
+ ExternalTemplateManager & etm = ExternalTemplateManager::get();
+ ExternalTemplate const & templ = etm.getTemplateByName(params.templatename);
+ if (templ.lyxName.empty())
+ return 0;
+ return &templ;
}
-void InsetExternal::edit(BufferView * bv, bool)
+string const getScreenLabel(InsetExternal::Params const & params,
+ Buffer const & buffer)
{
- edit(bv, 0, 0, mouse_button::none);
+ ExternalTemplate const * const ptr = getTemplatePtr(params);
+ if (!ptr)
+ return support::bformat(_("External template %1$s is not installed"),
+ params.templatename);
+ return doSubstitution(params, buffer, ptr->guiName);
}
+} // namespace anon
-void InsetExternal::write(Buffer const *, ostream & os) const
+
+InsetExternal::Params const & InsetExternal::params() const
{
- os << "External " << params_.templ.lyxName << ",\""
- << params_.filename << "\",\"" << params_.parameters << "\"\n";
+ return params_;
}
-void InsetExternal::read(Buffer const *, LyXLex & lex)
+void InsetExternal::setParams(Params const & p, Buffer const & buffer)
{
- string format;
- string token;
+ // 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;
+
+ // 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);
+ }
+
+ button_ptr->update(getScreenLabel(params_, buffer), true);
- // Read inset data from lex and store in format
- if (lex.eatLine()) {
- format = lex.getString();
} else {
- lex.printError("InsetExternal: Parse error: `$$Token'");
+ 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_));
}
+}
+
+
+void InsetExternal::write(Buffer const & buffer, ostream & os) const
+{
+ 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::read(Buffer const & buffer, LyXLex & lex)
+{
+ enum ExternalTags {
+ EX_TEMPLATE = 1,
+ EX_FILENAME,
+ EX_DISPLAY,
+ EX_LYXSCALE,
+ EX_END
+ };
+
+ keyword_item external_tags[] = {
+ { "\\end_inset", EX_END },
+ { "display", EX_DISPLAY},
+ { "filename", EX_FILENAME},
+ { "lyxscale", EX_LYXSCALE},
+ { "template", EX_TEMPLATE }
+ };
+
+ pushpophelper pph(lex, external_tags, EX_END);
+
+ bool found_end = false;
+ bool read_error = false;
+
+ InsetExternal::Params params;
while (lex.isOK()) {
- lex.nextToken();
- token = lex.getString();
- if (token == "\\end_inset")
+ 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;
+ }
+
+ 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 (token != "\\end_inset") {
- lex.printError("Missing \\end_inset at this point. "
- "Read: `$$Token'");
+
+ if (!found_end) {
+ lex.printError("ExternalInset::read: "
+ "Missing \\end_inset.");
}
- // 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));
+ // Replace the inset's store
+ setParams(params, buffer);
- lyxerr[Debug::INFO] << "InsetExternal::Read: " << params_.templ.lyxName
- << ' ' << params_.filename
- << ' ' << params_.parameters << endl;
+ lyxerr[Debug::EXTERNAL]
+ << "InsetExternal::Read: "
+ << "template: '" << params_.templatename
+ << "' filename: '" << params_.filename.absFilename()
+ << "' display: '" << params_.display
+ << "' scale: '" << params_.lyxscale
+ << '\'' << endl;
}
int InsetExternal::write(string const & format,
- Buffer const * buf, ostream & os) const
+ Buffer const & buf, ostream & os,
+ bool external_in_tmpdir) const
{
- ExternalTemplate const & et = params_.templ;
+ 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(format);
if (cit == et.formats.end()) {
- lyxerr << "External template format '" << format
- << "' not specified in template "
- << params_.templ.lyxName << endl;
+ lyxerr[Debug::EXTERNAL]
+ << "External template format '" << format
+ << "' not specified in template "
+ << params_.templatename << endl;
return 0;
}
- updateExternal(format, buf);
- os << doSubstitution(buf, cit->second.product);
- return 0; // CHECK (FIXME check what ? - jbl)
+ 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,
- 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, ostream & os, int) const
+int InsetExternal::ascii(Buffer const & buf, ostream & os, int) const
{
return write("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);
}
-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);
}
void InsetExternal::validate(LaTeXFeatures & features) const
{
- ExternalTemplate const & et = params_.templ;
- ExternalTemplate::Formats::const_iterator cit =
- et.formats.find("LaTeX");
+ 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 == et.formats.end())
return;
- if (!cit->second.requirement.empty()) {
+ if (!cit->second.requirement.empty())
features.require(cit->second.requirement);
- }
- if (!cit->second.preamble.empty()) {
- features.addExternalPreamble(cit->second.preamble + "\n");
- }
+
+ ExternalTemplateManager & etm = ExternalTemplateManager::get();
+ string const preamble = etm.getPreambleDefByName(cit->second.preambleName);
+ if (!preamble.empty())
+ features.addExternalPreamble(preamble);
}
-Inset * InsetExternal::clone(Buffer const &, bool same_id) const
+void InsetExternal::updateExternal(string const & format,
+ Buffer const & buf,
+ bool external_in_tmpdir) const
{
- InsetExternal * inset = new InsetExternal;
- inset->params_ = params_;
- inset->view_ = view_;
- if (same_id)
- inset->id_ = id_;
- return inset;
-}
+ ExternalTemplate const * const et_ptr = getTemplatePtr(params_);
+ if (!et_ptr)
+ return;
+ ExternalTemplate const & et = *et_ptr;
+ if (!et.automaticProduction)
+ return;
-string const InsetExternal::getScreenLabel(Buffer const *) const
-{
- ExternalTemplate const & et = params_.templ;
- if (et.guiName.empty())
- return _("External");
- else
- return doSubstitution(0, et.guiName);
-}
+ ExternalTemplate::Formats::const_iterator cit =
+ et.formats.find(format);
+ if (cit == et.formats.end())
+ return;
+ ExternalTemplate::FormatTemplate const & outputFormat = cit->second;
+ if (outputFormat.updateResult.empty())
+ return;
-void InsetExternal::executeCommand(string const & s,
- Buffer const * buffer) const
-{
- Path p(buffer->filePath());
- Systemcall one;
- if (lyxerr.debugging()) {
- lyxerr << "Executing '" << s << "' in '"
- << buffer->filePath() << '\'' << endl;
+ string from_format = et.inputFormat;
+ if (from_format.empty())
+ return;
+
+ string from_file = params_.filename.absFilename();
+
+ if (from_format == "*") {
+ if (from_file.empty())
+ return;
+
+ // Try and ascertain the file format from its contents.
+ from_format = support::getExtFromContents(from_file);
+ if (from_format.empty())
+ return;
}
- one.startscript(Systemcall::Wait, s);
+
+ string const to_format = outputFormat.updateFormat;
+ if (to_format.empty())
+ return;
+
+ if (!converters.isReachable(from_format, to_format)) {
+ lyxerr[Debug::EXTERNAL]
+ << "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
+ string const temp_file =
+ support::MakeAbsPath(params_.filename.mangledFilename(),
+ buf.tmppath);
+ unsigned long const from_checksum = support::sum(from_file);
+ unsigned long const temp_checksum = support::sum(temp_file);
+
+ // Nothing to do...
+ if (from_checksum == temp_checksum)
+ return;
+
+ // Cannot proceed...
+ if (!support::copy(from_file, temp_file))
+ return;
+ from_file = temp_file;
+ }
+
+ string const to_file = doSubstitution(params_, buf,
+ outputFormat.updateResult);
+ string const abs_to_file = support::MakeAbsPath(to_file, buf.filePath());
+
+ // Do we need to perform the conversion?
+ // Yes if to_file does not exist or if from_file is newer than to_file
+ if (support::compare_timestamps(from_file, abs_to_file) < 0)
+ return;
+
+ string const to_filebase = support::ChangeExtension(to_file, string());
+ converters.convert(&buf, from_file, to_filebase, from_format, to_format);
}
-string const 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 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 = subst(result, "$$Tempname", tempname_);
- result = subst(result, "$$Sysdir", system_lyxdir);
+ string const buffer_path = buffer.filePath();
+ string const filename = params.filename.outputFilename(buffer_path);
+ string const basename = support::ChangeExtension(filename, string());
+ string const filepath = support::OnlyPath(filename);
+
+ result = support::subst(s, "$$FName", filename);
+ result = support::subst(result, "$$Basename", basename);
+ result = support::subst(result, "$$FPath", filepath);
+ result = support::subst(result, "$$Tempname", params.tempname);
+ result = support::subst(result, "$$Sysdir", support::system_lyxdir());
// Handle the $$Contents(filename) syntax
- if (contains(result, "$$Contents(\"")) {
+ if (support::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);
- }
- return result;
-}
+ string const filepath = support::IsFileReadable(file) ?
+ buffer.filePath() : buffer.tmppath;
+ support::Path p(filepath);
+ if (support::IsFileReadable(file))
+ contents = support::GetFileContents(file);
-void InsetExternal::updateExternal() const
-{
- updateExternal("LaTeX", view_->buffer());
-}
-
-void InsetExternal::updateExternal(string const & format,
- Buffer const * buf) const
-{
- ExternalTemplate const & et = params_.templ;
- ExternalTemplate::Formats::const_iterator cit =
- et.formats.find(format);
-
- 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;
- }
+ result = support::subst(result,
+ ("$$Contents(\"" + file + "\")").c_str(),
+ contents);
}
- executeCommand(doSubstitution(buf, cit->second.updateCommand), buf);
+ return result;
}
-void InsetExternal::viewExternal() const
+void editExternal(InsetExternal::Params const & params, Buffer const & buffer)
{
- ExternalTemplate const & et = params_.templ;
- if (et.viewCommand.empty())
+ ExternalTemplate const * const et_ptr = getTemplatePtr(params);
+ if (!et_ptr)
return;
+ ExternalTemplate const & et = *et_ptr;
- updateExternal();
- executeCommand(doSubstitution(view_->buffer(),
- et.viewCommand),
- view_->buffer());
-}
-
-
-void InsetExternal::editExternal() const
-{
- ExternalTemplate const & et = params_.templ;
if (et.editCommand.empty())
return;
- updateExternal();
- executeCommand(doSubstitution(view_->buffer(),
- et.editCommand),
- view_->buffer());
+ string const command = doSubstitution(params, buffer, et.editCommand);
+
+ support::Path p(buffer.filePath());
+ support::Forkedcall call;
+ if (lyxerr.debugging(Debug::EXTERNAL)) {
+ lyxerr << "Executing '" << command << "' in '"
+ << buffer.filePath() << '\'' << endl;
+ }
+ call.startscript(support::Forkedcall::DontWait, command);
}
+} // namespace anon
string const InsetExternalMailer::name_("external");
{}
-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,
+ Buffer const & buffer,
InsetExternal::Params & params)
{
params = InsetExternal::Params();
- istringstream data(in);
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(in));
LyXLex lex(0,0);
lex.setStream(data);
}
if (lex.isOK()) {
- InsetExternal inset;
- inset.read(0, lex);
+ InsetExternal inset;
+ inset.read(buffer, lex);
params = inset.params();
}
}
string const
-InsetExternalMailer::params2string(InsetExternal::Params const & params)
+InsetExternalMailer::params2string(InsetExternal::Params const & params,
+ Buffer const & buffer)
{
InsetExternal inset;
- inset.setFromParams(params);
+ inset.setParams(params, buffer);
ostringstream data;
data << name_ << ' ';
- inset.write(0, data);
+ inset.write(buffer, data);
data << "\\end_inset\n";
-
- return data.str();
+ return STRCONV(data.str());
}