-/*
-* 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 <fstream>
-#include "Lsstream.h"
+#include "formulabase.h"
+#include "support/std_sstream.h"
#include "support/LAssert.h"
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#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 "math_metricsinfo.h"
#include "support/lstrings.h"
+#include "support/lyxlib.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_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 "insets/insetcommandparams.h"
#include "ref_inset.h"
+
+using namespace lyx::support;
+
using std::endl;
using std::ostream;
using std::vector;
using std::abs;
+using std::max;
-MathCursor * mathcursor = 0;
+MathCursor * mathcursor = 0;
namespace {
int first_x;
int first_y;
-
-
bool openNewInset(BufferView * bv, UpdatableInset * new_inset)
{
if (!bv->insertInset(new_inset)) {
delete new_inset;
return false;
}
- new_inset->edit(bv, true);
+ new_inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, "left"));
return true;
}
InsetFormulaBase::InsetFormulaBase()
- : font_(), xo_(0), yo_(0)
+ : view_(0), 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 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;
}
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);
-}
+ // this whole function is a hack and won't work for incremental font
+ // changes...
+ recordUndo(bv, Undo::ATOMIC);
-
-// Check if uses AMS macros
-void InsetFormulaBase::validate(LaTeXFeatures &) const
-{}
+ if (mathcursor->inset()->name() == font)
+ mathcursor->handleFont(font);
+ else {
+ mathcursor->handleNest(createMathInset(font));
+ mathcursor->insert(arg);
+ }
+}
-void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const
+BufferView * InsetFormulaBase::view() const
{
- font_ = f;
- metrics(bv);
+ return view_;
}
-void InsetFormulaBase::metrics(BufferView * bv) const
-{
- if (bv)
- 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::validate(LaTeXFeatures &) const
+{}
string const InsetFormulaBase::editMessage() const
}
-void InsetFormulaBase::edit(BufferView * bv, int x, int y, mouse_button::state)
-{
- if (!bv->lockInset(this))
- lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl;
- 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)
-{
- 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);
-}
-
-
void InsetFormulaBase::insetUnlock(BufferView * bv)
{
if (mathcursor) {
if (mathcursor->inMacroMode()) {
mathcursor->macroModeClose();
- updateLocal(bv, true);
+ bv->updateInset(this);
}
releaseMathCursor(bv);
}
generatePreview();
- bv->updateInset(this, false);
+ bv->updateInset(this);
+}
+
+
+void InsetFormulaBase::getCursor(BufferView &, int & x, int & y) const
+{
+ mathcursor->getPos(x, y);
}
x = mathcursor->targetX();
x -= xo_;
y -= yo_;
- //lyxerr << "getCursorPos: " << x << " " << y << "\n";
-}
-
-
-void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
-{
- //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
- if (isCursorVisible())
- hideInsetCursor(bv);
- else
- showInsetCursor(bv);
-}
-
-
-void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
-{
- if (isCursorVisible())
- return;
- 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())
- return;
- bv->hideLockedInsetCursor();
- setCursorVisible(false);
- //lyxerr << "hideInsetCursor: \n";
+ //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
}
if (!mathcursor)
return;
int x, y, asc, des;
- math_font_max_dim(font_, asc, des);
+ asc = 10;
+ des = 2;
+ //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);
}
-vector<string> const InsetFormulaBase::getLabelList() const
-{
- return vector<string>();
-}
-
-
-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);
+ 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
- bv->owner()->getDialogs().showMathPanel();
+ lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
+ bv->owner()->getDialogs().show("mathpanel");
}
return DISPATCHED;
}
if (cmd.button() == mouse_button::button2) {
+ MathArray ar;
+ asArray(bv->getClipboard(), ar);
mathcursor->selClear();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
- mathcursor->insert(asArray(bv->getClipboard()));
- bv->updateInset(this, true);
+ mathcursor->insert(ar);
+ bv->updateInset(this);
return DISPATCHED;
}
if (cmd.button() == mouse_button::button1) {
// try to dispatch to enclosed insets first
mathcursor->dispatch(cmd);
+ cmd.view()->stuffClipboard(mathcursor->grabSelection());
// try to set the cursor
//delete mathcursor;
//mathcursor = new MathCursor(this, x == 0);
}
-Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
- releaseMathCursor(bv);
- mathcursor = new MathCursor(this, cmd.x == 0);
+ //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
- 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();
+ if (!mathcursor || mathcursor->formula() != this) {
+ lyxerr[Debug::MATHED] << "re-create cursor" << endl;
+ releaseMathCursor(bv);
+ mathcursor = new MathCursor(this, cmd.x == 0);
+ //metrics(bv);
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+ }
+
+ if (cmd.button() == mouse_button::button3) {
mathcursor->dispatch(cmd);
return DISPATCHED;
}
- if (cmd.button() == mouse_button::button3) {
+ 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);
- //delete mathcursor;
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;
- if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2) {
- //lyxerr << "insetMotionNotify: ignored\n";
+ // only select with button 1
+ if (cmd.button() != mouse_button::button1)
return DISPATCHED;
- }
+
+ if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
+ return DISPATCHED;
+
first_x = cmd.x;
first_y = cmd.y;
mathcursor->selStart();
BufferView * bv = cmd.view();
- 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;
+
+ BufferView * bv = cmd.view();
+
+ // delete empty mathbox (LFUN_BACKSPACE and LFUN_DELETE)
+ bool remove_inset = false;
switch (cmd.action) {
+ case LFUN_INSET_EDIT:
+ lyxerr << "Called EDIT with '" << cmd.argument << "'" << endl;
+ if (!bv->lockInset(this))
+ lyxerr << "Cannot lock math inset in edit call!" << endl;
+ 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" << endl;
return lfunMousePress(cmd);
case LFUN_MOUSE_MOTION:
+ //lyxerr << "Mouse motion" << endl;
return lfunMouseMotion(cmd);
case LFUN_MOUSE_RELEASE:
+ //lyxerr << "Mouse single release" << endl;
return lfunMouseRelease(cmd);
case LFUN_MOUSE_DOUBLE:
- //lyxerr << "Mouse double\n";
+ //lyxerr << "Mouse double" << endl;
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();
bool was_selection = mathcursor->selection();
- hideInsetCursor(bv);
-
mathcursor->normalize();
mathcursor->touch();
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_TABULAR_FEATURE:
case LFUN_PASTESELECTION:
case LFUN_MATH_LIMITS:
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
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";
+ //lyxerr << "calling scroll 20" << endl;
//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);
+ recordUndo(bv, Undo::ATOMIC);
+ 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);
+ recordUndo(bv, Undo::ATOMIC);
+ if (!mathcursor->erase()) {
+ result = FINISHED;
+ remove_inset = true;
+ }
break;
// case LFUN_GETXY:
// dispatch_result = 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());
is >> x >> y;
mathcursor->setPos(x, y);
- updateLocal(bv, false);
break;
}
- case LFUN_PASTE:
+ case LFUN_PASTE: {
+ size_t n = 0;
+ istringstream is(cmd.argument.c_str());
+ is >> n;
if (was_macro)
mathcursor->macroModeClose();
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->selPaste();
- updateLocal(bv, true);
+ recordUndo(bv, Undo::ATOMIC);
+ mathcursor->selPaste(n);
break;
+ }
case LFUN_CUT:
- bv->lockedInsetStoreUndo(Undo::DELETE);
+ recordUndo(bv, Undo::DELETE);
mathcursor->selCut();
- updateLocal(bv, true);
break;
case LFUN_COPY:
if (cmd.argument.empty()) {
// do superscript if LyX handles
// deadkeys
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
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, "textbf"); break;
- case LFUN_SANS: handleFont(bv, cmd.argument, "textsf"); 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_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->interpret(cmd.argument);
- break;
-
case LFUN_MATH_MODE:
- if (mathcursor->currentMode())
- handleFont(bv, cmd.argument, "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_SIZE:
#if 0
if (!arg.empty()) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->setSize(arg);
- updateLocal(bv, true);
}
#endif
break;
- case LFUN_INSERT_MATRIX:
- if (!cmd.argument.empty()) {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- mathcursor->interpret("matrix " + cmd.argument);
- updateLocal(bv, true);
- }
+ case LFUN_INSERT_MATRIX: {
+ recordUndo(bv, Undo::ATOMIC);
+ 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);
+ recordUndo(bv, Undo::ATOMIC);
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 << "'" << 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)));
- updateLocal(bv, true);
break;
}
- case LFUN_PROTECTEDSPACE:
+ case LFUN_SPACE_INSERT:
case LFUN_MATH_SPACE:
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->insert(MathAtom(new MathSpaceInset(",")));
- updateLocal(bv, true);
break;
case LFUN_UNDO:
case LFUN_INSET_ERT:
// interpret this as if a backslash was typed
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
mathcursor->interpret('\\');
- updateLocal(bv, true);
break;
case LFUN_BREAKPARAGRAPH:
argument = "\n";
// fall through
- case -1:
+// 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:
+ 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) ? DISPATCHED : FINISHED_RIGHT;
- updateLocal(bv, true);
+ mathcursor->insert(argument);
}
break;
- case LFUN_MATH_PANEL:
- result = UNDISPATCHED;
- break;
-
case LFUN_ESCAPE:
if (mathcursor->selection())
mathcursor->selClear();
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());
+ break;
+
+ case LFUN_DIALOG_SHOW:
+ result = UNDISPATCHED;
+ break;
+
+ 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();
- lyx::Assert(mathcursor);
+ Assert(mathcursor);
if (mathcursor->selection() || was_selection)
toggleInsetSelection(bv);
if (result == DISPATCHED || result == DISPATCHED_NOUPDATE ||
result == UNDISPATCHED) {
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
}
-Inset::Code InsetFormulaBase::lyxCode() const
+InsetOld::Code InsetFormulaBase::lyxCode() const
{
- return Inset::MATH_CODE;
+ return InsetOld::MATH_CODE;
}
int InsetFormulaBase::ylow() const
{
- return yo_ - ascent(view(), font_);
+ return yo_ - dim_.asc;
}
int InsetFormulaBase::yhigh() const
{
- return yo_ + descent(view(), font_);
+ return yo_ + dim_.des;
}
int InsetFormulaBase::xhigh() const
{
- return xo_ + width(view(), font_);
+ return xo_ + dim_.wid;
}
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());
}
delete mathcursor;
mathcursor = new MathCursor(this, true);
- metrics(bv);
+ //metrics(bv);
mathcursor->setSelection(it, ar.size());
current = it;
it.jump(ar.size());
- updateLocal(bv, false);
+ bv->updateInset(this);
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);
}
}
+string InsetFormulaBase::selectionAsString() const
+{
+ return mathcursor ? mathcursor->grabSelection() : string();
+}
+
/////////////////////////////////////////////////////////////////////
// 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);
f = new InsetFormula(sel);
else
f = new InsetFormulaMacro(sel);
- bv->getLyXText()->cutSelection(bv);
+ bv->getLyXText()->cutSelection(true, false);
openNewInset(bv, f);
}
cmd.message(N_("Math editor mode"));
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_GREEK:
- case LFUN_INSERT_MATH:
- case LFUN_INSERT_MATRIX:
+ case LFUN_INSERT_MATH:
+ case LFUN_INSERT_MATRIX:
case LFUN_MATH_DELIM: {
InsetFormula * f = new InsetFormula(bv);
if (openNewInset(bv, f)) {
- bv->theLockingInset()->
+ bv->theLockingInset()->
localDispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
bv->theLockingInset()->localDispatch(cmd);
}
break;
}
+
default:
break;
}
projects / features.git / blobdiff