#include "insets/RenderPreview.h"
#include "Buffer.h"
+#include "BufferView.h"
#include "Cursor.h"
#include "DispatchResult.h"
#include "Exporter.h"
#include "OutputParams.h"
#include "frontends/alert.h"
+#include "frontends/Application.h"
#include "graphics/PreviewLoader.h"
os << "External\n"
<< "\ttemplate " << templatename() << '\n';
- if (!filename.empty()) {
+ if (!filename.empty())
os << "\tfilename " << filename.outputFilename(buf.filePath()) << '\n';
- os << "\tembed " << (filename.embedded() ? filename.inzipName() : "\"\"") << '\n';
- }
+
if (display != defaultDisplayType)
os << "\tdisplay "
<< external::displayTranslator().find(display)
bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
{
- enum ExternalTags {
+ enum {
EX_TEMPLATE = 1,
EX_FILENAME,
- EX_EMBED,
EX_DISPLAY,
EX_LYXSCALE,
EX_DRAFT,
EX_END
};
- keyword_item external_tags[] = {
+ LexerKeyword external_tags[] = {
{ "\\end_inset", EX_END },
{ "boundingBox", EX_BOUNDINGBOX },
{ "clip", EX_CLIP },
{ "display", EX_DISPLAY},
{ "draft", EX_DRAFT},
- { "embed", EX_EMBED},
{ "extra", EX_EXTRA },
{ "filename", EX_FILENAME},
{ "height", EX_HEIGHT },
{ "width", EX_WIDTH }
};
- PushPopHelper pph(lex, external_tags, EX_END);
+ PushPopHelper pph(lex, external_tags);
bool found_end = false;
bool read_error = false;
break;
}
- case EX_EMBED: {
- lex.next();
- string const name = lex.getString();
- filename.setInzipName(name);
- filename.setEmbed(!name.empty());
- break;
- }
-
case EX_DISPLAY: {
lex.next();
string const name = lex.getString();
}
-InsetExternal::InsetExternal()
+InsetExternal::InsetExternal(Buffer & buf)
: renderer_(new RenderButton)
-{}
+{
+ Inset::setBuffer(buf);
+}
InsetExternal::InsetExternal(InsetExternal const & other)
InsetExternal::~InsetExternal()
{
- InsetExternalMailer(*this).hideDialog();
-}
-
-
-void InsetExternal::setBuffer(Buffer & buffer)
-{
- if (buffer_) {
- try {
- // a file may not be copied successfully when, e.g. buffer_
- // has already been closed.
- params_.filename = params_.filename.copyTo(&buffer);
- } catch (ExceptionMessage const & message) {
- Alert::error(message.title_, message.details_);
- // failed to embed
- params_.filename.setEmbed(false);
- }
- }
- Inset::setBuffer(buffer);
+ hideDialogs("external", this);
}
case LFUN_EXTERNAL_EDIT: {
InsetExternalParams p = params();
if (!cmd.argument().empty())
- InsetExternalMailer::string2params(to_utf8(cmd.argument()), buffer(), p);
+ string2params(to_utf8(cmd.argument()), buffer(), p);
external::editExternal(p, buffer());
break;
}
case LFUN_INSET_MODIFY: {
InsetExternalParams p;
- InsetExternalMailer::string2params(to_utf8(cmd.argument()), buffer(), p);
+ string2params(to_utf8(cmd.argument()), buffer(), p);
setParams(p);
break;
}
case LFUN_INSET_DIALOG_UPDATE:
- InsetExternalMailer(*this).updateDialog(&cur.bv());
+ cur.bv().updateDialog("external",
+ params2string(params(), cur.bv().buffer()));
break;
case LFUN_MOUSE_RELEASE:
- if (!cur.selection())
- InsetExternalMailer(*this).showDialog(&cur.bv());
+ if (!cur.selection() && cmd.button() == mouse_button::button1)
+ cur.bv().showDialog("external",
+ params2string(params(), cur.bv().buffer()),
+ this);
break;
default:
}
-void InsetExternal::registerEmbeddedFiles(EmbeddedFileList & files) const
-{
- files.registerFile(params_.filename, this, buffer());
-}
-
-
-void InsetExternal::updateEmbeddedFile(EmbeddedFile const & file)
-{
- params_.filename = file;
-}
-
-
void InsetExternal::edit(Cursor & cur, bool, EntryDirection)
{
- InsetExternalMailer(*this).showDialog(&cur.bv());
+ cur.bv().showDialog("external",
+ params2string(params(), cur.bv().buffer()),
+ this);
}
{
graphics::Params gparams;
- gparams.filename = eparams.filename.availableFile();
- gparams.icon = eparams.filename.embedded() ? "pin.png" : "";
+ gparams.filename = eparams.filename;
gparams.scale = eparams.lyxscale;
if (eparams.clipdata.clip)
gparams.bb = eparams.clipdata.bbox;
gparams.display = graphics::NoDisplay;
break;
default:
- BOOST_ASSERT(false);
+ LASSERT(false, /**/);
}
if (gparams.display == graphics::DefaultDisplay)
gparams.display = graphics::DisplayType(lyxrc.display_graphics);
return;
RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview();
- BOOST_ASSERT(ptr);
+ LASSERT(ptr, /**/);
ptr->removePreview(*buffer);
add_preview_and_start_loading(*ptr, *this, *buffer);
void InsetExternal::read(Lexer & lex)
{
InsetExternalParams params;
- if (params.read(buffer(), lex)) {
- // exception handling is not needed as long as embedded files are in place.
- params.filename.enable(buffer().embedded(), &buffer(), false);
+ if (params.read(buffer(), lex))
setParams(params);
- }
}
}
external::Template::Formats::const_iterator cit =
et.formats.find(format);
- if (cit == et.formats.end())
- return;
+
+ if (cit == et.formats.end()) {
+ // If the template has not specified a PDFLaTeX output,
+ // we try the LaTeX format.
+ if (format == "PDFLaTeX") {
+ cit = et.formats.find("LaTeX");
+ if (cit == et.formats.end())
+ return;
+ } else
+ return;
+ }
// FIXME: We don't need that always
features.require("lyxdot");
}
-//
-// preview stuff
-//
-
void InsetExternal::addPreview(graphics::PreviewLoader & ploader) const
{
RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview();
}
-/// Mailer stuff
-
-string const InsetExternalMailer::name_("external");
-
-InsetExternalMailer::InsetExternalMailer(InsetExternal & inset)
- : inset_(inset)
-{}
-
-
-string const InsetExternalMailer::inset2string(Buffer const & buffer) const
-{
- return params2string(inset_.params(), buffer);
-}
-
-
-void InsetExternalMailer::string2params(string const & in,
- Buffer const & buffer,
- InsetExternalParams & params)
+void InsetExternal::string2params(string const & in, Buffer const & buffer,
+ InsetExternalParams & params)
{
params = InsetExternalParams();
if (in.empty())
return;
istringstream data(in);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(data);
string name;
lex >> name;
- if (!lex || name != name_)
- return print_mailer_error("InsetExternalMailer", in, 1, name_);
+ if (!lex || name != "external") {
+ LYXERR0("InsetExternal::string2params(" << in << ")\n"
+ "Expected arg 1 to be \"external\"\n");
+ return;
+ }
// This is part of the inset proper that is usually swallowed
// by Text::readInset
string id;
lex >> id;
- if (!lex || id != "External")
- return print_mailer_error("InsetBoxMailer", in, 2, "External");
+ if (!lex || id != "External") {
+ LYXERR0("InsetExternal::string2params(" << in << ")\n"
+ "Expected arg 2 to be \"External\"\n");
+ return;
+ }
params.read(buffer, lex);
}
-string const
-InsetExternalMailer::params2string(InsetExternalParams const & params,
- Buffer const & buffer)
+string InsetExternal::params2string(InsetExternalParams const & params,
+ Buffer const & buffer)
{
ostringstream data;
- data << name_ << ' ';
+ data << "external" << ' ';
params.write(buffer, data);
data << "\\end_inset\n";
return data.str();
projects / features.git / blobdiff