#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;
cur.clearSelection(); // bug 393
cur.finishUndo();
InsetText * insetText = dynamic_cast<InsetText *>(inset);
- if (insetText && (!insetText->allowMultiPar() || cur.lastpit() == 0)) {
- // reset first par to default
- cur.text()->paragraphs().begin()
- ->setPlainOrDefaultLayout(bparams.documentClass());
- cur.pos() = 0;
- cur.pit() = 0;
- // Merge multiple paragraphs -- hack
- while (cur.lastpit() > 0)
- mergeParagraph(bparams, cur.text()->paragraphs(), 0);
- cur.leaveInset(*inset);
+ if (insetText) {
+ insetText->fixParagraphsFont();
+ if (!insetText->allowMultiPar() || cur.lastpit() == 0) {
+ // reset first par to default
+ cur.text()->paragraphs().begin()
+ ->setPlainOrDefaultLayout(bparams.documentClass());
+ cur.pos() = 0;
+ cur.pit() = 0;
+ // Merge multiple paragraphs -- hack
+ while (cur.lastpit() > 0)
+ mergeParagraph(bparams, cur.text()->paragraphs(), 0);
+ cur.leaveInset(*inset);
+ }
} else {
cur.leaveInset(*inset);
// reset surrounding par to default
: dc.defaultLayoutName();
text->setLayout(cur, layoutname);
}
-
return true;
}
// 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) {
// FIXME (Abdel 01/02/2006):
// What follows would be a partial fix for bug 2154:
- // http://bugzilla.lyx.org/show_bug.cgi?id=2154
+ // http://www.lyx.org/trac/ticket/2154
// This automatically put the label inset _after_ a
// numbered section. It should be possible to extend the mechanism
// to any kind of LateX environement.
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();
}
break;
// Single-click on work area
- case LFUN_MOUSE_PRESS:
+ case LFUN_MOUSE_PRESS: {
// We are not marking a selection with the keyboard in any case.
- cur.bv().cursor().setMark(false);
+ Cursor & bvcur = cur.bv().cursor();
+ bvcur.setMark(false);
switch (cmd.button()) {
case mouse_button::button1:
// Set the cursor
if (!bv->mouseSetCursor(cur, cmd.argument() == "region-select"))
cur.updateFlags(Update::SinglePar | Update::FitCursor);
+ if (bvcur.wordSelection())
+ selectWord(bvcur, WHOLE_WORD);
break;
case mouse_button::button2:
break;
case mouse_button::button3: {
- Cursor const & bvcur = cur.bv().cursor();
// Don't do anything if we right-click a
// selection, a context menu will popup.
if (bvcur.selection() && cur >= bvcur.selectionBegin()
break;
} // switch (cmd.button())
break;
-
+ }
case LFUN_MOUSE_MOTION: {
// Mouse motion with right or middle mouse do nothing for now.
if (cmd.button() != mouse_button::button1) {
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();
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())
projects / lyx.git / blobdiff