#include "insets/RenderPreview.h"
#include "Buffer.h"
-#include "LCursor.h"
+#include "Cursor.h"
#include "debug.h"
#include "DispatchResult.h"
#include "Exporter.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "LyX.h"
-#include "LyXLex.h"
+#include "Lexer.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "OutputParams.h"
}
-bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
+bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
{
enum ExternalTags {
EX_TEMPLATE = 1,
{ "width", EX_WIDTH }
};
- pushpophelper pph(lex, external_tags, EX_END);
+ PushPopHelper pph(lex, external_tags, EX_END);
bool found_end = false;
bool read_error = false;
case EX_HEIGHT:
lex.next();
- resizedata.height = LyXLength(lex.getString());
+ resizedata.height = Length(lex.getString());
break;
case EX_KEEPASPECTRATIO:
case EX_WIDTH:
lex.next();
- resizedata.width = LyXLength(lex.getString());
+ resizedata.width = Length(lex.getString());
break;
case EX_END:
InsetExternal::InsetExternal(InsetExternal const & other)
- : InsetOld(other),
+ : Inset(other),
boost::signals::trackable(),
params_(other.params_),
renderer_(other.renderer_->clone(this))
{}
-auto_ptr<InsetBase> InsetExternal::doClone() const
+auto_ptr<Inset> InsetExternal::doClone() const
{
- return auto_ptr<InsetBase>(new InsetExternal(*this));
+ return auto_ptr<Inset>(new InsetExternal(*this));
}
}
-void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
break;
case LFUN_MOUSE_RELEASE:
- InsetExternalMailer(*this).showDialog(&cur.bv());
+ if (!cur.selection())
+ InsetExternalMailer(*this).showDialog(&cur.bv());
break;
default:
- InsetBase::doDispatch(cur, cmd);
+ Inset::doDispatch(cur, cmd);
}
}
-bool InsetExternal::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
switch (cmd.action) {
return true;
default:
- return InsetBase::getStatus(cur, cmd, flag);
+ return Inset::getStatus(cur, cmd, flag);
}
}
-void InsetExternal::edit(LCursor & cur, bool)
+void InsetExternal::edit(Cursor & cur, bool)
{
InsetExternalMailer(*this).showDialog(&cur.bv());
}
}
-void InsetExternal::read(Buffer const & buffer, LyXLex & lex)
+void InsetExternal::read(Buffer const & buffer, Lexer & lex)
{
InsetExternalParams params;
if (params.read(buffer, lex))
int InsetExternal::latex(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
if (params_.draft) {
// FIXME UNICODE
if (cit != et.formats.end()) {
return external::writeExternal(params_, "PDFLaTeX",
- buf, os,
- *(runparams.exportdata),
- external_in_tmpdir,
- dryrun);
- }
+ buf, os,
+ *(runparams.exportdata),
+ external_in_tmpdir,
+ dryrun);
+ }
}
return external::writeExternal(params_, "LaTeX", buf, os,
- *(runparams.exportdata),
- external_in_tmpdir,
- dryrun);
+ *(runparams.exportdata),
+ external_in_tmpdir,
+ dryrun);
}
int InsetExternal::plaintext(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
os << '\n'; // output external material on a new line
external::writeExternal(params_, "Ascii", buf, os,
- *(runparams.exportdata), false,
- runparams.dryrun || runparams.inComment);
+ *(runparams.exportdata), false,
+ runparams.dryrun || runparams.inComment);
return PLAINTEXT_NEWLINE;
}
int InsetExternal::docbook(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
return external::writeExternal(params_, "DocBook", buf, os,
*(runparams.exportdata), false,
- runparams.dryrun || runparams.inComment);
+ runparams.dryrun || runparams.inComment);
}
return;
istringstream data(in);
- LyXLex lex(0,0);
+ Lexer lex(0,0);
lex.setStream(data);
string name;
return print_mailer_error("InsetExternalMailer", in, 1, name_);
// This is part of the inset proper that is usually swallowed
- // by LyXText::readInset
+ // by Text::readInset
string id;
lex >> id;
if (!lex || id != "External")