#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 "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
#include "funcrequest.h"
#include "gettext.h"
-#include "LColor.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));
+ 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;
bool MathNestInset::idxNext(LCursor & cur) const
{
- BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+ BOOST_ASSERT(ptr_cmp(&cur.inset(), this));
if (cur.idx() == cur.lastidx())
return false;
++cur.idx();
bool MathNestInset::idxPrev(LCursor & cur) const
{
- BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+ BOOST_ASSERT(ptr_cmp(&cur.inset(), this));
if (cur.idx() == 0)
return false;
--cur.idx();
bool MathNestInset::idxFirst(LCursor & cur) const
{
- BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+ BOOST_ASSERT(ptr_cmp(&cur.inset(), this));
if (nargs() == 0)
return false;
cur.idx() = 0;
bool MathNestInset::idxLast(LCursor & cur) const
{
- BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+ BOOST_ASSERT(ptr_cmp(&cur.inset(), this));
if (nargs() == 0)
return false;
cur.idx() = cur.lastidx();
}
-//void MathNestInset::draw(PainterInfo & pi, int x, int y) const
-void MathNestInset::draw(PainterInfo &, int, int) const
+void MathNestInset::draw(PainterInfo & pi, int x, int y) const
{
#if 0
if (lock_)
pi.pain.fillRectangle(x, y - ascent(), width(), height(),
LColor::mathlockbg);
#endif
+ setPosCache(pi, x, y);
}
-void MathNestInset::drawSelection(PainterInfo & pi, int, int) const
+void MathNestInset::drawSelection(PainterInfo & pi, int x, int y) const
{
+ // FIXME: hack to get position cache warm
+ draw(pi, x, y);
+
// this should use the x/y values given, not the cached values
LCursor & cur = pi.base.bv->cursor();
if (!cur.selection())
return;
- if (!ptr_cmp(cur.inset(), this))
+ if (!ptr_cmp(&cur.inset(), this))
return;
- CursorSlice & s1 = cur.selBegin();
- CursorSlice & s2 = cur.selEnd();
+ CursorSlice s1 = cur.selBegin();
+ CursorSlice s2 = cur.selEnd();
+ //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(idx_type idx)
+int MathNestInset::latex(Buffer const &, std::ostream & os,
+ OutputParams const & runparams) const
+{
+ WriteStream wi(os, runparams.moving_arg, true);
+ write(wi);
+ return wi.line();
+}
+
+
+void MathNestInset::notifyCursorLeaves(LCursor & /*cur*/)
{
- cell(idx).notifyCursorLeaves();
+#ifdef WITH_WARNINGS
+#warning look here
+#endif
+#if 0
+ MathArray & ar = cur.cell();
+ // remove base-only "scripts"
+ 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();
+ erase(i);
+ insert(i, ar);
+ cur.adjust(i, ar.size() - 1);
+ }
+ }
+
+ // glue adjacent font insets of the same kind
+ for (pos_type i = 0; i + 1 < size(); ++i) {
+ MathFontInset * p = operator[](i).nucleus()->asFontInset();
+ MathFontInset const * q = operator[](i + 1)->asFontInset();
+ if (p && q && p->name() == q->name()) {
+ p->cell(0).append(q->cell(0));
+ erase(i + 1);
+ cur.adjust(i, -1);
+ }
+ }
+#endif
}
{
// this whole function is a hack and won't work for incremental font
// changes...
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
- if (cur.inset()->asMathInset()->name() == font)
+ if (cur.inset().asMathInset()->name() == font)
cur.handleFont(font);
else {
cur.handleNest(createMathInset(font));
void MathNestInset::handleFont2(LCursor & cur, string const & arg)
{
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
LyXFont font;
bool b;
bv_funcs::string2font(arg, font, b);
}
-void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
{
- lyxerr << "MathNestInset: request: " << cmd << std::endl;
+ //lyxerr << "MathNestInset: request: " << cmd << std::endl;
//CursorSlice sl = cur.current();
switch (cmd.action) {
- 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());
+ istringstream is(cmd.argument);
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_PASTESELECTION:
- dispatch(cur, FuncRequest(LFUN_PASTE, cur.bv().getClipboard()));
+ case LFUN_CUT:
+ cutSelection(cur, true, true);
+ cur.message(_("Cut"));
+ break;
+
+ case LFUN_COPY:
+ copySelection(cur);
+ cur.message(_("Copy"));
break;
case LFUN_MOUSE_PRESS:
lfunMouseRelease(cur, cmd);
break;
- case LFUN_MOUSE_DOUBLE:
- case LFUN_MOUSE_TRIPLE:
- //lyxerr << "Mouse double" << endl;
- //lyxerr << "Mouse triple" << endl;
- dispatch(cur, FuncRequest(LFUN_WORDSEL));
- break;
-
case LFUN_FINISHED_LEFT:
cur.bv().cursor() = cur;
break;
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.pushLeft(cur.nextAtom().nucleus());
- cur.inset()->idxFirst(cur);
+ 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)
|| cur.popRight() || cur.selection())
;
else
- cur.dispatched(FINISHED_RIGHT);
- lyxerr << "mathnest RIGHT: to:\n" << cur << endl;
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
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);
+ cur.push(*cur.nextAtom().nucleus());
+ cur.inset().idxLast(cur);
} else if (cur.posLeft() || idxLeft(cur)
|| cur.popLeft() || cur.selection())
;
else
- cur.dispatched(FINISHED_LEFT);
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
break;
case LFUN_UPSEL:
case LFUN_UP:
cur.selHandle(cmd.action == LFUN_UPSEL);
if (!cur.up())
- cur.dispatched(FINISHED_UP);
+ cmd = FuncRequest(LFUN_FINISHED_UP);
break;
case LFUN_DOWNSEL:
case LFUN_DOWN:
cur.selHandle(cmd.action == LFUN_DOWNSEL);
if (!cur.down())
- cur.dispatched(FINISHED_DOWN);
+ cmd = FuncRequest(LFUN_FINISHED_DOWN);
break;
+ case LFUN_MOUSE_DOUBLE:
+ case LFUN_MOUSE_TRIPLE:
case LFUN_WORDSEL:
cur.pos() = 0;
cur.idx() = 0;
cur.idx() = 0;
cur.pos() = 0;
} else {
- cur.dispatched(FINISHED_LEFT);
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
}
break;
cur.idx() = cur.lastidx();
cur.pos() = cur.lastpos();
} else {
- cur.dispatched(FINISHED_RIGHT);
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
}
break;
case LFUN_PRIORSEL:
case LFUN_PRIOR:
- case LFUN_BEGINNINGBUFSEL:
- case LFUN_BEGINNINGBUF:
- cur.dispatched(FINISHED_LEFT);
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
break;
case LFUN_NEXTSEL:
case LFUN_NEXT:
- case LFUN_ENDBUFSEL:
- case LFUN_ENDBUF:
- cur.dispatched(FINISHED_RIGHT);
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
break;
case LFUN_CELL_FORWARD:
- cur.inset()->idxNext(cur);
+ cur.inset().idxNext(cur);
break;
case LFUN_CELL_BACKWARD:
- cur.inset()->idxPrev(cur);
+ cur.inset().idxPrev(cur);
break;
case LFUN_DELETE_WORD_BACKWARD:
case LFUN_BACKSPACE:
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
cur.backspace();
break;
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE:
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur);
cur.erase();
- cur.dispatched(FINISHED_LEFT);
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
break;
case LFUN_ESCAPE:
- if (cur.selection())
- cur.selClear();
- else
- cur.dispatched(FINISHED_LEFT);
+ if (cur.selection())
+ cur.clearSelection();
+ else
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
break;
case LFUN_INSET_TOGGLE:
+ recordUndo(cur);
//lockToggle();
if (cur.pos() != cur.lastpos()) {
// toggle previous inset ...
break;
case LFUN_SELFINSERT:
- if (cmd.argument.empty()) {
- cur.dispatched(FINISHED_RIGHT);
- break;
- }
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur);
if (cmd.argument.size() != 1) {
cur.insert(cmd.argument);
break;
}
if (!interpret(cur, cmd.argument[0]))
- cur.dispatched(FINISHED_RIGHT);
+ 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;
int y = 0;
- istringstream is(cmd.argument.c_str());
+ istringstream is(cmd.argument);
is >> x >> y;
cur.setScreenPos(x, y);
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:
if (cmd.argument.empty()) {
// do superscript if LyX handles
// deadkeys
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
script(cur, true);
}
break;
case LFUN_MATH_MODE:
#if 1
+ // ignore math-mode on when already in math mode
+ if (currentMode() == InsetBase::MATH_MODE && cmd.argument == "on")
+ break;
cur.macroModeClose();
- cur.selClearOrDel();
+ selClearOrDel(cur);
cur.plainInsert(MathAtom(new MathMBoxInset(cur.bv())));
cur.posLeft();
- cur.pushLeft(cur.nextInset());
+ 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;
case LFUN_INSERT_MATRIX: {
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
unsigned int m = 1;
unsigned int n = 1;
string v_align;
ls = '(';
if (rs.empty())
rs = ')';
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
cur.handleNest(MathAtom(new MathDelimInset(ls, rs)));
break;
}
case LFUN_SPACE_INSERT:
case LFUN_MATH_SPACE:
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
cur.insert(MathAtom(new MathSpaceInset(",")));
break;
- case LFUN_UNDO:
-#warning look here
- //cur.bv().owner()->message(_("Invalid action in math mode!"));
- break;
-
case LFUN_INSET_ERT:
// interpret this as if a backslash was typed
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
interpret(cur, '\\');
break;
// handling such that "self-insert" works on "arbitrary stuff" too, and
// math-insert only handles special math things like "matrix".
case LFUN_INSERT_MATH:
- //recordUndo(cur, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
cur.niceInsert(cmd.argument);
break;
InsetBase * base = cur.bv().owner()->getDialogs().getOpenInset(name);
if (base) {
- base->dispatch(cur, FuncRequest(LFUN_INSET_MODIFY, cmd.argument));
+ FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
+ base->dispatch(cur, fr);
break;
}
MathArray ar;
break;
}
-#warning look here
-#if 0
-
- case LFUN_WORD_REPLACE:
- case LFUN_WORD_FIND:
- if (!searchForward(&cur.bv(), cmd.getArg(0), false, false))
- cur.undispatched();
+ default:
+ MathDimInset::doDispatch(cur, cmd);
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;
+bool MathNestInset::getStatus(LCursor & /*cur*/, FuncRequest const & cmd,
+ FuncStatus & flag) const
+{
+ // the font related toggles
+ //string tc = "mathnormal";
+ bool ret = true;
+ switch (cmd.action) {
+#if 0
+ case LFUN_TABULAR_FEATURE:
+ // FIXME: check temporarily disabled
+ // valign code
+ char align = mathcursor::valign();
+ if (align == '\0') {
+ enable = false;
+ break;
+ }
+ if (cmd.argument.empty()) {
+ flag.clear();
+ break;
+ }
+ if (!contains("tcb", cmd.argument[0])) {
+ enable = false;
+ break;
+ }
+ flag.setOnOff(cmd.argument[0] == align);
+ break;
+ case LFUN_BOLD:
+ flag.setOnOff(tc == "mathbf");
+ break;
+ case LFUN_SANS:
+ flag.setOnOff(tc == "mathsf");
+ break;
+ case LFUN_EMPH:
+ flag.setOnOff(tc == "mathcal");
+ break;
+ case LFUN_ROMAN:
+ flag.setOnOff(tc == "mathrm");
+ break;
+ case LFUN_CODE:
+ flag.setOnOff(tc == "mathtt");
+ break;
+ case LFUN_NOUN:
+ flag.setOnOff(tc == "mathbb");
+ break;
+ case LFUN_DEFAULT:
+ flag.setOnOff(tc == "mathnormal");
+ break;
#endif
+ case LFUN_MATH_MUTATE:
+ //flag.setOnOff(mathcursor::formula()->hullType() == cmd.argument);
+ flag.setOnOff(false);
+ break;
+
+ // we just need to be in math mode to enable that
+ case LFUN_MATH_SIZE:
+ case LFUN_MATH_SPACE:
+ case LFUN_MATH_LIMITS:
+ case LFUN_MATH_NONUMBER:
+ case LFUN_MATH_NUMBER:
+ case LFUN_MATH_EXTERN:
+ flag.enabled(true);
+ break;
default:
- MathDimInset::priv_dispatch(cur, cmd);
+ ret = false;
break;
}
+ return ret;
}
void MathNestInset::edit(LCursor & cur, bool left)
{
- cur.push(this);
+ cur.push(*this);
cur.idx() = left ? 0 : cur.lastidx();
cur.pos() = left ? 0 : cur.lastpos();
cur.resetAnchor();
+ lyxerr << "MathNestInset::edit, cur:\n" << cur << endl;
}
-InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y)
+InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y) const
{
int idx_min = 0;
int dist_min = 1000000;
idx_min = i;
}
}
- MathArray & ar = cell(idx_min);
- cur.push(this);
+ MathArray const & ar = cell(idx_min);
+ cur.push(const_cast<MathNestInset&>(*this));
cur.idx() = idx_min;
cur.pos() = ar.x2pos(x - ar.xo());
lyxerr << "found cell : " << idx_min << " pos: " << cur.pos() << endl;
if (ar[i]->covers(x, y))
return ar[i].nucleus()->editXY(cur, x, y);
}
- return this;
+ return const_cast<MathNestInset*>(this);
+}
+
+
+void MathNestInset::lfunMousePress(LCursor & cur, FuncRequest & cmd)
+{
+ lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
+ if (cmd.button() == mouse_button::button1) {
+ first_x = cmd.x;
+ first_y = cmd.y;
+ lyxerr << "lfunMousePress: setting cursor to: " << cur << endl;
+ cur.resetAnchor();
+ cur.bv().cursor() = cur;
+ }
+
+ if (cmd.button() == mouse_button::button2) {
+ cur.dispatch(FuncRequest(LFUN_PASTESELECTION));
+ }
+}
+
+
+void MathNestInset::lfunMouseMotion(LCursor & cur, FuncRequest & cmd)
+{
+ // only select with button 1
+ if (cmd.button() == mouse_button::button1) {
+ LCursor & bvcur = cur.bv().cursor();
+ if (abs(cmd.x - first_x) + abs(cmd.y - first_y) > 4
+ && bvcur.anchor_.hasPart(cur)) {
+ first_x = cmd.x;
+ first_y = cmd.y;
+
+ bvcur.setCursor(cur);
+ bvcur.selection() = true;
+ }
+ }
}
-void MathNestInset::lfunMouseRelease(LCursor & cur, FuncRequest const & cmd)
+void MathNestInset::lfunMouseRelease(LCursor & cur, FuncRequest & cmd)
{
- //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
+ lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
if (cmd.button() == mouse_button::button1) {
- // try to dispatch to enclosed insets first
//cur.bv().stuffClipboard(cur.grabSelection());
return;
}
if (cmd.button() == mouse_button::button2) {
MathArray ar;
asArray(cur.bv().getClipboard(), ar);
- cur.selClear();
+ cur.clearSelection();
cur.setScreenPos(cmd.x, cmd.y);
cur.insert(ar);
cur.bv().update();
}
-void MathNestInset::lfunMousePress(LCursor & cur, FuncRequest const & cmd)
-{
- lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
- if (cmd.button() == mouse_button::button1) {
- first_x = cmd.x;
- first_y = cmd.y;
- cur.selClear();
- //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
- lyxerr << "lfunMousePress: setting cursor to: " << cur << endl;
- cur.bv().cursor() = cur;
- }
-
- if (cmd.button() == mouse_button::button2) {
- priv_dispatch(cur, FuncRequest(LFUN_PASTESELECTION));
- }
-}
-
-
-void MathNestInset::lfunMouseMotion(LCursor & cur, FuncRequest const & cmd)
-{
- // only select with button 1
- if (cmd.button() != mouse_button::button1)
- return;
-
- if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
- return;
-
- first_x = cmd.x;
- first_y = cmd.y;
-
- if (!cur.selection())
- cur.selBegin();
-
- //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
- cur.bv().cursor().setCursor(cur, true);
-}
-
-
bool MathNestInset::interpret(LCursor & cur, char c)
{
- //lyxerr << "interpret 2: '" << c << "'" << endl;
+ lyxerr << "interpret 2: '" << c << "'" << endl;
cur.clearTargetX();
- if (cur.inMacroArgMode()) {
- cur.posLeft();
- cur.plainErase();
-#warning FIXME
-#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;
+
+ /// 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 == '#') {
+ BOOST_ASSERT(cur.activeMacro());
+ cur.activeMacro()->setName(name + c);
} 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();
- if (asScriptInset() && cur.idx() == 2) {
+ string safe = grabAndEraseSelection(cur);
+ if (asScriptInset() && cur.idx() == 0) {
// we are in a nucleus of a script inset, move to _our_ script
- asScriptInset()->ensure(up);
- cur.idx() = up;
+ MathScriptInset * inset = asScriptInset();
+ lyxerr << " going to cell " << inset->idxOfScript(up) << endl;
+ inset->ensure(up);
+ cur.idx() = inset->idxOfScript(up);
cur.pos() = 0;
} else if (cur.pos() != 0 && cur.prevAtom()->asScriptInset()) {
--cur.pos();
- cur.nextAtom().nucleus()->asScriptInset()->ensure(up);
- cur.push(cur.nextInset());
- cur.idx() = up;
+ MathScriptInset * inset = cur.nextAtom().nucleus()->asScriptInset();
+ cur.push(*inset);
+ cur.idx() = inset->idxOfScript(up);
cur.pos() = cur.lastpos();
- } else if (cur.pos() != 0) {
- --cur.pos();
- cur.cell()[cur.pos()] = MathAtom(new MathScriptInset(cur.nextAtom(), up));
- cur.push(cur.nextInset());
- cur.idx() = up;
- cur.pos() = 0;
} else {
- cur.plainInsert(MathAtom(new MathScriptInset(up)));
+ // convert the thing to our left to a scriptinset or create a new
+ // one if in the very first position of the array
+ if (cur.pos() == 0) {
+ lyxerr << "new scriptinset" << endl;
+ cur.insert(new MathScriptInset(up));
+ } else {
+ lyxerr << "converting prev atom " << endl;
+ cur.prevAtom() = MathAtom(new MathScriptInset(cur.prevAtom(), up));
+ }
--cur.pos();
- cur.nextAtom().nucleus()->asScriptInset()->ensure(up);
- cur.push(cur.nextInset());
- cur.idx() = up;
+ MathScriptInset * inset = cur.nextAtom().nucleus()->asScriptInset();
+ cur.push(*inset);
+ cur.idx() = 1;
cur.pos() = 0;
}
+ lyxerr << "pasting 1: safe:\n" << safe << endl;
cur.paste(safe);
+ cur.resetAnchor();
+ lyxerr << "pasting 2: safe:\n" << safe << endl;
return true;
}
projects / lyx.git / blobdiff