anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 13:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

let '^' and '_' end "MacroMode" immediately

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2996 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-11-09 13:51:24 +00:00
parent 9d0ba3ddf2
commit cc5b1b9def
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/mathed/math_cursor.C
View File

@ -1309,7 +1309,34 @@ void MathCursor::interpret(string const & s)
void MathCursor::interpret(char c) void MathCursor::interpret(char c)
{ {
//lyxerr << "interpret 2: '" << c << "'\n"; //lyxerr << "interpret 2: '" << c << "'\n";
if (c == '^' || c == '_') {
macroModeClose();
const bool up = (c == '^');
selCut();
if (hasPrevAtom() && prevAtom()->asScriptInset()) {
prevAtom()->asScriptInset()->ensure(up);
pushRight(prevAtom());
idx() = up;
pos() = size();
} else if (hasNextAtom() && nextAtom()->asScriptInset()) {
nextAtom()->asScriptInset()->ensure(up);
pushLeft(nextAtom());
idx() = up;
pos() = 0;
} else {
plainInsert(MathAtom(new MathScriptInset(up)));
prevAtom()->asScriptInset()->ensure(up);
pushRight(prevAtom());
idx() = up;
pos() = 0;
}
selPaste();
dump("1");
return;
}
// handle macroMode
if (inMacroMode()) { if (inMacroMode()) {
string name = macroName(); string name = macroName();
@ -1345,32 +1372,6 @@ void MathCursor::interpret(char c)
return; return;
} }
// no macro mode
if (c == '^' || c == '_') {
const bool up = (c == '^');
selCut();
if (hasPrevAtom() && prevAtom()->asScriptInset()) {
prevAtom()->asScriptInset()->ensure(up);
pushRight(prevAtom());
idx() = up;
pos() = size();
} else if (hasNextAtom() && nextAtom()->asScriptInset()) {
nextAtom()->asScriptInset()->ensure(up);
pushLeft(nextAtom());
idx() = up;
pos() = 0;
} else {
plainInsert(MathAtom(new MathScriptInset(up)));
prevAtom()->asScriptInset()->ensure(up);
pushRight(prevAtom());
idx() = up;
pos() = 0;
}
selPaste();
dump("1");
return;
}
if (selection_) if (selection_)
selDel(); selDel();