#include "Lsstream.h"
#include "support/LAssert.h"
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "formula.h"
#include "formulamacro.h"
#include "lyxrc.h"
-#include "commandtags.h"
+#include "funcrequest.h"
#include "BufferView.h"
#include "lyxtext.h"
-#include "lyxfunc.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "debug.h"
#include "math_support.h"
+#include "metricsinfo.h"
#include "support/lstrings.h"
#include "frontends/LyXView.h"
#include "frontends/font_metrics.h"
#include "textpainter.h"
#include "frontends/Dialogs.h"
#include "intl.h"
-#include "insets/insetcommandparams.h"
#include "ref_inset.h"
using std::endl;
using std::ostream;
using std::vector;
using std::abs;
+using std::max;
MathCursor * mathcursor = 0;
InsetFormulaBase::InsetFormulaBase()
- : view_(0), font_(), xo_(0), yo_(0)
+ : font_(), 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 MathMetricsInfo: " << sizeof(MathMetricsInfo) << "\n";
+ //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << "\n";
//lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << "\n";
//lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << "\n";
}
view_->owner()->getIntl()->getTransManager().TranslateAndInsert(*cit, lt);
// remove ourselves
- //view_->owner()->getLyXFunc()->dispatch(LFUN_ESCAPE);
+ //view_->owner()->dispatch(LFUN_ESCAPE);
#endif
}
void InsetFormulaBase::handleFont
(BufferView * bv, string const & arg, string const & font)
{
+ // this whole function is a hack and won't work for incremental font
+ // changes...
bv->lockedInsetStoreUndo(Undo::EDIT);
- bool sel = mathcursor->selection();
- if (sel)
- updateLocal(bv, true);
- mathcursor->handleNest(createMathInset(font));
- mathcursor->insert(arg);
- if (!sel)
- updateLocal(bv, false);
+ if (mathcursor->par()->name() == font)
+ mathcursor->handleFont(font);
+ else {
+ mathcursor->handleNest(createMathInset(font));
+ mathcursor->insert(arg);
+ }
+}
+
+
+BufferView * InsetFormulaBase::view() const
+{
+ return view_.lock().get();
}
-// Check if uses AMS macros
void InsetFormulaBase::validate(LaTeXFeatures &) const
{}
void InsetFormulaBase::metrics(BufferView * bv) const
{
if (bv)
- view_ = bv;
- MathMetricsInfo mi;
- mi.view = view_;
- //mi.base.style = display() ? LM_ST_DISPLAY : LM_ST_TEXT;
+ view_ = bv->owner()->view();
+ MetricsInfo mi;
mi.base.style = LM_ST_TEXT;
mi.base.font = font_;
mi.base.font.setColor(LColor::math);
releaseMathCursor(bv);
mathcursor = new MathCursor(this, true);
metrics(bv);
- mathcursor->setPos(x, y);
- //lyxerr << "setting pos to " << x << "," << y << "\n";
-
+ mathcursor->setPos(x + xo_, y + yo_);
// if that is removed, we won't get the magenta box when entering an
// inset for the first time
- bv->updateInset(this, false);
+ bv->updateInset(this);
}
releaseMathCursor(bv);
mathcursor = new MathCursor(this, front);
metrics(bv);
- bv->updateInset(this, false);
+ bv->updateInset(this);
}
if (mathcursor) {
if (mathcursor->inMacroMode()) {
mathcursor->macroModeClose();
- updateLocal(bv, true);
+ bv->updateInset(this);
}
releaseMathCursor(bv);
}
- bv->updateInset(this, false);
+ generatePreview();
+ bv->updateInset(this);
}
-void InsetFormulaBase::getCursorPos(BufferView * bv, int & x, int & y) const
+void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
{
- metrics(bv);
+ // 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;
+ return;
+ }
mathcursor->getPos(x, y);
- //x -= xo_;
+ x = mathcursor->targetX();
+ x -= xo_;
y -= yo_;
- //lyxerr << "getCursorPos: " << x << " " << y << "\n";
+ //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
}
void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
{
- //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
+ if (!mathcursor) {
+ lyxerr[Debug::MATHED] << "toggleInsetCursor impossible" << endl;
+ return;
+ }
+ //lyxerr << "toggleInsetCursor: " << isCursorVisible() << endl;
if (isCursorVisible())
hideInsetCursor(bv);
else
void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
{
+ if (!mathcursor) {
+ lyxerr << "showInsetCursor impossible" << endl;
+ return;
+ }
if (isCursorVisible())
return;
- fitInsetCursor(bv);
int x, y, asc, des;
- getCursorPos(bv, x, y);
+ mathcursor->getPos(x, y);
math_font_max_dim(font_, asc, des);
- bv->showLockedInsetCursor(x, y, asc, des);
+ bv->showLockedInsetCursor(x, y - yo_, asc, des);
setCursorVisible(true);
- //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
+ //lyxerr << "showInsetCursor: " << x << ' ' << y << endl;
}
void InsetFormulaBase::hideInsetCursor(BufferView * bv)
{
+ if (!mathcursor)
+ return;
if (!isCursorVisible())
return;
bv->hideLockedInsetCursor();
setCursorVisible(false);
- //lyxerr << "hideInsetCursor: \n";
+ //lyxerr << "hideInsetCursor: " << endl;
}
math_font_max_dim(font_, asc, des);
getCursorPos(bv, x, y);
//y += yo_;
- //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
+ //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, false);
+ bv->updateInset(this);
}
}
-void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
-{
- metrics(bv);
- if (mathcursor)
- bv->fitCursor();
- bv->updateInset(this, dirty);
-}
-
-
-bool InsetFormulaBase::insetButtonRelease(BufferView * bv,
- int /*x*/, int /*y*/, mouse_button::state button)
+dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
{
if (!mathcursor)
- return false;
+ return UNDISPATCHED;
- //lyxerr << "insetButtonRelease: " << x << " " << y << "\n";
+ BufferView * bv = cmd.view();
hideInsetCursor(bv);
showInsetCursor(bv);
- bv->updateInset(this, false);
+ bv->updateInset(this);
+ //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
- if (button == mouse_button::button3) {
+ if (cmd.button() == mouse_button::button3) {
// try to dispatch to enclosed insets first
- if (mathcursor->dispatch("mouse-3-release"))
- return true;
+ if (mathcursor->dispatch(cmd) == UNDISPATCHED) {
+ // launch math panel for right mouse button
+ lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
+ bv->owner()->getDialogs().showMathPanel();
+ }
+ return DISPATCHED;
+ }
- // launch math panel for right mouse button
- bv->owner()->getDialogs()->showMathPanel();
- return true;
+ if (cmd.button() == mouse_button::button2) {
+ mathcursor->selClear();
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ mathcursor->insert(asArray(bv->getClipboard()));
+ bv->updateInset(this);
+ return DISPATCHED;
}
- if (button == mouse_button::button1) {
+ if (cmd.button() == mouse_button::button1) {
// try to dispatch to enclosed insets first
- if (mathcursor->dispatch("mouse-1-release"))
- return true;
-
+ mathcursor->dispatch(cmd);
+ cmd.view()->stuffClipboard(mathcursor->grabSelection());
// try to set the cursor
//delete mathcursor;
//mathcursor = new MathCursor(this, x == 0);
//metrics(bv);
//mathcursor->setPos(x + xo_, y + yo_);
- return true;
+ return DISPATCHED;
}
- return false;
+
+ return UNDISPATCHED;
}
-void InsetFormulaBase::insetButtonPress(BufferView * bv,
- int x, int y, mouse_button::state button)
+dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
- //lyxerr << "insetButtonPress: "
- // << x << " " << y << " but: " << button << "\n";
- //lyxerr << "formula: ";
- par()->dump();
-
- releaseMathCursor(bv);
- mathcursor = new MathCursor(this, x == 0);
+ BufferView * bv = cmd.view();
+ //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
- if (button == mouse_button::button1) {
- // just set the cursor here
- lyxerr << "setting cursor\n";
+ if (!mathcursor || mathcursor->formula() != this) {
+ lyxerr[Debug::MATHED] << "re-create cursor" << endl;
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, cmd.x == 0);
metrics(bv);
- first_x = x;
- first_y = y;
- mathcursor->selClear();
- mathcursor->setPos(x + xo_, y + yo_);
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ }
- if (mathcursor->dispatch("mouse-1-press")) {
- //delete mathcursor;
- return;
- }
-
+ if (cmd.button() == mouse_button::button3) {
+ mathcursor->dispatch(cmd);
+ return DISPATCHED;
}
- if (button == mouse_button::button3) {
- if (mathcursor->dispatch("mouse-3-press")) {
- //delete mathcursor;
- return;
- }
+
+ if (cmd.button() == mouse_button::button1) {
+ first_x = cmd.x;
+ first_y = cmd.y;
+ mathcursor->selClear();
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ mathcursor->dispatch(cmd);
+ return DISPATCHED;
}
- bv->updateInset(this, false);
+
+ bv->updateInset(this);
+ return DISPATCHED;
}
-void InsetFormulaBase::insetMotionNotify(BufferView * bv,
- int x, int y, mouse_button::state button)
+dispatch_result InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
{
if (!mathcursor)
- return;
+ return DISPATCHED;
- if (button == mouse_button::button1)
- if (mathcursor->dispatch("mouse-1-motion"))
- return;
+ if (mathcursor->dispatch(FuncRequest(cmd)) != UNDISPATCHED)
+ return DISPATCHED;
- if (button == mouse_button::button3)
- if (mathcursor->dispatch("mouse-3-motion"))
- return;
+ // only select with button 1
+ if (cmd.button() != mouse_button::button1)
+ return DISPATCHED;
- if (abs(x - first_x) < 2 && abs(y - first_y) < 2) {
- //lyxerr << "insetMotionNotify: ignored\n";
- return;
- }
- first_x = x;
- first_y = y;
+ if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
+ return DISPATCHED;
+
+ first_x = cmd.x;
+ first_y = cmd.y;
if (!mathcursor->selection())
mathcursor->selStart();
- //lyxerr << "insetMotionNotify: " << x + xo_ << ' ' << y + yo_
- // << ' ' << button << "\n";
+ BufferView * bv = cmd.view();
hideInsetCursor(bv);
- mathcursor->setPos(x + xo_, y + yo_);
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
showInsetCursor(bv);
- bv->updateInset(this, false);
+ bv->updateInset(this);
+ return DISPATCHED;
}
-UpdatableInset::RESULT
-InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
- string const & arg)
+dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
{
- //lyxerr << "InsetFormulaBase::localDispatch: act: " << action
- // << " arg: '" << arg
- // << "' cursor: " << mathcursor << "\n";
+ //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
+ // << " arg: '" << cmd.argument
+ // << " x: '" << cmd.x
+ // << " y: '" << cmd.y
+ // << "' button: " << cmd.button() << endl;
+
+ // delete empty mathbox (LFUN_BACKSPACE and LFUN_DELETE)
+ bool remove_inset = false;
+
+ switch (cmd.action) {
+ case LFUN_MOUSE_PRESS:
+ //lyxerr << "Mouse single press\n";
+ return lfunMousePress(cmd);
+ case LFUN_MOUSE_MOTION:
+ //lyxerr << "Mouse motion\n";
+ return lfunMouseMotion(cmd);
+ case LFUN_MOUSE_RELEASE:
+ //lyxerr << "Mouse single release\n";
+ return lfunMouseRelease(cmd);
+ case LFUN_MOUSE_DOUBLE:
+ //lyxerr << "Mouse double\n";
+ return localDispatch(FuncRequest(LFUN_WORDSEL));
+ default:
+ break;
+ }
if (!mathcursor)
return UNDISPATCHED;
+ BufferView * bv = cmd.view();
+ string argument = cmd.argument;
RESULT result = DISPATCHED;
bool sel = false;
bool was_macro = mathcursor->inMacroMode();
mathcursor->normalize();
mathcursor->touch();
- switch (action) {
+ switch (cmd.action) {
+
+ case LFUN_MATH_MUTATE:
+ case LFUN_MATH_DISPLAY:
+ case LFUN_MATH_NUMBER:
+ case LFUN_MATH_NONUMBER:
+ case LFUN_CELL_SPLIT:
+ case LFUN_BREAKLINE:
+ case LFUN_DELETE_LINE_FORWARD:
+ case LFUN_INSERT_LABEL:
+ case LFUN_MATH_EXTERN:
+ case LFUN_TABULAR_FEATURE:
+ case LFUN_PASTESELECTION:
+ case LFUN_MATH_LIMITS:
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ mathcursor->dispatch(cmd);
+ break;
- case LFUN_WORDRIGHTSEL:
case LFUN_RIGHTSEL:
sel = true; // fall through...
case LFUN_RIGHT:
result = mathcursor->right(sel) ? DISPATCHED : FINISHED_RIGHT;
//lyxerr << "calling scroll 20\n";
//scroll(bv, 20);
- updateLocal(bv, false);
// write something to the minibuffer
//bv->owner()->message(mathcursor->info());
break;
- case LFUN_WORDLEFTSEL:
case LFUN_LEFTSEL:
sel = true; // fall through
case LFUN_LEFT:
result = mathcursor->left(sel) ? DISPATCHED : FINISHED;
- updateLocal(bv, false);
break;
case LFUN_UPSEL:
sel = true; // fall through
case LFUN_UP:
result = mathcursor->up(sel) ? DISPATCHED : FINISHED_UP;
- updateLocal(bv, false);
break;
case LFUN_DOWNSEL:
sel = true; // fall through
case LFUN_DOWN:
result = mathcursor->down(sel) ? DISPATCHED : FINISHED_DOWN;
- updateLocal(bv, false);
+ break;
+
+ case LFUN_WORDSEL:
+ mathcursor->home(false);
+ mathcursor->end(true);
+ break;
+
+ case LFUN_UP_PARAGRAPHSEL:
+ case LFUN_UP_PARAGRAPH:
+ case LFUN_DOWN_PARAGRAPHSEL:
+ case LFUN_DOWN_PARAGRAPH:
+ result = FINISHED;
break;
case LFUN_HOMESEL:
+ case LFUN_WORDLEFTSEL:
sel = true; // fall through
case LFUN_HOME:
+ case LFUN_WORDLEFT:
result = mathcursor->home(sel) ? DISPATCHED : FINISHED;
- updateLocal(bv, false);
break;
case LFUN_ENDSEL:
+ case LFUN_WORDRIGHTSEL:
sel = true; // fall through
case LFUN_END:
- result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
- updateLocal(bv, false);
+ case LFUN_WORDRIGHT:
+ result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
break;
case LFUN_PRIORSEL:
case LFUN_PRIOR:
- result = FINISHED_UP;
- updateLocal(bv, false);
+ case LFUN_BEGINNINGBUFSEL:
+ case LFUN_BEGINNINGBUF:
+ result = FINISHED;
break;
case LFUN_NEXTSEL:
case LFUN_NEXT:
- result = FINISHED_DOWN;
- updateLocal(bv, false);
- break;
-
- case LFUN_DELETE_LINE_FORWARD:
- bv->lockedInsetStoreUndo(Undo::DELETE);
- mathcursor->delLine();
- updateLocal(bv, true);
+ case LFUN_ENDBUFSEL:
+ case LFUN_ENDBUF:
+ result = FINISHED_RIGHT;
break;
- case LFUN_TAB:
+ case LFUN_CELL_FORWARD:
mathcursor->idxNext();
- updateLocal(bv, false);
break;
- case LFUN_SHIFT_TAB:
+ case LFUN_CELL_BACKWARD:
mathcursor->idxPrev();
- updateLocal(bv, false);
- break;
-
- case LFUN_TABINSERT:
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->splitCell();
- updateLocal(bv, true);
break;
case LFUN_DELETE_WORD_BACKWARD:
case LFUN_BACKSPACE:
- bv->lockedInsetStoreUndo(Undo::DELETE);
- mathcursor->backspace();
- updateLocal(bv, true);
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ if (!mathcursor->backspace()) {
+ result = FINISHED;
+ remove_inset = true;
+ }
break;
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE:
- bv->lockedInsetStoreUndo(Undo::DELETE);
- mathcursor->erase();
- bv->updateInset(this, true);
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ if (!mathcursor->erase()) {
+ result = FINISHED;
+ remove_inset = true;
+ }
break;
// case LFUN_GETXY:
lyxerr << "LFUN_SETXY broken!\n";
int x = 0;
int y = 0;
- istringstream is(arg.c_str());
+ istringstream is(cmd.argument.c_str());
is >> x >> y;
mathcursor->setPos(x, y);
- updateLocal(bv, false);
break;
}
- case LFUN_PASTE:
+ case LFUN_PASTE: {
+ int n = 0;
+ istringstream is(cmd.argument.c_str());
+ is >> n;
if (was_macro)
mathcursor->macroModeClose();
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->selPaste();
- updateLocal(bv, true);
+ mathcursor->selPaste(n);
break;
+ }
case LFUN_CUT:
bv->lockedInsetStoreUndo(Undo::DELETE);
mathcursor->selCut();
- updateLocal(bv, true);
break;
case LFUN_COPY:
// Special casing for superscript in case of LyX handling
// dead-keys:
case LFUN_CIRCUMFLEX:
- if (arg.empty()) {
+ if (cmd.argument.empty()) {
// do superscript if LyX handles
// deadkeys
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->script(true);
- updateLocal(bv, true);
}
break;
break;
// Math fonts
- case LFUN_GREEK_TOGGLE: handleFont(bv, arg, "lyxgreek"); break;
- case LFUN_BOLD: handleFont(bv, arg, "textbf"); break;
- case LFUN_SANS: handleFont(bv, arg, "textsf"); break;
- case LFUN_EMPH: handleFont(bv, arg, "mathcal"); break;
- case LFUN_ROMAN: handleFont(bv, arg, "mathrm"); break;
- case LFUN_CODE: handleFont(bv, arg, "texttt"); break;
- case LFUN_FRAK: handleFont(bv, arg, "mathfrak"); break;
- case LFUN_ITAL: handleFont(bv, arg, "mathit"); break;
- case LFUN_NOUN: handleFont(bv, arg, "mathbb"); break;
- case LFUN_DEFAULT: handleFont(bv, arg, "textnormal"); break;
- case LFUN_FREE: handleFont(bv, arg, "textrm"); break;
-
- case LFUN_GREEK:
- handleFont(bv, arg, "lyxgreek1");
- if (arg.size())
- mathcursor->interpret(arg);
- 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_ROMAN: handleFont(bv, cmd.argument, "mathrm"); break;
+ case LFUN_CODE: handleFont(bv, cmd.argument, "texttt"); 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_DEFAULT: handleFont(bv, cmd.argument, "textnormal"); break;
case LFUN_MATH_MODE:
- if (mathcursor->currentMode()) {
- handleFont(bv, arg, "textrm");
- } else {
+ if (mathcursor->currentMode() == MathInset::TEXT_MODE)
mathcursor->niceInsert(MathAtom(new MathHullInset("simple")));
- updateLocal(bv, true);
- }
+ else
+ handleFont(bv, cmd.argument, "textrm");
//bv->owner()->message(_("math text mode toggled"));
break;
- case LFUN_MATH_LIMITS:
- bv->lockedInsetStoreUndo(Undo::EDIT);
- if (mathcursor->toggleLimits())
- updateLocal(bv, true);
- break;
-
case LFUN_MATH_SIZE:
#if 0
if (!arg.empty()) {
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->setSize(arg);
- updateLocal(bv, true);
}
#endif
break;
- case LFUN_INSERT_MATRIX:
- if (!arg.empty()) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->interpret("matrix " + arg);
- updateLocal(bv, true);
- }
+ case LFUN_INSERT_MATRIX: {
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ unsigned int m = 1;
+ unsigned int n = 1;
+ string v_align;
+ string h_align;
+ istringstream is(STRCONV(argument));
+ is >> m >> n >> v_align >> h_align;
+ m = max(1u, m);
+ n = max(1u, n);
+ v_align += 'c';
+ mathcursor->niceInsert(
+ MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
break;
+ }
case LFUN_SUPERSCRIPT:
case LFUN_SUBSCRIPT:
{
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->script(action == LFUN_SUPERSCRIPT);
- updateLocal(bv, true);
+ mathcursor->script(cmd.action == LFUN_SUPERSCRIPT);
break;
}
{
//lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
string ls;
- string rs = split(arg, ls, ' ');
+ string rs = split(cmd.argument, ls, ' ');
// Reasonable default values
if (ls.empty())
ls = '(';
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->handleNest(MathAtom(new MathDelimInset(ls, rs)));
- updateLocal(bv, true);
break;
}
case LFUN_MATH_SPACE:
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->insert(MathAtom(new MathSpaceInset(",")));
- updateLocal(bv, true);
break;
case LFUN_UNDO:
break;
- case LFUN_MATH_HALIGN:
- case LFUN_MATH_VALIGN:
- case LFUN_MATH_ROW_INSERT:
- case LFUN_MATH_ROW_DELETE:
- case LFUN_MATH_COLUMN_INSERT:
- case LFUN_MATH_COLUMN_DELETE:
- {
- MathInset::idx_type idx = 0;
- MathGridInset * p = mathcursor ? mathcursor->enclosingGrid(idx) : 0;
- if (p) {
- mathcursor->popToEnclosingGrid();
- bv->lockedInsetStoreUndo(Undo::EDIT);
- char align = arg.size() ? arg[0] : 'c';
- switch (action) {
- case LFUN_MATH_HALIGN: p->halign(align, p->col(idx)); break;
- case LFUN_MATH_VALIGN: p->valign(align); break;
- case LFUN_MATH_ROW_INSERT: p->addRow(p->row(idx)); break;
- case LFUN_MATH_ROW_DELETE: p->delRow(p->row(idx)); break;
- case LFUN_MATH_COLUMN_INSERT: p->addFancyCol(p->col(idx)); break;
- case LFUN_MATH_COLUMN_DELETE: p->delFancyCol(p->col(idx)); break;
- default: ;
- }
- updateLocal(bv, true);
- }
- break;
- }
-
case LFUN_EXEC_COMMAND:
result = UNDISPATCHED;
break;
- case LFUN_BREAKPARAGRAPH:
- case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- //lyxerr << "LFUN ignored\n";
- break;
-
case LFUN_INSET_ERT:
// interpret this as if a backslash was typed
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->interpret('\\');
- updateLocal(bv, true);
break;
- case -1:
+ case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+ case LFUN_BREAKPARAGRAPH_SKIP:
+ argument = "\n";
+ // fall through
+
+// FIXME: We probably should swap parts of "math-insert" and "self-insert"
+// 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);
+ mathcursor->niceInsert(argument);
+ break;
+
+ case -1:
case LFUN_SELFINSERT:
- if (!arg.empty()) {
+ if (!argument.empty()) {
bv->lockedInsetStoreUndo(Undo::EDIT);
- if (arg.size() == 1)
- result = mathcursor->interpret(arg[0]) ? DISPATCHED : FINISHED_RIGHT;
+ if (argument.size() == 1)
+ result = mathcursor->interpret(argument[0]) ? DISPATCHED : FINISHED_RIGHT;
else
- result = mathcursor->interpret(arg) ? DISPATCHED : FINISHED_RIGHT;
- updateLocal(bv, true);
+ mathcursor->insert(asArray(argument));
}
break;
case LFUN_INSET_TOGGLE:
mathcursor->insetToggle();
- updateLocal(bv, true);
break;
- case LFUN_REF_INSERT:
- //if (argument.empty()) {
- // InsetCommandParams p("ref");
- // owner_->getDialogs()->createRef(p.getAsString());
- //} else {
- // InsetCommandParams p;
- // p.setFromString(argument);
-
- // InsetRef * inset = new InsetRef(p, *buffer_);
- // if (!insertInset(inset))
- // delete inset;
- // else
- // updateInset(inset, true);
- //}
- //
- if (arg.empty()) {
- InsetCommandParams p("ref");
- bv->owner()->getDialogs()->createRef(p.getAsString());
+ case LFUN_DIALOG_SHOW_NEW_INSET: {
+ string const & name = argument;
+ string data;
+ if (name == "ref") {
+ RefInset tmp(name);
+ data = tmp.createDialogStr(name);
+ }
+
+ if (data.empty())
+ result = UNDISPATCHED;
+ else {
+ bv->owner()->getDialogs().show(name, data, 0);
+ }
+ }
+ break;
+
+ case LFUN_INSET_APPLY: {
+ string const name = cmd.getArg(0);
+ InsetBase * base =
+ bv->owner()->getDialogs().getOpenInset(name);
+
+ if (base) {
+ FuncRequest fr(bv, LFUN_INSET_MODIFY, cmd.argument);
+ result = base->localDispatch(fr);
} else {
- //mathcursor->handleNest(new InsetRef2);
- //mathcursor->insert(arg);
- mathcursor->insert(MathAtom(new RefInset(arg)));
+ MathArray ar;
+ if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+ mathcursor->insert(ar);
+ result = DISPATCHED;
+ } else {
+ result = UNDISPATCHED;
+ }
}
- updateLocal(bv, true);
- break;
+ }
+ break;
default:
result = UNDISPATCHED;
}
+ if (result == DISPATCHED)
+ bv->updateInset(this);
+
mathcursor->normalize();
mathcursor->touch();
fitInsetCursor(bv);
showInsetCursor(bv);
revealCodes(bv);
+ cmd.view()->stuffClipboard(mathcursor->grabSelection());
} else {
releaseMathCursor(bv);
bv->unlockInset(this);
+ if (remove_inset)
+ bv->owner()->dispatch(FuncRequest(LFUN_DELETE));
}
return result; // original version
int InsetFormulaBase::ylow() const
{
- return yo_ - ascent(view_, font_);
+ return yo_ - ascent(view(), font_);
}
int InsetFormulaBase::yhigh() const
{
- return yo_ + descent(view_, font_);
+ return yo_ + descent(view(), font_);
}
int InsetFormulaBase::xhigh() const
{
- return xo_ + width(view_, font_);
+ return xo_ + width(view(), font_);
}
mathcursor->setSelection(it, ar.size());
current = it;
it.jump(ar.size());
- updateLocal(bv, false);
+ bv->updateInset(this);
return true;
}
}
}
-/////////////////////////////////////////////////////////////////////
+bool InsetFormulaBase::display() const
+{
+ return par()->asHullInset() && par()->asHullInset()->display();
+}
-void mathDispatchCreation(BufferView * bv, string const & arg, bool display)
+string InsetFormulaBase::selectionAsString() const
{
- if (!bv->available())
- return;
+ return mathcursor ? mathcursor->grabSelection() : string();
+}
+
+/////////////////////////////////////////////////////////////////////
+
+void mathDispatchCreation(FuncRequest const & cmd, bool display)
+{
+ BufferView * bv = cmd.view();
// use selection if available..
//string sel;
//if (action == LFUN_MATH_IMPORT_SELECTION)
if (sel.empty()) {
InsetFormula * f = new InsetFormula(bv);
if (openNewInset(bv, f)) {
- f->mutate("simple");
+ bv->theLockingInset()->
+ localDispatch(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(bv, LFUN_MATH_DISPLAY, string());
- f->localDispatch(bv, LFUN_INSERT_MATH, arg);
+ f->localDispatch(FuncRequest(bv, LFUN_MATH_DISPLAY));
+ f->localDispatch(FuncRequest(bv, LFUN_INSERT_MATH, cmd.argument));
}
} else {
// create a macro if we see "\\newcommand" somewhere, and an ordinary
bv->getLyXText()->cutSelection(bv);
openNewInset(bv, f);
}
- bv->owner()->getLyXFunc()->setMessage(N_("Math editor mode"));
+ cmd.message(N_("Math editor mode"));
}
-void mathDispatchMathDisplay(BufferView * bv, string const & arg)
-{
- mathDispatchCreation(bv, arg, true);
-}
-
-
-void mathDispatchMathMode(BufferView * bv, string const & arg)
-{
- mathDispatchCreation(bv, arg, false);
-}
-
-
-void mathDispatchMathImportSelection(BufferView * bv, string const & arg)
-{
- mathDispatchCreation(bv, arg, true);
-}
-
-
-void mathDispatchMathMacro(BufferView * bv, string const & arg)
+void mathDispatch(FuncRequest const & cmd)
{
+ BufferView * bv = cmd.view();
if (!bv->available())
return;
- if (arg.empty())
- bv->owner()->getLyXFunc()->setErrorMessage(N_("Missing argument"));
- else {
- string s = arg;
- string const s1 = token(s, ' ', 1);
- int const na = s1.empty() ? 0 : lyx::atoi(s1);
- openNewInset(bv, new InsetFormulaMacro(token(s, ' ', 0), na));
- }
-}
-
-
-void mathDispatchMathDelim(BufferView * bv, string const & arg)
-{
- if (!bv->available())
- return;
- InsetFormula * f = new InsetFormula(bv);
- if (openNewInset(bv, f)) {
- f->mutate("simple");
- bv->theLockingInset()->localDispatch(bv, LFUN_MATH_DELIM, arg);
- }
-}
+ switch (cmd.action) {
-void mathDispatchInsertMatrix(BufferView * bv, string const & arg)
-{
- if (!bv->available())
- return;
- InsetFormula * f = new InsetFormula(bv);
- if (openNewInset(bv, f)) {
- f->mutate("simple");
- bv->theLockingInset()->localDispatch(bv, LFUN_INSERT_MATRIX, arg);
- }
-}
+ case LFUN_MATH_DISPLAY:
+ mathDispatchCreation(cmd, true);
+ break;
+ case LFUN_MATH_MODE:
+ mathDispatchCreation(cmd, false);
+ break;
-void mathDispatchInsertMath(BufferView * bv, string const & arg)
-{
- if (!bv->available())
- return;
- InsetFormula * f = new InsetFormula(bv);
- if (openNewInset(bv, f)) {
- f->mutate("simple");
- bv->theLockingInset()->localDispatch(bv, LFUN_INSERT_MATH, arg);
- }
-}
+ case LFUN_MATH_IMPORT_SELECTION:
+ mathDispatchCreation(cmd, false);
+ break;
+ case LFUN_MATH_MACRO:
+ if (cmd.argument.empty())
+ cmd.errorMessage(N_("Missing argument"));
+ 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));
+ }
+ break;
+
+ case LFUN_INSERT_MATH:
+ case LFUN_INSERT_MATRIX:
+ 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);
+ }
+ break;
+ }
-void mathDispatchGreek(BufferView * bv, string const & arg)
-{
- if (!bv->available())
- return;
- InsetFormula * f = new InsetFormula(bv);
- if (openNewInset(bv, f)) {
- f->mutate("simple");
- bv->theLockingInset()->localDispatch(bv, LFUN_GREEK, arg);
- bv->unlockInset(f);
+ default:
+ break;
}
}
-
-
-void mathDispatch(BufferView *, kb_action, string const &)
-{}
-
-
-void mathDispatch(BufferView *, string const &)
-{}
projects / lyx.git / blobdiff