#include "Lsstream.h"
#include "support/LAssert.h"
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "formula.h"
#include "formulamacro.h"
#include "LaTeXFeatures.h"
#include "debug.h"
#include "math_support.h"
-#include "math_metricsinfo.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;
// 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";
}
// this whole function is a hack and won't work for incremental font
// changes...
bv->lockedInsetStoreUndo(Undo::EDIT);
- if (mathcursor->par()->name() == font) {
+ if (mathcursor->par()->name() == font)
mathcursor->handleFont(font);
- updateLocal(bv, true);
- } else {
- bool sel = mathcursor->selection();
- if (sel)
- updateLocal(bv, true);
+ else {
mathcursor->handleNest(createMathInset(font));
mathcursor->insert(arg);
- if (!sel)
- updateLocal(bv, false);
}
}
-// Check if uses AMS macros
+BufferView * InsetFormulaBase::view() const
+{
+ return view_.lock().get();
+}
+
+
void InsetFormulaBase::validate(LaTeXFeatures &) const
{}
{
if (bv)
view_ = bv->owner()->view();
- MathMetricsInfo mi;
+ MetricsInfo mi;
mi.base.style = LM_ST_TEXT;
mi.base.font = font_;
mi.base.font.setColor(LColor::math);
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);
}
generatePreview();
- bv->updateInset(this, false);
+ bv->updateInset(this);
}
x = mathcursor->targetX();
x -= xo_;
y -= yo_;
- //lyxerr << "getCursorPos: " << x << " " << y << "\n";
+ //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
}
void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
{
if (!mathcursor) {
- lyxerr << "toggleInsetCursor impossible\n";
+ lyxerr[Debug::MATHED] << "toggleInsetCursor impossible" << endl;
return;
}
- //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
+ //lyxerr << "toggleInsetCursor: " << isCursorVisible() << endl;
if (isCursorVisible())
hideInsetCursor(bv);
else
void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
{
if (!mathcursor) {
- lyxerr << "showInsetCursor impossible\n";
+ lyxerr << "showInsetCursor impossible" << endl;
return;
}
if (isCursorVisible())
math_font_max_dim(font_, asc, des);
bv->showLockedInsetCursor(x, y - yo_, asc, des);
setCursorVisible(true);
- //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
+ //lyxerr << "showInsetCursor: " << x << ' ' << y << endl;
}
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)
-{
- bv->updateInset(this, dirty);
-}
-
-
-Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
{
if (!mathcursor)
return UNDISPATCHED;
BufferView * bv = cmd.view();
hideInsetCursor(bv);
showInsetCursor(bv);
- bv->updateInset(this, false);
- //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << "\n";
+ bv->updateInset(this);
+ //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
if (cmd.button() == mouse_button::button3) {
// try to dispatch to enclosed insets first
- if (mathcursor->dispatch(cmd) == MathInset::UNDISPATCHED) {
+ if (mathcursor->dispatch(cmd) == UNDISPATCHED) {
// launch math panel for right mouse button
+ lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
bv->owner()->getDialogs().showMathPanel();
}
return DISPATCHED;
mathcursor->selClear();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
mathcursor->insert(asArray(bv->getClipboard()));
- bv->updateInset(this, true);
+ bv->updateInset(this);
return DISPATCHED;
}
}
-Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
- //lyxerr << "lfunMousePress: buttons: " << cmd.button() << "\n";
+ //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
if (!mathcursor || mathcursor->formula() != this) {
- lyxerr << "re-create cursor\n";
+ lyxerr[Debug::MATHED] << "re-create cursor" << endl;
releaseMathCursor(bv);
mathcursor = new MathCursor(this, cmd.x == 0);
metrics(bv);
return DISPATCHED;
}
- bv->updateInset(this, false);
+ bv->updateInset(this);
return DISPATCHED;
}
-Inset::RESULT InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
{
if (!mathcursor)
return DISPATCHED;
- if (mathcursor->dispatch(FuncRequest(cmd)) != MathInset::UNDISPATCHED)
+ if (mathcursor->dispatch(FuncRequest(cmd)) != UNDISPATCHED)
return DISPATCHED;
// only select with button 1
hideInsetCursor(bv);
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
showInsetCursor(bv);
- bv->updateInset(this, false);
+ bv->updateInset(this);
return DISPATCHED;
}
-Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
{
//lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
// << " arg: '" << cmd.argument
// << " x: '" << cmd.x
// << " y: '" << cmd.y
- // << "' button: " << cmd.button() << "\n";
+ // << "' 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";
case LFUN_MATH_DISPLAY:
case LFUN_MATH_NUMBER:
case LFUN_MATH_NONUMBER:
- case LFUN_TABINSERT:
+ case LFUN_CELL_SPLIT:
case LFUN_BREAKLINE:
case LFUN_DELETE_LINE_FORWARD:
case LFUN_INSERT_LABEL:
case LFUN_MATH_LIMITS:
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->dispatch(cmd);
- updateLocal(bv, true);
break;
case LFUN_RIGHTSEL:
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;
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);
- updateLocal(bv, false);
+ 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_HOME:
case LFUN_WORDLEFT:
result = mathcursor->home(sel) ? DISPATCHED : FINISHED;
- updateLocal(bv, false);
break;
case LFUN_ENDSEL:
case LFUN_END:
case LFUN_WORDRIGHT:
result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
- updateLocal(bv, false);
break;
case LFUN_PRIORSEL:
case LFUN_PRIOR:
case LFUN_BEGINNINGBUFSEL:
case LFUN_BEGINNINGBUF:
- result = FINISHED_UP;
- updateLocal(bv, false);
+ result = FINISHED;
break;
case LFUN_NEXTSEL:
case LFUN_NEXT:
case LFUN_ENDBUFSEL:
case LFUN_ENDBUF:
- result = FINISHED_DOWN;
- updateLocal(bv, false);
+ 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_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:
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:
// deadkeys
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->script(true);
- updateLocal(bv, true);
}
break;
break;
// Math fonts
- case LFUN_GREEK_TOGGLE: handleFont(bv, cmd.argument, "lyxgreek"); 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_FREE: 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_GREEK:
- handleFont(bv, cmd.argument, "lyxgreek1");
- if (cmd.argument.size())
- mathcursor->insert(asArray(cmd.argument));
- break;
-
case LFUN_MATH_MODE:
- if (mathcursor->currentMode() == MathInset::TEXT_MODE) {
+ if (mathcursor->currentMode() == MathInset::TEXT_MODE)
mathcursor->niceInsert(MathAtom(new MathHullInset("simple")));
- updateLocal(bv, true);
- } else {
+ else
handleFont(bv, cmd.argument, "textrm");
- }
//bv->owner()->message(_("math text mode toggled"));
break;
if (!arg.empty()) {
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->setSize(arg);
- updateLocal(bv, true);
}
#endif
break;
v_align += 'c';
mathcursor->niceInsert(
MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
- updateLocal(bv, true);
break;
}
{
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->script(cmd.action == LFUN_SUPERSCRIPT);
- updateLocal(bv, true);
break;
}
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:
// interpret this as if a backslash was typed
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->interpret('\\');
- updateLocal(bv, true);
break;
case LFUN_BREAKPARAGRAPH:
case LFUN_INSERT_MATH:
bv->lockedInsetStoreUndo(Undo::EDIT);
mathcursor->niceInsert(argument);
- updateLocal(bv, true);
break;
case -1:
result = mathcursor->interpret(argument[0]) ? DISPATCHED : FINISHED_RIGHT;
else
mathcursor->insert(asArray(argument));
- updateLocal(bv, true);
}
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());
+ 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(cmd.argument)));
+ 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();
} else {
releaseMathCursor(bv);
bv->unlockInset(this);
+ if (remove_inset)
+ bv->owner()->dispatch(FuncRequest(LFUN_DELETE));
}
return result; // original version
mathcursor->setSelection(it, ar.size());
current = it;
it.jump(ar.size());
- updateLocal(bv, false);
+ bv->updateInset(this);
return true;
}
}
}
break;
- case LFUN_GREEK:
case LFUN_INSERT_MATH:
case LFUN_INSERT_MATRIX:
case LFUN_MATH_DELIM: {
}
break;
}
+
default:
break;
}
projects / lyx.git / blobdiff