#include "math_factory.h"
#include "math_hullinset.h"
#include "math_mathmlstream.h"
+#include "math_macroarg.h"
+#include "math_mboxinset.h"
#include "math_parser.h"
#include "math_scriptinset.h"
#include "math_spaceinset.h"
+#include "math_symbolinset.h"
#include "math_support.h"
-#include "math_mboxinset.h"
#include "math_unknowninset.h"
#include "BufferView.h"
+#include "CutAndPaste.h"
#include "FuncStatus.h"
#include "LColor.h"
#include "bufferview_funcs.h"
#include "outputparams.h"
#include "undo.h"
-#include "support/std_sstream.h"
#include "support/lstrings.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
+#include <sstream>
+
+using lyx::cap::copySelection;
+using lyx::cap::grabAndEraseSelection;
+using lyx::cap::cutSelection;
+using lyx::cap::pasteSelection;
+using lyx::cap::replaceSelection;
+using lyx::cap::selClearOrDel;
using std::endl;
using std::string;
using std::istringstream;
+
namespace {
// local global
}
-void MathNestInset::getCursorPos(CursorSlice const & cur,
- int & x, int & y) const
+void MathNestInset::getCursorPos(LCursor const & cur, int & x, int & y) const
{
BOOST_ASSERT(ptr_cmp(&cur.inset(), this));
MathArray const & ar = cur.cell();
x = ar.xo() + ar.pos2x(cur.pos());
- y = ar.yo();
+ y = ar.yo() + cur.bv().top_y();
// move cursor visually into empty cells ("blue rectangles");
if (cur.cell().empty())
x += 2;
}
-void MathNestInset::substitute(MathMacro const & m)
-{
- for (idx_type i = 0; i < nargs(); ++i)
- cell(i).substitute(m);
-}
-
-
void MathNestInset::metrics(MetricsInfo const & mi) const
{
MetricsInfo m = mi;
void MathNestInset::drawSelection(PainterInfo & pi, int, int) const
{
- //lyxerr << "MathNestInset::drawing selection: "
- // << " x: " << x << " y: " << y << endl;
// this should use the x/y values given, not the cached values
LCursor & cur = pi.base.bv->cursor();
if (!cur.selection())
return;
CursorSlice s1 = cur.selBegin();
CursorSlice s2 = cur.selEnd();
- lyxerr << "MathNestInset::drawing selection: "
- << " s1: " << s1 << " s2: " << s2 << endl;
+ //lyxerr << "MathNestInset::drawing selection: "
+ // << " s1: " << s1 << " s2: " << s2 << endl;
if (s1.idx() == s2.idx()) {
MathArray const & c = cell(s1.idx());
int x1 = c.xo() + c.pos2x(s1.pos());
int x2 = c.xo() + c.pos2x(s2.pos());
int y2 = c.yo() + c.descent();
pi.pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
+ //lyxerr << "MathNestInset::drawing selection 3: "
+ // << " x1: " << x1 << " x2: " << x2
+ // << " y1: " << y1 << " y2: " << y2 << endl;
} else {
for (idx_type i = 0; i < nargs(); ++i) {
if (idxBetween(i, s1.idx(), s2.idx())) {
}
-void MathNestInset::notifyCursorLeaves(LCursor & cur)
+void MathNestInset::notifyCursorLeaves(LCursor & /*cur*/)
{
+#ifdef WITH_WARNINGS
#warning look here
+#endif
#if 0
MathArray & ar = cur.cell();
// remove base-only "scripts"
- for (pos_type i = 0; i + 1 < size(); ++i) {
+ for (pos_type i = 0; i + 1 < ar.size(); ++i) {
MathScriptInset * p = operator[](i).nucleus()->asScriptInset();
if (p && p->nargs() == 1) {
MathArray ar = p->nuc();
switch (cmd.action) {
- case LFUN_PASTESELECTION: {
- MathArray ar;
- mathed_parse_cell(ar, cur.bv().getClipboard());
- cur.cell().insert(cur.pos(), ar);
- cur.pos() += ar.size();
- break;
- }
-
- case LFUN_PASTE:
- if (!cmd.argument.empty()) {
- MathArray ar;
- mathed_parse_cell(ar, cmd.argument);
- cur.cell().insert(cur.pos(), ar);
- cur.pos() += ar.size();
- }
- break;
-/*
case LFUN_PASTE: {
+ recordUndo(cur);
+ cur.message(_("Paste"));
+ replaceSelection(cur);
size_t n = 0;
istringstream is(cmd.argument.c_str());
is >> n;
- if (was_macro)
- cur.macroModeClose();
- recordUndo(cur, Undo::ATOMIC);
- cur.selPaste(n);
+ pasteSelection(cur, n);
+ cur.clearSelection(); // bug 393
+ cur.bv().switchKeyMap();
+ finishUndo();
break;
}
-*/
+
+ case LFUN_CUT:
+ cutSelection(cur, true, true);
+ cur.message(_("Cut"));
+ break;
+
+ case LFUN_COPY:
+ copySelection(cur);
+ cur.message(_("Copy"));
+ break;
case LFUN_MOUSE_PRESS:
lfunMousePress(cur, cmd);
break;
case LFUN_FINISHED_UP:
- //idxUpDown(cur, true);
cur.bv().cursor() = cur;
break;
case LFUN_FINISHED_DOWN:
- //idxUpDown(cur, false);
cur.bv().cursor() = cur;
break;
case LFUN_RIGHTSEL:
case LFUN_RIGHT:
- lyxerr << "mathnest RIGHT: from:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_RIGHTSEL);
cur.autocorrect() = false;
cur.clearTargetX();
- if (cur.inMacroMode())
- cur.macroModeClose();
- else if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
+ cur.macroModeClose();
+ if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
cur.pushLeft(*cur.nextAtom().nucleus());
cur.inset().idxFirst(cur);
} else if (cur.posRight() || idxRight(cur)
;
else
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
- lyxerr << "mathnest RIGHT: to:\n" << cur << endl;
break;
case LFUN_LEFTSEL:
cur.selHandle(cmd.action == LFUN_LEFTSEL);
cur.autocorrect() = false;
cur.clearTargetX();
- if (cur.inMacroMode())
- cur.macroModeClose();
- else if (cur.pos() != 0 && cur.openable(cur.prevAtom())) {
+ cur.macroModeClose();
+ if (cur.pos() != 0 && cur.openable(cur.prevAtom())) {
cur.posLeft();
cur.push(*cur.nextAtom().nucleus());
cur.inset().idxLast(cur);
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE:
- recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur);
cur.erase();
cmd = FuncRequest(LFUN_FINISHED_LEFT);
break;
break;
case LFUN_INSET_TOGGLE:
+ recordUndo(cur);
//lockToggle();
if (cur.pos() != cur.lastpos()) {
// toggle previous inset ...
break;
case LFUN_SELFINSERT:
- if (cmd.argument.empty()) {
- cmd = FuncRequest(LFUN_FINISHED_RIGHT);
- break;
- }
- recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur);
if (cmd.argument.size() != 1) {
cur.insert(cmd.argument);
break;
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
break;
-#if 0
-//
-// this needs to be incorporated
-//
- // delete empty mathbox (LFUN_BACKSPACE and LFUN_DELETE)
- bool remove_inset = false;
-
- DispatchResult result(true);
- bool was_macro = cur.inMacroMode();
-
- cur.normalize();
- cur.touch();
-#endif
+ //case LFUN_GETXY:
+ // sprintf(dispatch_buffer, "%d %d",);
+ // break;
- // case LFUN_GETXY:
- // sprintf(dispatch_buffer, "%d %d",);
- // DispatchResult= dispatch_buffer;
- // break;
case LFUN_SETXY: {
lyxerr << "LFUN_SETXY broken!" << endl;
int x = 0;
break;
}
- case LFUN_CUT:
- recordUndo(cur, Undo::DELETE);
- cur.selCut();
- break;
-
- case LFUN_COPY:
- cur.selCopy();
- break;
-
// Special casing for superscript in case of LyX handling
// dead-keys:
case LFUN_CIRCUMFLEX:
case LFUN_MATH_MODE:
#if 1
cur.macroModeClose();
- cur.selClearOrDel();
+ selClearOrDel(cur);
cur.plainInsert(MathAtom(new MathMBoxInset(cur.bv())));
cur.posLeft();
cur.pushLeft(*cur.nextInset());
#else
- if (currentMode() == InsetBase::TEXT_MODE)
+ if (currentMode() == InsetBase::TEXT_MODE) {
cur.niceInsert(MathAtom(new MathHullInset("simple")));
- else
+ cur.message(_("create new math text environment ($...$)"));
+ } else {
handleFont(cur, cmd.argument, "textrm");
- //cur.owner()->message(_("math text mode toggled"));
+ cur.message(_("entered math text mode (textrm)"));
+ }
#endif
break;
case LFUN_MATH_SIZE:
#if 0
- if (!arg.empty()) {
- recordUndo(cur, Undo::ATOMIC);
- cur.setSize(arg);
- }
+ recordUndo(cur);
+ cur.setSize(arg);
#endif
break;
break;
}
-#ifdef WITH_WARNINGS
-#warning look here
-#endif
-#if 0
-
- case LFUN_WORD_REPLACE:
- case LFUN_WORD_FIND:
- if (!searchForward(&cur.bv(), cmd.getArg(0), false, false))
- cur.undispatched();
- break;
-
- cur.normalize();
- cur.touch();
-
- BOOST_ASSERT(cur.inMathed());
-
- if (result.dispatched()) {
- revealCodes(cur);
- cur.bv().stuffClipboard(cur.grabSelection());
- } else {
- if (remove_inset)
- cur.bv().owner()->dispatch(FuncRequest(LFUN_DELETE));
- }
- break;
-#endif
-
default:
MathDimInset::priv_dispatch(cur, cmd);
break;
FuncStatus & flag) const
{
// the font related toggles
- //string tc = "mathnormal";
+ //string tc = "mathnormal";
bool ret = true;
switch (cmd.action) {
#if 0
{
lyxerr << "interpret 2: '" << c << "'" << endl;
cur.clearTargetX();
- /// are we currently typing '#1' or '#2' or...?
- if (cur.pos() > 0 && cur.prevAtom()->getChar() == '#') {
- cur.posLeft();
- cur.plainErase();
-#ifdef WITH_WARNINGS
-#warning FIXME
-#endif
-#if 0
- int n = c - '0';
- MathMacroTemplate const * p = formula()->asMacroTemplate();
- if (p && 1 <= n && n <= p->numargs())
- cur.insert(MathAtom(new MathMacroArgument(c - '0')));
- else {
- cur.insert(createMathInset("#"));
- interpret(cur, c); // try again
- }
-#endif
- return true;
- }
// handle macroMode
if (cur.inMacroMode()) {
string name = cur.macroName();
- //lyxerr << "interpret name: '" << name << "'" << endl;
+ lyxerr << "interpret macro name: '" << name << "'" << endl;
+
+ /// are we currently typing '#1' or '#2' or...?
+ if (name == "\\#") {
+ cur.backspace();
+ int n = c - '0';
+ if (n >= 1 && n <= 9)
+ cur.insert(new MathMacroArgument(n));
+ return true;
+ }
if (isalpha(c)) {
- cur.activeMacro()->setName(cur.activeMacro()->name() + c);
+ cur.activeMacro()->setName(name + c);
return true;
}
// handle 'special char' macros
if (name == "\\") {
// remove the '\\'
- cur.backspace();
if (c == '\\') {
+ cur.backspace();
if (currentMode() == MathInset::TEXT_MODE)
cur.niceInsert(createMathInset("textbackslash"));
else
cur.niceInsert(createMathInset("backslash"));
} else if (c == '{') {
+ cur.backspace();
cur.niceInsert(MathAtom(new MathBraceInset));
+ } else if (c == '%') {
+ cur.backspace();
+ cur.niceInsert(MathAtom(new MathCommentInset));
+ } else if (c == '#') {
+ lyxerr << "setting name to " << name + c << endl;
+ BOOST_ASSERT(cur.activeMacro());
+ cur.activeMacro()->setName(name + c);
+ lyxerr << "set name to " << name + c << endl;
} else {
+ cur.backspace();
cur.niceInsert(createMathInset(string(1, c)));
}
return true;
return true;
}
- cur.selClearOrDel();
+ selClearOrDel(cur);
if (c == '\\') {
//lyxerr << "starting with macro" << endl;
return true;
}
- if (c == '{' || c == '}' || c == '#' || c == '&' || c == '$') {
+ if (c == '{' || c == '}' || c == '&' || c == '$' || c == '#' || c == '%') {
cur.niceInsert(createMathInset(string(1, c)));
return true;
}
- if (c == '%') {
- cur.niceInsert(MathAtom(new MathCommentInset));
+ if (c == '~') {
+ cur.niceInsert(createMathInset("sim"));
return true;
}
bool MathNestInset::script(LCursor & cur, bool up)
{
- // Hack to get \\^ and \\_ working
+ // Hack to get \^ and \_ working
lyxerr << "handling script: up: " << up << endl;
if (cur.inMacroMode() && cur.macroName() == "\\") {
if (up)
}
cur.macroModeClose();
- string safe = cur.grabAndEraseSelection();
+ string safe = grabAndEraseSelection(cur);
if (asScriptInset() && cur.idx() == 0) {
// we are in a nucleus of a script inset, move to _our_ script
MathScriptInset * inset = asScriptInset();