#include "formula.h"
#include "formulamacro.h"
-#include "commandtags.h"
+#include "lyxrc.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 "math_metricsinfo.h"
#include "support/lstrings.h"
-#include "LyXView.h"
-#include "Painter.h"
-#include "font.h"
+#include "frontends/LyXView.h"
+#include "frontends/font_metrics.h"
+#include "frontends/mouse_state.h"
+#include "Lsstream.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_pos.h"
#include "math_spaceinset.h"
#include "undo_funcs.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;
MathCursor * mathcursor = 0;
namespace {
-
// local global
int first_x;
int first_y;
-int hack_x;
-int hack_y;
-int hack_button;
-
-
-void handleFont(BufferView * bv, MathTextCodes t)
-{
- if (mathcursor->selection())
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->handleFont(t);
-}
-
-void handleAccent(BufferView * bv, string const & name)
-{
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->insert(createMathInset(name));
-}
bool openNewInset(BufferView * bv, UpdatableInset * new_inset)
delete new_inset;
return false;
}
- new_inset->edit(bv, 0, 0, 0);
+ new_inset->edit(bv, true);
return true;
}
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
- MathMacroTable::builtinMacros();
+ initMath();
//lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
+ //lyxerr << "sizeof MathMetricsInfo: " << sizeof(MathMetricsInfo) << "\n";
+ //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << "\n";
+ //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << "\n";
+}
+
+
+// simply scrap this function if you want
+void InsetFormulaBase::mutateToText()
+{
+#if 0
+ // translate to latex
+ ostringstream os;
+ latex(NULL, os, false, false);
+ string str = os.str();
+
+ // insert this text
+ LyXText * lt = view_->getLyXText();
+ string::const_iterator cit = str.begin();
+ string::const_iterator end = str.end();
+ for (; cit != end; ++cit)
+ view_->owner()->getIntl()->getTransManager().TranslateAndInsert(*cit, lt);
+
+ // remove ourselves
+ //view_->owner()->dispatch(LFUN_ESCAPE);
+#endif
+}
+
+
+void InsetFormulaBase::handleFont
+ (BufferView * bv, string const & arg, string const & font)
+{
+ 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);
}
{}
-void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const
+void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const
{
font_ = f;
metrics(bv);
}
-void InsetFormulaBase::metrics(BufferView * bv) const
+void InsetFormulaBase::metrics(BufferView * bv) const
{
if (bv)
- view_ = bv;
- MathMetricsInfo mi(view_, font_, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+ view_ = bv->owner()->view();
+ MathMetricsInfo mi;
+ mi.base.style = LM_ST_TEXT;
+ mi.base.font = font_;
+ mi.base.font.setColor(LColor::math);
par()->metrics(mi);
}
}
-void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int)
+void InsetFormulaBase::edit(BufferView * bv, int x, int y, mouse_button::state)
{
if (!bv->lockInset(this))
lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl;
-
- //lyxerr << "edit: " << x << " " << y << " button: " << button << "\n";
- if (!mathcursor) {
- mathcursor = new MathCursor(this, x == 0);
- metrics(bv);
- // handle ignored click
- if (hack_x || hack_y) {
- insetButtonPress(bv, hack_x, hack_y, hack_button);
- hack_x = hack_y = 0;
- }
- } else
- metrics(bv);
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, true);
+ metrics(bv);
+ 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);
void InsetFormulaBase::edit(BufferView * bv, bool front)
{
- // looks hackish but seems to work
- edit(bv, front ? 0 : 1, 0, 0);
+ if (!bv->lockInset(this))
+ lyxerr << "Cannot lock math inset in edit call!\n";
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, front);
+ metrics(bv);
+ bv->updateInset(this, false);
}
mathcursor->macroModeClose();
updateLocal(bv, true);
}
- delete mathcursor;
- mathcursor = 0;
+ releaseMathCursor(bv);
}
+ generatePreview();
bv->updateInset(this, false);
}
void InsetFormulaBase::getCursorPos(BufferView *, 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;
+ return;
+ }
mathcursor->getPos(x, y);
- x += xo_;
- y += yo_;
+ x = mathcursor->targetX();
+ x -= xo_;
+ y -= yo_;
//lyxerr << "getCursorPos: " << x << " " << y << "\n";
}
void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
{
- if (!mathcursor)
- return;
-
+ //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
if (isCursorVisible())
- bv->hideLockedInsetCursor();
- else {
- metrics(bv);
- int x;
- int y;
- mathcursor->getPos(x, y);
- y -= yo_;
- int asc = 0;
- int des = 0;
- MathMetricsInfo mi(bv, font_, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
- math_font_max_dim(LM_TC_TEXTRM, mi, asc, des);
- bv->showLockedInsetCursor(x, y, asc, des);
- //lyxerr << "toggleInsetCursor: " << x << " " << y << "\n";
- }
-
- toggleCursorVisible();
+ hideInsetCursor(bv);
+ else
+ showInsetCursor(bv);
}
{
if (isCursorVisible())
return;
- if (mathcursor) {
- metrics(bv);
- int x;
- int y;
- mathcursor->getPos(x, y);
- y -= yo_;
- int asc = 0;
- int des = 0;
- MathMetricsInfo mi(bv, font_, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
- math_font_max_dim(LM_TC_TEXTRM, mi, asc, des);
- bv->fitLockedInsetCursor(x, y, asc, des);
- //lyxerr << "showInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
- }
- toggleInsetCursor(bv);
+ fitInsetCursor(bv);
+ int x, y, asc, des;
+ mathcursor->getPos(x, y);
+ math_font_max_dim(font_, asc, des);
+ bv->showLockedInsetCursor(x, y - yo_, asc, des);
+ setCursorVisible(true);
+ //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
}
void InsetFormulaBase::hideInsetCursor(BufferView * bv)
{
- if (isCursorVisible())
- toggleInsetCursor(bv);
+ if (!isCursorVisible())
+ return;
+ bv->hideLockedInsetCursor();
+ setCursorVisible(false);
+ //lyxerr << "hideInsetCursor: \n";
+}
+
+
+void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
+{
+ if (!mathcursor)
+ return;
+ int x, y, asc, des;
+ math_font_max_dim(font_, asc, des);
+ getCursorPos(bv, x, y);
+ //y += yo_;
+ //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
+ bv->fitLockedInsetCursor(x, y, asc, des);
}
vector<string> const InsetFormulaBase::getLabelList() const
{
- return std::vector<string>();
+ return vector<string>();
}
void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
{
- metrics(bv);
bv->updateInset(this, dirty);
}
-bool InsetFormulaBase::insetButtonRelease(BufferView * bv,
- int /*x*/, int /*y*/, int /*button*/)
+Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
{
if (!mathcursor)
- return false;
- //lyxerr << "insetButtonRelease: " << x << " " << y << "\n";
+ return UNDISPATCHED;
+
+ BufferView * bv = cmd.view();
hideInsetCursor(bv);
showInsetCursor(bv);
bv->updateInset(this, false);
- return false;
+
+ if (cmd.button() == mouse_button::button3) {
+ // try to dispatch to enclosed insets first
+ if (mathcursor->dispatch(cmd) == MathInset::UNDISPATCHED) {
+ // launch math panel for right mouse button
+ bv->owner()->getDialogs().showMathPanel();
+ }
+ return DISPATCHED;
+ }
+
+ if (cmd.button() == mouse_button::button1) {
+ // try to dispatch to enclosed insets first
+ mathcursor->dispatch(cmd);
+ // try to set the cursor
+ //delete mathcursor;
+ //mathcursor = new MathCursor(this, x == 0);
+ //metrics(bv);
+ //mathcursor->setPos(x + xo_, y + yo_);
+ return DISPATCHED;
+ }
+ return UNDISPATCHED;
}
-void InsetFormulaBase::insetButtonPress(BufferView * bv,
- int x, int y, int button)
+Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
- // hack to cope with mouseclick that comes before the call to edit()
- if (!mathcursor) {
- hack_x = x;
- hack_y = y;
- hack_button = button;
- return;
- }
+ BufferView * bv = cmd.view();
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, cmd.x == 0);
- lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
- << " but: " << button << "\n";
- switch (button) {
- default:
- case 1:
- // just click
- first_x = x;
- first_y = y;
- if (mathcursor) {
- mathcursor->selClear();
- mathcursor->setPos(x + xo_, y + yo_);
- }
- break;
-/*
- case 2:
- lyxerr << "insetButtonPress: 2\n";
- // insert stuff
- if (mathcursor) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- MathArray ar;
- mathcursor->selGet(ar);
- mathcursor->setPos(x + xo_, y + yo_);
- string sel =
- bv->getLyXText()->selectionAsString(bv->buffer(), false);
- mathed_parse_cell(ar, sel);
- mathcursor->insert(ar);
- }
- break;
-*/
+ if (cmd.button() == mouse_button::button1) {
+ // just set the cursor here
+ //lyxerr << "setting cursor\n";
+ metrics(bv);
+ first_x = cmd.x;
+ first_y = cmd.y;
+ mathcursor->selClear();
+ mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ mathcursor->dispatch(cmd);
+ return DISPATCHED;
+ }
+ if (cmd.button() == mouse_button::button3) {
+ mathcursor->dispatch(cmd);
+ //delete mathcursor;
+ return DISPATCHED;
}
bv->updateInset(this, false);
+ return DISPATCHED;
}
-void InsetFormulaBase::insetMotionNotify(BufferView * bv,
- int x, int y, int /*button*/)
+Inset::RESULT InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
{
if (!mathcursor)
- return;
+ return DISPATCHED;
- if (abs(x - first_x) < 2 && abs(y - first_y) < 2) {
+ if (mathcursor->dispatch(FuncRequest(cmd)) != MathInset::UNDISPATCHED)
+ return DISPATCHED;
+
+ if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2) {
//lyxerr << "insetMotionNotify: ignored\n";
- return;
+ return DISPATCHED;
}
- first_x = x;
- first_y = y;
+ first_x = cmd.x;
+ first_y = cmd.y;
- if (!mathcursor->selection())
+ 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);
+ return DISPATCHED;
}
-void InsetFormulaBase::insetKeyPress(XKeyEvent *)
+Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
{
- lyxerr[Debug::MATHED] << "Used InsetFormulaBase::InsetKeyPress." << endl;
-}
-
+ //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
+ // << " arg: '" << cmd.argument
+ // << " x: '" << cmd.x
+ // << " y: '" << cmd.y
+ // << "' button: " << cmd.button() << "\n";
-UpdatableInset::RESULT
-InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
- string const & arg)
-{
- //lyxerr << "InsetFormulaBase::localDispatch: act: " << action
- // << " arg: '" << arg << "' cursor: " << mathcursor << "\n";
+ switch (cmd.action) {
+ case LFUN_MOUSE_PRESS:
+ return lfunMousePress(cmd);
+ case LFUN_MOUSE_MOTION:
+ return lfunMouseMotion(cmd);
+ case LFUN_MOUSE_RELEASE:
+ return lfunMouseRelease(cmd);
+ case LFUN_MOUSE_DOUBLE:
+ //lyxerr << "Mouse double\n";
+ return localDispatch(FuncRequest(LFUN_WORDSEL));
+ default:
+ break;
+ }
- if (!mathcursor)
+ if (!mathcursor)
return UNDISPATCHED;
- if (mathcursor->asHyperActiveInset()) {
- lyxerr << " uurr.... getting dificult now\n";
- return mathcursor->asHyperActiveInset()->localDispatch(bv, action, arg);
- }
-
+ BufferView * bv = cmd.view();
+ string argument = cmd.argument;
RESULT result = DISPATCHED;
bool sel = false;
bool was_macro = mathcursor->inMacroMode();
hideInsetCursor(bv);
mathcursor->normalize();
+ mathcursor->touch();
- switch (action) {
+ switch (cmd.action) {
- // --- Cursor Movements ---------------------------------------------
+ case LFUN_MATH_MUTATE:
+ case LFUN_MATH_DISPLAY:
+ case LFUN_MATH_NUMBER:
+ case LFUN_MATH_NONUMBER:
+ case LFUN_TABINSERT:
+ 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);
+ updateLocal(bv, true);
+ break;
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_LEFTSEL:
sel = true; // fall through
-
case LFUN_LEFT:
result = mathcursor->left(sel) ? DISPATCHED : FINISHED;
updateLocal(bv, false);
break;
-
case LFUN_UPSEL:
- sel = true;
-
+ sel = true; // fall through
case LFUN_UP:
result = mathcursor->up(sel) ? DISPATCHED : FINISHED_UP;
updateLocal(bv, false);
break;
-
case LFUN_DOWNSEL:
- sel = true;
-
+ sel = true; // fall through
case LFUN_DOWN:
result = mathcursor->down(sel) ? DISPATCHED : FINISHED_DOWN;
updateLocal(bv, false);
break;
- case LFUN_HOMESEL:
- sel = true;
+ case LFUN_WORDSEL:
+ mathcursor->home(false);
+ mathcursor->end(true);
+ updateLocal(bv, false);
+ break;
+ case LFUN_HOMESEL:
+ case LFUN_WORDLEFTSEL:
+ sel = true; // fall through
case LFUN_HOME:
- mathcursor->home(sel);
+ case LFUN_WORDLEFT:
+ result = mathcursor->home(sel) ? DISPATCHED : FINISHED;
updateLocal(bv, false);
break;
case LFUN_ENDSEL:
- sel = true;
-
+ case LFUN_WORDRIGHTSEL:
+ sel = true; // fall through
case LFUN_END:
- mathcursor->end(sel);
+ case LFUN_WORDRIGHT:
+ result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
updateLocal(bv, false);
break;
- case LFUN_DELETE_LINE_FORWARD:
- bv->lockedInsetStoreUndo(Undo::DELETE);
- mathcursor->delLine();
- updateLocal(bv, true);
+ case LFUN_PRIORSEL:
+ case LFUN_PRIOR:
+ case LFUN_BEGINNINGBUFSEL:
+ case LFUN_BEGINNINGBUF:
+ result = FINISHED_UP;
+ updateLocal(bv, false);
+ break;
+
+ case LFUN_NEXTSEL:
+ case LFUN_NEXT:
+ case LFUN_ENDBUFSEL:
+ case LFUN_ENDBUF:
+ result = FINISHED_DOWN;
+ updateLocal(bv, false);
break;
case LFUN_TAB:
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();
- bv->updateInset(this, true);
+ updateLocal(bv, true);
break;
case LFUN_DELETE_WORD_FORWARD:
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);
mathcursor->selCopy();
break;
- case LFUN_WORDRIGHTSEL:
- case LFUN_WORDLEFTSEL:
- break;
- // --- accented characters ------------------------------
+ // Special casing for superscript in case of LyX handling
+ // dead-keys:
+ case LFUN_CIRCUMFLEX:
+ if (cmd.argument.empty()) {
+ // do superscript if LyX handles
+ // deadkeys
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ mathcursor->script(true);
+ updateLocal(bv, true);
+ }
+ break;
- case LFUN_UMLAUT: handleAccent(bv, "ddot"); break;
- case LFUN_CIRCUMFLEX: handleAccent(bv, "hat"); break;
- case LFUN_GRAVE: handleAccent(bv, "grave"); break;
- case LFUN_ACUTE: handleAccent(bv, "acute"); break;
- case LFUN_TILDE: handleAccent(bv, "tilde"); break;
- case LFUN_MACRON: handleAccent(bv, "bar"); break;
- case LFUN_DOT: handleAccent(bv, "dot"); break;
- case LFUN_CARON: handleAccent(bv, "check"); break;
- case LFUN_BREVE: handleAccent(bv, "breve"); break;
- case LFUN_VECTOR: handleAccent(bv, "vec"); break;
+ case LFUN_UMLAUT:
+ case LFUN_ACUTE:
+ case LFUN_GRAVE:
+ case LFUN_BREVE:
+ case LFUN_DOT:
+ case LFUN_MACRON:
+ case LFUN_CARON:
+ case LFUN_TILDE:
+ case LFUN_CEDILLA:
+ case LFUN_CIRCLE:
+ case LFUN_UNDERDOT:
+ case LFUN_TIE:
+ case LFUN_OGONEK:
+ case LFUN_HUNG_UMLAUT:
+ break;
// Math fonts
- case LFUN_GREEK_TOGGLE: handleFont(bv, LM_TC_GREEK); break;
- case LFUN_BOLD: handleFont(bv, LM_TC_BF); break;
- case LFUN_SANS: handleFont(bv, LM_TC_SF); break;
- case LFUN_EMPH: handleFont(bv, LM_TC_CAL); break;
- case LFUN_ROMAN: handleFont(bv, LM_TC_RM); break;
- case LFUN_CODE: handleFont(bv, LM_TC_TT); break;
- case LFUN_NOUN: handleFont(bv, LM_TC_BB); break;
- case LFUN_DEFAULT: handleFont(bv, LM_TC_VAR); break;
-
- case LFUN_GREEK:
- handleFont(bv, LM_TC_GREEK1);
- if (arg.size())
- mathcursor->interpret(arg);
+ case LFUN_GREEK_TOGGLE: handleFont(bv, cmd.argument, "lyxgreek"); break;
+ case LFUN_BOLD: handleFont(bv, cmd.argument, "textbf"); break;
+ case LFUN_SANS: handleFont(bv, cmd.argument, "textsf"); 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_FREE: handleFont(bv, cmd.argument, "textrm"); break;
+ case LFUN_DEFAULT: handleFont(bv, cmd.argument, "textnormal"); break;
+
+ case LFUN_GREEK:
+ handleFont(bv, cmd.argument, "lyxgreek1");
+ if (cmd.argument.size())
+ mathcursor->interpret(cmd.argument);
break;
case LFUN_MATH_MODE:
- //handleFont(bv, LM_TC_TEXTRM);
- mathcursor->niceInsert(MathAtom(new MathHullInset(LM_OT_SIMPLE)));
- updateLocal(bv, true);
- //bv->owner()->message(_("math text mode toggled"));
- break;
-
- case LFUN_MATH_LIMITS:
- bv->lockedInsetStoreUndo(Undo::EDIT);
- if (mathcursor->toggleLimits())
+ if (mathcursor->currentMode())
+ handleFont(bv, cmd.argument, "textrm");
+ else {
+ mathcursor->niceInsert(MathAtom(new MathHullInset("simple")));
updateLocal(bv, true);
+ }
+ //bv->owner()->message(_("math text mode toggled"));
break;
case LFUN_MATH_SIZE:
break;
case LFUN_INSERT_MATRIX:
- if (!arg.empty()) {
+ if (!cmd.argument.empty()) {
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->interpret("matrix " + arg);
+ mathcursor->interpret("matrix " + cmd.argument);
updateLocal(bv, true);
}
break;
- case LFUN_MATH_SPACE:
- {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->insert(MathAtom(new MathSpaceInset(1)));
- updateLocal(bv, true);
- break;
- }
-
case LFUN_SUPERSCRIPT:
case LFUN_SUBSCRIPT:
{
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->script((action == LFUN_SUPERSCRIPT));
+ mathcursor->script(cmd.action == LFUN_SUPERSCRIPT);
updateLocal(bv, true);
break;
}
-
+
case LFUN_MATH_DELIM:
{
- lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
+ //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
string ls;
- string rs;
- istringstream is(arg.c_str());
- is >> ls >> rs;
- if (!is) {
- lyxerr << "can't parse delimeters from '" << arg << "'\n";
- break;
- }
+ string rs = split(cmd.argument, ls, ' ');
+ // Reasonable default values
+ if (ls.empty())
+ ls = '(';
+ if (rs.empty())
+ rs = ')';
+
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->handleDelim(ls, rs);
+ mathcursor->handleNest(MathAtom(new MathDelimInset(ls, rs)));
updateLocal(bv, true);
break;
}
case LFUN_PROTECTEDSPACE:
- //lyxerr << " called LFUN_PROTECTEDSPACE\n";
+ case LFUN_MATH_SPACE:
bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->insert(MathAtom(new MathSpaceInset(1)));
+ mathcursor->insert(MathAtom(new MathSpaceInset(",")));
updateLocal(bv, true);
break;
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) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- char al = arg.size() ? arg[0] : 'c';
- switch (action) {
- case LFUN_MATH_HALIGN: p->halign(al, p->col(idx)); break;
- case LFUN_MATH_VALIGN: p->valign(al); 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->addCol(p->col(idx)); break;
- case LFUN_MATH_COLUMN_DELETE: p->delCol(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("\\");
+ mathcursor->interpret('\\');
updateLocal(bv, true);
break;
+ case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+ case LFUN_BREAKPARAGRAPH_SKIP:
+ argument = "\n";
+ // fall through
+
case -1:
case LFUN_INSERT_MATH:
case LFUN_SELFINSERT:
- if (!arg.empty()) {
+ if (!argument.empty()) {
bv->lockedInsetStoreUndo(Undo::EDIT);
- result = mathcursor->interpret(arg) ? DISPATCHED : FINISHED_RIGHT;
+ if (argument.size() == 1)
+ result = mathcursor->interpret(argument[0]) ? DISPATCHED : FINISHED_RIGHT;
+ else
+ result = mathcursor->interpret(argument) ? DISPATCHED : FINISHED_RIGHT;
updateLocal(bv, true);
}
break;
result = UNDISPATCHED;
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 (cmd.argument.empty()) {
+ InsetCommandParams p("ref");
+ bv->owner()->getDialogs().createRef(p.getAsString());
+ } else {
+ //mathcursor->handleNest(new InsetRef2);
+ //mathcursor->insert(arg);
+ mathcursor->insert(MathAtom(new RefInset(cmd.argument)));
+ }
+ updateLocal(bv, true);
+ break;
+
default:
result = UNDISPATCHED;
}
mathcursor->normalize();
+ mathcursor->touch();
lyx::Assert(mathcursor);
toggleInsetSelection(bv);
if (result == DISPATCHED || result == DISPATCHED_NOUPDATE ||
- result == UNDISPATCHED)
+ result == UNDISPATCHED) {
+ fitInsetCursor(bv);
showInsetCursor(bv);
- else
+ revealCodes(bv);
+ } else {
+ releaseMathCursor(bv);
bv->unlockInset(this);
+ }
return result; // original version
}
+void InsetFormulaBase::revealCodes(BufferView * bv) const
+{
+ if (!mathcursor)
+ return;
+ bv->owner()->message(mathcursor->info());
+
+#if 0
+ // write something to the minibuffer
+ // translate to latex
+ mathcursor->markInsert();
+ ostringstream os;
+ write(NULL, os);
+ string str = os.str();
+ mathcursor->markErase();
+ string::size_type pos = 0;
+ string res;
+ for (string::iterator it = str.begin(); it != str.end(); ++it) {
+ if (*it == '\n')
+ res += ' ';
+ else if (*it == '\0') {
+ res += " -X- ";
+ pos = it - str.begin();
+ }
+ else
+ res += *it;
+ }
+ if (pos > 30)
+ res = res.substr(pos - 30);
+ if (res.size() > 60)
+ res = res.substr(0, 60);
+ bv->owner()->message(res);
+#endif
+}
+
+
Inset::Code InsetFormulaBase::lyxCode() const
{
return Inset::MATH_CODE;
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_);
}
bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
- bool const &, bool const &)
+ bool, bool)
{
#ifdef WITH_WARNINGS
#warning pretty ugly
//lyxerr << "reset lastformula to " << this << "\n";
lastformula = this;
laststr = str;
- current = ibegin(par().nucleus());
+ current = ibegin(par().nucleus());
ar.clear();
mathed_parse_cell(ar, str);
} else {
//lyxerr << "searching '" << str << "' in " << this << ar << endl;
for (MathIterator it = current; it != iend(par().nucleus()); ++it) {
- if (it.cell().matchpart(ar, it.position().pos_)) {
- mathcursor->setSelection(it.cursor(), ar.size());
+ if (it.cell().matchpart(ar, it.back().pos_)) {
+ bv->unlockInset(bv->theLockingInset());
+ if (!bv->lockInset(this)) {
+ lyxerr << "Cannot lock inset" << endl;
+ return false;
+ }
+ delete mathcursor;
+ mathcursor = new MathCursor(this, true);
+ metrics(bv);
+ mathcursor->setSelection(it, ar.size());
current = it;
it.jump(ar.size());
- // I guess some of the following can go
- bv->toggleSelection(true);
- hideInsetCursor(bv);
- updateLocal(bv, true);
- showInsetCursor(bv);
- metrics(bv);
+ updateLocal(bv, false);
return true;
}
}
//lyxerr << "not found!\n";
lastformula = 0;
- // we have to unlock ourself in this function by default!
- // don't ask me why...
- bv->unlockInset(this);
return false;
}
bool InsetFormulaBase::searchBackward(BufferView * bv, string const & what,
- bool const & a, bool const & b)
+ bool a, bool b)
{
- lyxerr << "searching backward not implemented in mathed" << endl;
+ lyxerr[Debug::MATHED] << "searching backward not implemented in mathed\n";
return searchForward(bv, what, a, b);
}
-/////////////////////////////////////////////////////////////////////
-
-
-void mathDispatchCreation(BufferView * bv, string const & arg, bool display)
+bool InsetFormulaBase::display() const
{
- if (bv->available()) {
- // use selection if available..
- //string sel;
- //if (action == LFUN_MATH_IMPORT_SELECTION)
- // sel = "";
- //else
-
- string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false);
-
- InsetFormulaBase * f;
- if (sel.empty()) {
- f = new InsetFormula;
- if (openNewInset(bv, f)) {
- // 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);
- }
- } else {
- // create a macro if we see "\\newcommand" somewhere, and an ordinary
- // formula otherwise
- if (sel.find("\\newcommand") == string::npos)
- f = new InsetFormula(sel);
- else
- f = new InsetFormulaMacro(sel);
- bv->getLyXText()->cutSelection(bv);
- openNewInset(bv, f);
- }
- }
- bv->owner()->getLyXFunc()->setMessage(N_("Math editor mode"));
+ return par()->asHullInset() && par()->asHullInset()->display();
}
-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)
+void mathDispatchCreation(FuncRequest const & cmd, bool display)
{
- mathDispatchCreation(bv, arg, true);
-}
+ BufferView * bv = cmd.view();
+ // use selection if available..
+ //string sel;
+ //if (action == LFUN_MATH_IMPORT_SELECTION)
+ // sel = "";
+ //else
+ string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false);
-void mathDispatchMathMacro(BufferView * bv, string const & arg)
-{
- if (bv->available()) {
- 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));
+ if (sel.empty()) {
+ InsetFormula * f = new InsetFormula(bv);
+ if (openNewInset(bv, f)) {
+ 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(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
+ // formula otherwise
+ InsetFormulaBase * f;
+ if (sel.find("\\newcommand") == string::npos &&
+ sel.find("\\def") == string::npos)
+ f = new InsetFormula(sel);
+ else
+ f = new InsetFormulaMacro(sel);
+ bv->getLyXText()->cutSelection(bv);
+ openNewInset(bv, f);
}
+ cmd.message(N_("Math editor mode"));
}
-void mathDispatchMathDelim(BufferView * bv, string const & arg)
+void mathDispatch(FuncRequest const & cmd)
{
- if (bv->available()) {
- if (openNewInset(bv, new InsetFormula))
- bv->theLockingInset()->localDispatch(bv, LFUN_MATH_DELIM, arg);
- }
-}
+ BufferView * bv = cmd.view();
+ if (!bv->available())
+ return;
+ switch (cmd.action) {
-void mathDispatchInsertMatrix(BufferView * bv, string const & arg)
-{
- if (bv->available()) {
- if (openNewInset(bv, new InsetFormula))
- 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()) {
- if (arg.size() && arg[0] == '\\') {
- InsetFormula * f = new InsetFormula(arg);
- if (!bv->insertInset(f))
- delete f;
- } else
- mathDispatchMathMode(bv, 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;
-void mathDispatchGreek(BufferView * bv, string const & arg)
-{
- if (bv->available()) {
- InsetFormula * f = new InsetFormula;
- if (openNewInset(bv, f)) {
- bv->theLockingInset()->localDispatch(bv, LFUN_GREEK, arg);
- bv->unlockInset(f);
+ case LFUN_GREEK:
+ 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;
}
+ default:
+ break;
}
-}
-
-
-void mathDispatch(BufferView *, kb_action, string const &)
-{}
+}
projects / lyx.git / blobdiff