anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 14:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

additional nargs check

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8606 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2004-04-05 16:36:03 +00:00
parent ec744e7583
commit 022a3ca047
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mathed/math_scriptinset.C
View File

@ -557,35 +557,20 @@ void MathScriptInset::notifyCursorLeaves(LCursor & cur)
{
MathNestInset::notifyCursorLeaves(cur);
#if 1
// remove empty scripts if possible
<<<<<<< math_scriptinset.C
if (cur.idx() == 2 && cell(2).empty()) {
if (nargs() > 2 && cur.idx() == 2 && cell(2).empty()) {
// must be a subscript...
removeScript(false);
// sanitize cursor, even if this slice will be removed immediately
cur.idx() = 0;
cur.pos() = 0;
} else if (cur.idx() == 1 && cell(1).empty()) {
} else if (nargs() > 1 && cur.idx() == 1 && cell(1).empty()) {
// could be either subscript or super script
removeScript(cell_1_is_up_);
// sanitize cursor, even if this slice will be removed immediately
cur.idx() = 0;
cur.pos() = 0;
=======
if (idx == 2 && nargs() > 2 && cell(2).empty()) {
removeScript(false); // must be a subscript...
} else if (idx == 1 && nargs() > 1 && cell(1).empty()) {
if (nargs() == 2) {
cell_1_is_up_ = false;
cell(1) = cell(2);
cells_.pop_back();
} else if (nargs() == 1) {
cells_.pop_back();
}
>>>>>>> 1.114
}
#endif
}