anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r30398, r30396, r30395, r30393, r30392, and r29387.

Browse Source 
Soon to be replaced with a proper fix.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30409 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-07-08 01:41:06 +00:00
parent a165cec754
commit 98fb455d3f
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mathed/InsetMathNest.cpp
View File

@ -1571,17 +1571,6 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c)
selClearOrDel(cur);
MathMacro const * macro = cur.inset().asInsetMath()->asMacro();
if (macro && macro->displayMode() == MathMacro::DISPLAY_UNFOLDED) {
// resume macro_mode
docstring const & s = macro->name();
cur.leaveInset(*macro);
cur.plainErase();
docstring safe = grabAndEraseSelection(cur);
cur.insert(MathAtom(new InsetMathUnknown("\\" + s + c, safe, false)));
return true;
}
if (c == '\n') {
if (currentMode() <= InsetMath::TEXT_MODE)
cur.insert(c);
@ -1862,10 +1851,6 @@ bool InsetMathNest::cursorMathForward(Cursor & cur)
if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
cur.pushBackward(*cur.nextAtom().nucleus());
cur.inset().idxFirst(cur);
MathMacro const * macro = cur.inset().asInsetMath()->asMacro();
if (macro && macro->displayMode() == MathMacro::DISPLAY_UNFOLDED)
// editing macros is only possible at lastpos
cur.pos() = cur.lastpos();
return true;
}
if (cur.posForward() || idxForward(cur))
@ -1887,17 +1872,11 @@ bool InsetMathNest::cursorMathBackward(Cursor & cur)
cur.inset().idxLast(cur);
return true;
}
MathMacro const * macro = cur.inset().asInsetMath()->asMacro();
int s = cur.depth() - 2;
if (macro && macro->displayMode() == MathMacro::DISPLAY_UNFOLDED
&& s >= 0 && cur[s].inset().asInsetMath())
// editing macros is only possible at lastpos
return cur.popBackward();
if (cur.posBackward() || idxBackward(cur))
return true;
// try to pop backwards --- but don't pop out of math! leave that to
// the FINISH lfuns
int s = cur.depth() - 2;
if (s >= 0 && cur[s].inset().asInsetMath())
return cur.popBackward();
return false;