-/*
-* File: formulabase.C
-* Purpose: Implementation of common parts of the LyX math insets
-* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
-* Created: January 1996
-*
-* Copyright: 1996-1998 Alejandro Aguilar Sierra
-*
-* Version: 0.4, Lyx project.
-*
-* You are free to use and modify this code under the terms of
-* the GNU General Public Licence version 2 or later.
-*/
+/**
+ * \file formulabase.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
-#include "Lsstream.h"
-#include "support/LAssert.h"
+#include "cursor.h"
+#include "formulabase.h"
#include "formula.h"
#include "formulamacro.h"
-#include "lyxrc.h"
-#include "funcrequest.h"
-#include "BufferView.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "LaTeXFeatures.h"
-#include "debug.h"
#include "math_support.h"
-#include "metricsinfo.h"
-#include "math_data.h"
-#include "support/lstrings.h"
-#include "frontends/LyXView.h"
-#include "frontends/font_metrics.h"
-#include "frontends/mouse_state.h"
#include "math_arrayinset.h"
-#include "math_charinset.h"
#include "math_deliminset.h"
#include "math_cursor.h"
#include "math_factory.h"
-#include "math_fontinset.h"
#include "math_hullinset.h"
-#include "math_iterator.h"
-#include "math_macrotable.h"
#include "math_parser.h"
-#include "math_pos.h"
#include "math_spaceinset.h"
-#include "undo_funcs.h"
-#include "textpainter.h"
-#include "frontends/Dialogs.h"
-#include "intl.h"
#include "ref_inset.h"
-#include <fstream>
+#include "BufferView.h"
+#include "bufferview_funcs.h"
+#include "dispatchresult.h"
+#include "debug.h"
+#include "funcrequest.h"
+#include "gettext.h"
+#include "LColor.h"
+#include "lyxtext.h"
+#include "undo.h"
-using std::endl;
-using std::ostream;
-using std::vector;
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
+
+#include "support/std_sstream.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+
+using lyx::support::atoi;
+using lyx::support::split;
+using lyx::support::token;
+
+using std::string;
using std::abs;
+using std::endl;
using std::max;
+using std::istringstream;
+
MathCursor * mathcursor = 0;
int first_x;
int first_y;
-bool openNewInset(BufferView * bv, UpdatableInset * new_inset)
+bool openNewInset(BufferView * bv, UpdatableInset * inset)
{
- if (!bv->insertInset(new_inset)) {
- delete new_inset;
+ if (!bv->insertInset(inset)) {
+ delete inset;
return false;
}
- new_inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, "left"));
+ inset->edit(bv, true);
return true;
}
InsetFormulaBase::InsetFormulaBase()
- : xo_(0), yo_(0)
{
// This is needed as long the math parser is not re-entrant
initMath();
- //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
- //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << "\n";
- //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << "\n";
- //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << "\n";
+ //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << endl;
+ //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
+ //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << endl;
+ //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
}
{
// this whole function is a hack and won't work for incremental font
// changes...
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
+
if (mathcursor->inset()->name() == font)
mathcursor->handleFont(font);
else {
}
-BufferView * InsetFormulaBase::view() const
+void InsetFormulaBase::handleFont2(BufferView * bv, string const & arg)
{
- return view_;
+ recordUndo(bv, Undo::ATOMIC);
+ LyXFont font;
+ bool b;
+ bv_funcs::string2font(arg, font, b);
+ if (font.color() != LColor::inherit) {
+ MathAtom at = createMathInset("color");
+ asArray(lcolor.getGUIName(font.color()), at.nucleus()->cell(0));
+ mathcursor->handleNest(at, 1);
+ }
}
+
void InsetFormulaBase::validate(LaTeXFeatures &) const
{}
void InsetFormulaBase::insetUnlock(BufferView * bv)
{
if (mathcursor) {
- if (mathcursor->inMacroMode()) {
+ if (mathcursor->inMacroMode())
mathcursor->macroModeClose();
- bv->updateInset(this);
- }
releaseMathCursor(bv);
}
- generatePreview();
- bv->updateInset(this);
+ if (bv->buffer())
+ generatePreview(*bv->buffer());
+ bv->update();
}
}
-void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
+void InsetFormulaBase::getCursorPos(int, int & x, int & y) const
{
- // calling metrics here destroys the cached xo,yo positions e.g. in
- // MathParboxinset. And it would be too expensive anyway...
- //metrics(bv);
if (!mathcursor) {
lyxerr << "getCursorPos - should not happen";
- x = y = 0;
+ x = 0;
+ y = 0;
return;
}
mathcursor->getPos(x, y);
x = mathcursor->targetX();
x -= xo_;
y -= yo_;
- //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
+ lyxerr << "InsetFormulaBase::getCursorPos: " << x << ' ' << y << endl;
}
-void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
+void InsetFormulaBase::getCursorDim(int & asc, int & desc) const
{
if (!mathcursor)
return;
- int x, y, asc, des;
asc = 10;
- des = 2;
+ desc = 2;
//math_font_max_dim(font_, asc, des);
- getCursorPos(bv, x, y);
- //y += yo_;
- //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << endl;
- bv->fitLockedInsetCursor(x, y, asc, des);
}
void InsetFormulaBase::toggleInsetSelection(BufferView * bv)
{
if (mathcursor)
- bv->updateInset(this);
-}
-
-
-vector<string> const InsetFormulaBase::getLabelList() const
-{
- return vector<string>();
+ bv->update();
}
-dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
+DispatchResult InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
{
if (!mathcursor)
- return UNDISPATCHED;
+ return DispatchResult(false);
BufferView * bv = cmd.view();
- bv->updateInset(this);
+ bv->update();
//lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
if (cmd.button() == mouse_button::button3) {
// try to dispatch to enclosed insets first
- if (mathcursor->dispatch(cmd) == UNDISPATCHED) {
+ if (!mathcursor->dispatch(cmd).dispatched()) {
// launch math panel for right mouse button
lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
- bv->owner()->getDialogs().showMathPanel();
+ bv->owner()->getDialogs().show("mathpanel");
}
- return DISPATCHED;
+ return DispatchResult(true, true);
}
if (cmd.button() == mouse_button::button2) {
mathcursor->selClear();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
mathcursor->insert(ar);
- bv->updateInset(this);
- return DISPATCHED;
+ bv->update();
+ return DispatchResult(true, true);
}
if (cmd.button() == mouse_button::button1) {
//mathcursor = new MathCursor(this, x == 0);
//metrics(bv);
//mathcursor->setPos(x + xo_, y + yo_);
- return DISPATCHED;
+ return DispatchResult(true, true);
}
- return UNDISPATCHED;
+ return DispatchResult(false);
}
-dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
+DispatchResult InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
//lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
if (cmd.button() == mouse_button::button3) {
mathcursor->dispatch(cmd);
- return DISPATCHED;
+ return DispatchResult(true, true);
}
if (cmd.button() == mouse_button::button1) {
mathcursor->selClear();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
mathcursor->dispatch(cmd);
- return DISPATCHED;
+ return DispatchResult(true, true);
}
- bv->updateInset(this);
- return DISPATCHED;
+ bv->update();
+ return DispatchResult(true, true);
}
-dispatch_result InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
+DispatchResult InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
{
if (!mathcursor)
- return DISPATCHED;
+ return DispatchResult(true, true);
- if (mathcursor->dispatch(FuncRequest(cmd)) != UNDISPATCHED)
- return DISPATCHED;
+ if (mathcursor->dispatch(FuncRequest(cmd)).dispatched())
+ return DispatchResult(true, true);
// only select with button 1
if (cmd.button() != mouse_button::button1)
- return DISPATCHED;
+ return DispatchResult(true, true);
if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
- return DISPATCHED;
+ return DispatchResult(true, true);
first_x = cmd.x;
first_y = cmd.y;
BufferView * bv = cmd.view();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
- bv->updateInset(this);
- return DISPATCHED;
+ bv->update();
+ return DispatchResult(true, true);
+}
+
+
+void InsetFormulaBase::edit(BufferView * bv, bool left)
+{
+ lyxerr << "Called FormulaBase::edit" << endl;
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, left);
+ bv->fullCursor().push(this);
+ // if that is removed, we won't get the magenta box when entering an
+ // inset for the first time
+ bv->update();
}
-dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
+void InsetFormulaBase::edit(BufferView * bv, int x, int y)
+{
+ lyxerr << "Called FormulaBase::EDIT with '" << x << ' ' << y << "'" << endl;
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, true);
+ //metrics(bv);
+ mathcursor->setPos(x + xo_, y + yo_);
+ bv->fullCursor().push(this);
+ // if that is removed, we won't get the magenta box when entering an
+ // inset for the first time
+ bv->update();
+}
+
+
+DispatchResult
+InsetFormulaBase::priv_dispatch(FuncRequest const & cmd,
+ idx_type &, pos_type &)
{
//lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
// << " arg: '" << cmd.argument
- // << " x: '" << cmd.x
+ // << "' x: '" << cmd.x
// << " y: '" << cmd.y
// << "' button: " << cmd.button() << endl;
bool remove_inset = false;
switch (cmd.action) {
- case LFUN_INSET_EDIT:
- lyxerr << "Called EDIT with '" << cmd.argument << "'\n";
- if (!bv->lockInset(this))
- lyxerr << "Cannot lock math inset in edit call!\n";
- releaseMathCursor(bv);
- if (!cmd.argument.empty()) {
- mathcursor = new MathCursor(this, cmd.argument == "left");
- //metrics(bv);
- } else {
- mathcursor = new MathCursor(this, true);
- //metrics(bv);
- mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
- }
- // if that is removed, we won't get the magenta box when entering an
- // inset for the first time
- bv->updateInset(this);
- return DISPATCHED;
-
case LFUN_MOUSE_PRESS:
- //lyxerr << "Mouse single press\n";
+ //lyxerr << "Mouse single press" << endl;
return lfunMousePress(cmd);
case LFUN_MOUSE_MOTION:
- //lyxerr << "Mouse motion\n";
+ //lyxerr << "Mouse motion" << endl;
return lfunMouseMotion(cmd);
case LFUN_MOUSE_RELEASE:
- //lyxerr << "Mouse single release\n";
+ //lyxerr << "Mouse single release" << endl;
return lfunMouseRelease(cmd);
case LFUN_MOUSE_DOUBLE:
- //lyxerr << "Mouse double\n";
- return localDispatch(FuncRequest(LFUN_WORDSEL));
+ //lyxerr << "Mouse double" << endl;
+ return dispatch(FuncRequest(LFUN_WORDSEL));
default:
break;
}
if (!mathcursor)
- return UNDISPATCHED;
+ return DispatchResult(false);
string argument = cmd.argument;
- RESULT result = DISPATCHED;
+ DispatchResult result(true);
bool sel = false;
bool was_macro = mathcursor->inMacroMode();
bool was_selection = mathcursor->selection();
case LFUN_TABULAR_FEATURE:
case LFUN_PASTESELECTION:
case LFUN_MATH_LIMITS:
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->dispatch(cmd);
break;
case LFUN_RIGHTSEL:
sel = true; // fall through...
case LFUN_RIGHT:
- result = mathcursor->right(sel) ? DISPATCHED : FINISHED_RIGHT;
- //lyxerr << "calling scroll 20\n";
+ result = mathcursor->right(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
+ //lyxerr << "calling scroll 20" << endl;
//scroll(bv, 20);
// write something to the minibuffer
//bv->owner()->message(mathcursor->info());
case LFUN_LEFTSEL:
sel = true; // fall through
case LFUN_LEFT:
- result = mathcursor->left(sel) ? DISPATCHED : FINISHED;
+ result = mathcursor->left(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED);
break;
case LFUN_UPSEL:
sel = true; // fall through
case LFUN_UP:
- result = mathcursor->up(sel) ? DISPATCHED : FINISHED_UP;
+ result = mathcursor->up(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED_UP);
break;
case LFUN_DOWNSEL:
sel = true; // fall through
case LFUN_DOWN:
- result = mathcursor->down(sel) ? DISPATCHED : FINISHED_DOWN;
+ result = mathcursor->down(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED_DOWN);
break;
case LFUN_WORDSEL:
case LFUN_UP_PARAGRAPH:
case LFUN_DOWN_PARAGRAPHSEL:
case LFUN_DOWN_PARAGRAPH:
- result = FINISHED;
+ result = DispatchResult(true, FINISHED);
break;
case LFUN_HOMESEL:
sel = true; // fall through
case LFUN_HOME:
case LFUN_WORDLEFT:
- result = mathcursor->home(sel) ? DISPATCHED : FINISHED;
+ result = mathcursor->home(sel) ? DispatchResult(true, true) : DispatchResult(true, FINISHED);
break;
case LFUN_ENDSEL:
sel = true; // fall through
case LFUN_END:
case LFUN_WORDRIGHT:
- result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
+ result = mathcursor->end(sel) ? DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
break;
case LFUN_PRIORSEL:
case LFUN_PRIOR:
case LFUN_BEGINNINGBUFSEL:
case LFUN_BEGINNINGBUF:
- result = FINISHED;
+ result = DispatchResult(true, FINISHED);
break;
case LFUN_NEXTSEL:
case LFUN_NEXT:
case LFUN_ENDBUFSEL:
case LFUN_ENDBUF:
- result = FINISHED_RIGHT;
+ result = DispatchResult(false, FINISHED_RIGHT);
break;
case LFUN_CELL_FORWARD:
case LFUN_DELETE_WORD_BACKWARD:
case LFUN_BACKSPACE:
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
if (!mathcursor->backspace()) {
- result = FINISHED;
+ result = DispatchResult(true, FINISHED);
remove_inset = true;
}
break;
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE:
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
if (!mathcursor->erase()) {
- result = FINISHED;
+ result = DispatchResult(true, FINISHED);
remove_inset = true;
}
break;
// case LFUN_GETXY:
// sprintf(dispatch_buffer, "%d %d",);
- // dispatch_result = dispatch_buffer;
+ // DispatchResult= dispatch_buffer;
// break;
case LFUN_SETXY: {
- lyxerr << "LFUN_SETXY broken!\n";
+ lyxerr << "LFUN_SETXY broken!" << endl;
int x = 0;
int y = 0;
istringstream is(cmd.argument.c_str());
}
case LFUN_PASTE: {
- int n = 0;
+ size_t n = 0;
istringstream is(cmd.argument.c_str());
is >> n;
if (was_macro)
mathcursor->macroModeClose();
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->selPaste(n);
break;
}
case LFUN_CUT:
- bv->lockedInsetStoreUndo(Undo::DELETE);
+ recordUndo(bv, Undo::DELETE);
mathcursor->selCut();
break;
if (cmd.argument.empty()) {
// do superscript if LyX handles
// deadkeys
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->script(true);
}
break;
break;
// Math fonts
+ case LFUN_FREEFONT_APPLY:
+ case LFUN_FREEFONT_UPDATE:
+ handleFont2(bv, cmd.argument);
+ break;
+
case LFUN_BOLD: handleFont(bv, cmd.argument, "mathbf"); break;
case LFUN_SANS: handleFont(bv, cmd.argument, "mathsf"); break;
case LFUN_EMPH: handleFont(bv, cmd.argument, "mathcal"); break;
case LFUN_FRAK: handleFont(bv, cmd.argument, "mathfrak"); break;
case LFUN_ITAL: handleFont(bv, cmd.argument, "mathit"); break;
case LFUN_NOUN: handleFont(bv, cmd.argument, "mathbb"); break;
- case LFUN_FREEFONT_APPLY: handleFont(bv, cmd.argument, "textrm"); break;
+ //case LFUN_FREEFONT_APPLY: handleFont(bv, cmd.argument, "textrm"); break;
case LFUN_DEFAULT: handleFont(bv, cmd.argument, "textnormal"); break;
case LFUN_MATH_MODE:
case LFUN_MATH_SIZE:
#if 0
if (!arg.empty()) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->setSize(arg);
}
#endif
break;
case LFUN_INSERT_MATRIX: {
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
unsigned int m = 1;
unsigned int n = 1;
string v_align;
string h_align;
- istringstream is(STRCONV(argument));
+ istringstream is(argument);
is >> m >> n >> v_align >> h_align;
m = max(1u, m);
n = max(1u, n);
break;
}
- case LFUN_SUPERSCRIPT:
- case LFUN_SUBSCRIPT:
- {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->script(cmd.action == LFUN_SUPERSCRIPT);
- break;
- }
-
- case LFUN_MATH_DELIM:
- {
- //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
+ case LFUN_MATH_DELIM: {
+ //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'" << endl;
string ls;
string rs = split(cmd.argument, ls, ' ');
// Reasonable default values
if (rs.empty())
rs = ')';
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->handleNest(MathAtom(new MathDelimInset(ls, rs)));
break;
}
case LFUN_SPACE_INSERT:
case LFUN_MATH_SPACE:
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->insert(MathAtom(new MathSpaceInset(",")));
break;
case LFUN_EXEC_COMMAND:
- result = UNDISPATCHED;
+ result = DispatchResult(false);
break;
case LFUN_INSET_ERT:
// interpret this as if a backslash was typed
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->interpret('\\');
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:
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->niceInsert(argument);
break;
case -1:
case LFUN_SELFINSERT:
if (!argument.empty()) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
if (argument.size() == 1)
- result = mathcursor->interpret(argument[0]) ? DISPATCHED : FINISHED_RIGHT;
- else
+ result = mathcursor->interpret(argument[0]) ? DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
+ else
mathcursor->insert(argument);
}
break;
- case LFUN_MATH_PANEL:
- result = UNDISPATCHED;
- break;
-
case LFUN_ESCAPE:
if (mathcursor->selection())
mathcursor->selClear();
else
- result = UNDISPATCHED;
+ result = DispatchResult(false);
break;
case LFUN_INSET_TOGGLE:
mathcursor->insetToggle();
break;
+ case LFUN_DIALOG_SHOW:
+ result = DispatchResult(false);
+ break;
+
case LFUN_DIALOG_SHOW_NEW_INSET: {
string const & name = argument;
string data;
}
if (data.empty())
- result = UNDISPATCHED;
- else {
+ result = DispatchResult(false);
+ else
bv->owner()->getDialogs().show(name, data, 0);
- }
+ break;
}
- break;
case LFUN_INSET_APPLY: {
string const name = cmd.getArg(0);
if (base) {
FuncRequest fr(bv, LFUN_INSET_MODIFY, cmd.argument);
- result = base->localDispatch(fr);
+ result = base->dispatch(fr);
} else {
MathArray ar;
if (createMathInset_fromDialogStr(cmd.argument, ar)) {
mathcursor->insert(ar);
- result = DISPATCHED;
+ result = DispatchResult(true, true);
} else {
- result = UNDISPATCHED;
+ result = DispatchResult(false);
}
}
+ break;
+ }
+
+ case LFUN_WORD_REPLACE:
+ case LFUN_WORD_FIND: {
+ result =
+ searchForward(cmd.view(), cmd.getArg(0), false, false)
+ ? DispatchResult(true, true) : DispatchResult(false);
+ break;
}
- break;
default:
- result = UNDISPATCHED;
+ result = DispatchResult(false);
}
- if (result == DISPATCHED)
- bv->updateInset(this);
+ if (result == DispatchResult(true, true))
+ bv->update();
mathcursor->normalize();
mathcursor->touch();
- lyx::Assert(mathcursor);
+ BOOST_ASSERT(mathcursor);
if (mathcursor->selection() || was_selection)
toggleInsetSelection(bv);
- if (result == DISPATCHED || result == DISPATCHED_NOUPDATE ||
- result == UNDISPATCHED) {
- fitInsetCursor(bv);
+ if (result.dispatched()) {
revealCodes(bv);
cmd.view()->stuffClipboard(mathcursor->grabSelection());
} else {
releaseMathCursor(bv);
- bv->unlockInset(this);
if (remove_inset)
bv->owner()->dispatch(FuncRequest(LFUN_DELETE));
}
}
-Inset::Code InsetFormulaBase::lyxCode() const
+InsetOld::Code InsetFormulaBase::lyxCode() const
{
- return Inset::MATH_CODE;
+ return InsetOld::MATH_CODE;
}
#warning pretty ugly
#endif
static InsetFormulaBase * lastformula = 0;
- static MathIterator current = MathIterator(ibegin(par().nucleus()));
+ static CursorBase current = CursorBase(ibegin(par().nucleus()));
static MathArray ar;
static string laststr;
if (lastformula != this || laststr != str) {
- //lyxerr << "reset lastformula to " << this << "\n";
+ //lyxerr << "reset lastformula to " << this << endl;
lastformula = this;
laststr = str;
current = ibegin(par().nucleus());
ar.clear();
mathed_parse_cell(ar, str);
} else {
- ++current;
+ increment(current);
}
//lyxerr << "searching '" << str << "' in " << this << ar << endl;
- for (MathIterator it = current; it != iend(par().nucleus()); ++it) {
- if (it.cell().matchpart(ar, it.back().pos_)) {
- bv->unlockInset(bv->theLockingInset());
- if (!bv->lockInset(this)) {
- lyxerr << "Cannot lock inset" << endl;
- return false;
- }
+ for (CursorBase it = current; it != iend(par().nucleus()); increment(it)) {
+ CursorSlice & top = it.back();
+ MathArray const & a = top.asMathInset()->cell(top.idx_);
+ if (a.matchpart(ar, top.pos_)) {
delete mathcursor;
mathcursor = new MathCursor(this, true);
//metrics(bv);
mathcursor->setSelection(it, ar.size());
current = it;
- it.jump(ar.size());
- bv->updateInset(this);
+ top.pos_ += ar.size();
+ bv->update();
return true;
}
}
- //lyxerr << "not found!\n";
+ //lyxerr << "not found!" << endl;
lastformula = 0;
return false;
}
bool InsetFormulaBase::searchBackward(BufferView * bv, string const & what,
bool a, bool b)
{
- lyxerr[Debug::MATHED] << "searching backward not implemented in mathed\n";
+ lyxerr[Debug::MATHED] << "searching backward not implemented in mathed" << endl;
return searchForward(bv, what, a, b);
}
// sel = "";
//else
- string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false);
+ string sel = bv->getLyXText()->selectionAsString(*bv->buffer(), false);
if (sel.empty()) {
InsetFormula * f = new InsetFormula(bv);
if (openNewInset(bv, f)) {
- bv->theLockingInset()->
- localDispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
+ bv->fullCursor().innerInset()->
+ dispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
// don't do that also for LFUN_MATH_MODE unless you want end up with
// always changing to mathrm when opening an inlined inset
// -- I really hate "LyXfunc overloading"...
if (display)
- f->localDispatch(FuncRequest(bv, LFUN_MATH_DISPLAY));
- f->localDispatch(FuncRequest(bv, LFUN_INSERT_MATH, cmd.argument));
+ f->dispatch(FuncRequest(bv, LFUN_MATH_DISPLAY));
+ f->dispatch(FuncRequest(bv, LFUN_INSERT_MATH, cmd.argument));
}
} else {
// create a macro if we see "\\newcommand" somewhere, and an ordinary
else {
string s = cmd.argument;
string const s1 = token(s, ' ', 1);
- int const na = s1.empty() ? 0 : lyx::atoi(s1);
- openNewInset(bv, new InsetFormulaMacro(token(s, ' ', 0), na));
+ int const nargs = s1.empty() ? 0 : atoi(s1);
+ string const s2 = token(s, ' ', 2);
+ string const type = s2.empty() ? "newcommand" : s2;
+ openNewInset(bv, new InsetFormulaMacro(token(s, ' ', 0), nargs, s2));
}
break;
case LFUN_MATH_DELIM: {
InsetFormula * f = new InsetFormula(bv);
if (openNewInset(bv, f)) {
- bv->theLockingInset()->
- localDispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
- bv->theLockingInset()->localDispatch(cmd);
+ UpdatableInset * inset = bv->fullCursor().innerInset();
+ inset->dispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
+ inset->dispatch(cmd);
}
break;
}
projects / lyx.git / blobdiff