#include "insets/inseturl.h"
#include "insets/insetvspace.h"
#include "insets/insetwrap.h"
+
#include "mathed/formulamacro.h"
-#include "mathed/formula.h"
+#include "mathed/math_hullinset.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
+
#include "support/lstrings.h"
#include "support/std_sstream.h"
using std::string;
-InsetOld * createInset(FuncRequest const & cmd)
+InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
{
- BufferView * bv = cmd.view();
BufferParams const & params = bv->buffer()->params();
switch (cmd.action) {
// Try and generate a valid index entry.
InsetCommandParams icp("index");
string const contents = cmd.argument.empty() ?
- bv->getLyXText()->getStringToIndex() :
+ bv->getLyXText()->getStringToIndex(bv->cursor()) :
cmd.argument;
icp.setContents(contents);
if (icp.getContents().empty()) {
lv->getDialogs().show("index", data, 0);
} else {
- lv->dispatch(FuncRequest(bv, LFUN_INSET_APPLY, data));
+ lv->dispatch(FuncRequest(LFUN_INSET_APPLY, data));
}
return 0;
}
bv->owner()->getDialogs().show("tabularcreate");
return 0;
- case LFUN_INSET_CAPTION:
- if (!bv->innerInset()) {
- auto_ptr<InsetCaption> inset(new InsetCaption(params));
- inset->setOwner(bv->innerInset());
- inset->setAutoBreakRows(true);
- inset->setDrawFrame(InsetText::LOCKED);
- inset->setFrameColor(LColor::captionframe);
- return inset.release();
+ case LFUN_INSET_CAPTION: {
+ UpdatableInset * up = bv->cursor().inset().asUpdatableInset();
+ if (!up) {
+ auto_ptr<InsetCaption> inset(new InsetCaption(params));
+ inset->setAutoBreakRows(true);
+ inset->setDrawFrame(InsetText::LOCKED);
+ inset->setFrameColor(LColor::captionframe);
+ return inset.release();
+ }
+ return 0;
}
- return 0;
case LFUN_INDEX_PRINT:
return new InsetPrintIndex(InsetCommandParams("printindex"));
return new InsetERT(params, st);
} else if (name == "external") {
- Buffer const & buffer = *cmd.view()->buffer();
+ Buffer const & buffer = *bv->buffer();
InsetExternalParams iep;
InsetExternalMailer::string2params(cmd.argument,
buffer, iep);
return inset.release();
} else if (name == "graphics") {
- Buffer const & buffer = *cmd.view()->buffer();
+ Buffer const & buffer = *bv->buffer();
InsetGraphicsParams igp;
InsetGraphicsMailer::string2params(cmd.argument,
buffer, igp);
}
-InsetOld * readInset(LyXLex & lex, Buffer const & buf)
+InsetBase * readInset(LyXLex & lex, Buffer const & buf)
{
// consistency check
if (lex.getString() != "\\begin_inset") {
<< endl;
}
- auto_ptr<InsetOld> inset;
+ auto_ptr<InsetBase> inset;
LyXTextClass tclass = buf.params().getLyXTextClass();
} else if (tmptok == "FormulaMacro") {
inset.reset(new InsetFormulaMacro);
} else if (tmptok == "Formula") {
- inset.reset(new InsetFormula);
+ inset.reset(new MathHullInset);
} else if (tmptok == "Graphics") {
inset.reset(new InsetGraphics);
} else if (tmptok == "Note") {