#ifdef ENABLE_ASSERTIONS
const int old_pos = cur.pos();
#endif
- cur.insert(new InsetMathHull(hullSimple));
+ cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
#ifdef ENABLE_ASSERTIONS
LASSERT(old_pos == cur.pos(), /**/);
#endif
&& sel.find(from_ascii("\\newlyxcommand")) == string::npos
&& sel.find(from_ascii("\\def")) == string::npos)
{
- InsetMathHull * formula = new InsetMathHull;
+ InsetMathHull * formula = new InsetMathHull(cur.buffer());
string const selstr = to_utf8(sel);
istringstream is(selstr);
Lexer lex;
} else
cur.insert(formula);
} else {
- cur.insert(new MathMacroTemplate(sel));
+ cur.insert(new MathMacroTemplate(cur.buffer(), sel));
}
}
if (valid)
// It may happen that sel is empty but there is a selection
replaceSelection(cur);
- cur.insert(new InsetMathHull(hullRegexp));
+ cur.insert(new InsetMathHull(cur.buffer(), hullRegexp));
cur.nextInset()->edit(cur, true);
cur.niceInsert(sel);
{
Buffer & buffer = cur.bv().buffer();
BufferParams const & bparams = buffer.params();
- Inset * inset = createInset(buffer, cmd);
+ Inset * inset = createInset(&buffer, cmd);
if (!inset)
return false;
// before inserting into the document. See bug #5626.
bool loaded = bv->buffer().isFullyLoaded();
bv->buffer().setFullyLoaded(false);
- Inset * inset = createInset(bv->buffer(), cmd);
+ Inset * inset = createInset(&bv->buffer(), cmd);
bv->buffer().setFullyLoaded(loaded);
if (inset) {
}
case LFUN_INSET_DISSOLVE: {
- // first, try if there's an inset at cursor
- // FIXME: this first part should be moved to
- // a LFUN_NEXT_INSET_DISSOLVE, or be called via
- // some generic "next-inset inset-dissolve"
- Inset * inset = cur.nextInset();
- if (inset && inset->isActive()) {
- Cursor tmpcur = cur;
- tmpcur.pushBackward(*inset);
- inset->dispatch(tmpcur, cmd);
- if (tmpcur.result().dispatched()) {
- cur.dispatched();
- break;
- }
- }
- // if it did not work, try the underlying inset
- if (dissolveInset(cur)) {
+ if (dissolveInset(cur))
needsUpdate = true;
- break;
- }
- // if it did not work, do nothing.
break;
}
else
c = par.getChar(pos - 1);
string arg = to_utf8(cmd.argument());
- cur.insert(new InsetQuotes(bv->buffer(), c, (arg == "single")
+ cur.insert(new InsetQuotes(cur.buffer(), c, (arg == "single")
? InsetQuotes::SingleQuotes : InsetQuotes::DoubleQuotes));
cur.posForward();
}
docstring ds = cur.selectionAsString(false);
cutSelection(cur, true, false);
FuncRequest cmd0(cmd, ds);
- inset = createInset(cur.bv().buffer(), cmd0);
+ inset = createInset(cur.buffer(), cmd0);
} else {
- inset = createInset(cur.bv().buffer(), cmd);
+ inset = createInset(cur.buffer(), cmd);
}
if (!inset)
break;
MacroType type = MacroTypeNewcommand;
if (s2 == "def")
type = MacroTypeDef;
- MathMacroTemplate * inset = new MathMacroTemplate(from_utf8(token(s, ' ', 0)), nargs, false, type);
+ MathMacroTemplate * inset = new MathMacroTemplate(cur.buffer(),
+ from_utf8(token(s, ' ', 0)), nargs, false, type);
inset->setBuffer(bv->buffer());
insertInset(cur, inset);
case LFUN_MATH_BIGDELIM: {
cur.recordUndo();
cap::replaceSelection(cur);
- cur.insert(new InsetMathHull(hullSimple));
+ cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
checkAndActivateInset(cur, true);
LASSERT(cur.inMathed(), /**/);
cur.dispatch(cmd);
setParagraphs(cur, p);
// FIXME This should be simplified when InsetFloatList takes a
// Buffer in its constructor.
- InsetFloatList * ifl = new InsetFloatList(to_utf8(cmd.argument()));
+ InsetFloatList * ifl = new InsetFloatList(cur.buffer(), to_utf8(cmd.argument()));
ifl->setBuffer(bv->buffer());
insertInset(cur, ifl);
cur.posForward();
enable = cur.pit() < cur.lastpit() && !cur.selection();
break;
- case LFUN_INSET_DISSOLVE:
- if (!cmd.argument().empty()) {
- InsetLayout const & il = cur.inset().getLayout();
- InsetLayout::InsetLyXType const type =
- translateLyXType(to_utf8(cmd.argument()));
- enable = cur.inset().lyxCode() == FLEX_CODE
- && il.lyxtype() == type;
- } else {
- enable = ((!isMainText()
- && cur.inset().nargs() == 1)
- || (cur.nextInset()
- && cur.nextInset()->nargs() == 1));
- }
- break;
-
case LFUN_CHANGE_ACCEPT:
case LFUN_CHANGE_REJECT:
// In principle, these LFUNs should only be enabled if there
case LFUN_LANGUAGE:
enable = !cur.inset().getLayout().isPassThru();
+ break;
case LFUN_BREAK_PARAGRAPH:
enable = cur.inset().getLayout().isMultiPar();
+ break;
case LFUN_WORD_DELETE_FORWARD:
case LFUN_WORD_DELETE_BACKWARD:
case LFUN_ACCENT_UMLAUT:
case LFUN_ACCENT_UNDERBAR:
case LFUN_ACCENT_UNDERDOT:
- case LFUN_APPENDIX:
- case LFUN_DEPTH_DECREMENT:
- case LFUN_DEPTH_INCREMENT:
- case LFUN_FILE_INSERT:
case LFUN_FONT_BOLD:
case LFUN_FONT_BOLDSYMBOL:
case LFUN_FONT_TYPEWRITER:
case LFUN_FONT_STRIKEOUT:
case LFUN_FONT_UULINE:
case LFUN_FONT_UWAVE:
- case LFUN_LABEL_GOTO:
- case LFUN_LAYOUT_TABULAR:
- case LFUN_NOACTION:
- case LFUN_NOTE_NEXT:
- case LFUN_REFERENCE_NEXT:
- case LFUN_SERVER_SET_XY:
case LFUN_TEXTSTYLE_APPLY:
case LFUN_TEXTSTYLE_UPDATE:
if (cur.inset().getLayout().isPassThru())