#include <cctype>
#include "support/lstrings.h"
+#include "support/LAssert.h"
#include "debug.h"
#include "LColor.h"
#include "Painter.h"
-#include "support.h"
+#include "math_support.h"
#include "formulabase.h"
#include "math_cursor.h"
+#include "math_casesinset.h"
#include "math_factory.h"
#include "math_arrayinset.h"
+#include "math_braceinset.h"
#include "math_charinset.h"
#include "math_deliminset.h"
-#include "math_matrixinset.h"
+#include "math_hullinset.h"
#include "math_scriptinset.h"
#include "math_spaceinset.h"
#include "math_specialcharinset.h"
-#include "math_parser.h"
+#include "math_mathmlstream.h"
+
+#define FILEDEBUG 0
using std::endl;
using std::min;
using std::max;
+using std::swap;
using std::isalnum;
-
namespace {
struct Selection
if (i1.idx_ == i2.idx_)
data_.push_back(MathArray(i1.cell(), i1.pos_, i2.pos_));
else {
- std::vector<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
- for (unsigned i = 0; i < indices.size(); ++i)
+ std::vector<MathInset::idx_type> indices =
+ (*i1.par_)->idxBetween(i1.idx_, i2.idx_);
+ for (MathInset::idx_type i = 0; i < indices.size(); ++i)
data_.push_back(i1.cell(indices[i]));
}
}
if (i1.idx_ == i2.idx_)
i1.cell().erase(i1.pos_, i2.pos_);
else {
- std::vector<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
+ std::vector<MathInset::idx_type> indices =
+ (*i1.par_)->idxBetween(i1.idx_, i2.idx_);
for (unsigned i = 0; i < indices.size(); ++i)
i1.cell(indices[i]).erase();
}
void paste(MathCursor & cursor) const
{
- cursor.insert(glue());
+ MathArray ar = glue();
+ cursor.paste(ar);
}
// glues selection to one cell
Selection theSelection;
+#if FILEDEBUG
std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
{
- os << "(par: " << p.par_ << " idx: " << p.idx_
- << " pos: " << p.pos_ << ")";
+ os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")";
return os;
}
+#endif
}
-MathCursor::MathCursor(InsetFormulaBase * formula)
+MathCursor::MathCursor(InsetFormulaBase * formula, bool left)
: formula_(formula), lastcode_(LM_TC_VAR), selection_(false)
{
- first();
+ left ? first() : last();
}
-void MathCursor::pushLeft(MathInset * par)
+void MathCursor::push(MathAtom & t)
{
MathCursorPos p;
- p.par_ = par;
- par->idxFirst(p.idx_, p.pos_);
+ p.par_ = &t;
+ p.idx_ = 0;
+ p.pos_ = 0;
Cursor_.push_back(p);
}
-void MathCursor::pushRight(MathInset * par)
+void MathCursor::pushLeft(MathAtom & t)
+{
+ //cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
+ push(t);
+ t->idxFirst(idx(), pos());
+}
+
+
+void MathCursor::pushRight(MathAtom & t)
{
+ //cerr << "Entering atom "; t->write(cerr, false); cerr << " right\n";
posLeft();
- MathCursorPos p;
- p.par_ = par;
- par->idxLast(p.idx_, p.pos_);
- Cursor_.push_back(p);
+ push(t);
+ t->idxLast(idx(), pos());
}
bool MathCursor::popLeft()
{
+ //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " left\n";
if (Cursor_.size() <= 1)
return false;
+ //if (nextInset())
+ // nextInset()->removeEmptyScripts();
Cursor_.pop_back();
- //array().at(pos())->removeEmptyScripts();
+ //if (nextAtom())
+ // nextAtom()->removeEmptyScripts();
return true;
}
bool MathCursor::popRight()
{
+ //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
if (Cursor_.size() <= 1)
return false;
+ //if (nextInset())
+ // nextInset()->removeEmptyScripts();
Cursor_.pop_back();
- //array().at(pos())->removeEmptyScripts();
+ //if (nextInset())
+ // nextInset()->removeEmptyScripts();
posRight();
return true;
}
-MathInset * MathCursor::parInset(int i) const
-{
- return Cursor_[i].par_;
-}
-
-void MathCursor::dump(char const *) const
+#if FILEDEBUG
+void MathCursor::dump(char const * what) const
{
-#if 0
lyxerr << "MC: " << what << "\n";
for (unsigned i = 0; i < Cursor_.size(); ++i)
lyxerr << " i: " << i
- << " pos: " << Cursor_[i].pos_
+ << " Cursor: pos: " << Cursor_[i].pos_
<< " idx: " << Cursor_[i].idx_
<< " par: " << Cursor_[i].par_ << "\n";
- //lyxerr << " sel: " << selection_ << " data: " << array() << "\n";
-#endif
+
+ for (unsigned i = 0; i < Anchor_.size(); ++i)
+ lyxerr << " i: " << i
+ << " Anchor: pos: " << Anchor_[i].pos_
+ << " idx: " << Anchor_[i].idx_
+ << " par: " << Anchor_[i].par_ << "\n";
+
+ lyxerr << " sel: " << selection_ << "\n";
}
{
//lyxerr << "SEL: " << str << ": '" << theSelection << "'\n";
//dump(" Pos");
- return;
lyxerr << "\n\n\n=================vvvvvvvvvvvvv======================= "
<< str << "\ntheSelection: " << selection_
lyxerr << "\n===================^^^^^^^^^^^^=====================\n\n\n";
}
+#else
+
+void MathCursor::seldump(char const *) const {}
+void MathCursor::dump(char const *) const {}
+
+#endif
+
+
+UpdatableInset * MathCursor::asHyperActiveInset() const
+{
+ return par()->asHyperActiveInset();
+}
+
bool MathCursor::isInside(MathInset const * p) const
{
for (unsigned i = 0; i < Cursor_.size(); ++i)
- if (parInset(i) == p)
+ if (Cursor_[i].par_->nucleus() == p)
return true;
return false;
}
-bool MathCursor::openable(MathInset * p, bool sel) const
+bool MathCursor::openable(MathAtom const & t, bool sel) const
{
- if (!p)
+ if (t->isHyperActive())
+ return true;
+
+ if (!t->isActive())
return false;
- if (!p->isActive())
+ if (t->asScriptInset())
return false;
if (sel) {
// we can't move into anything new during selection
if (Cursor_.size() == Anchor_.size())
return false;
- if (p != Anchor_[Cursor_.size()].par_)
+ if (&t != Anchor_[Cursor_.size()].par_)
return false;
}
return true;
}
-MathInset * MathCursor::positionable(MathAtom * t, int x, int y) const
+bool MathCursor::positionable(MathAtom const & t, int x, int y) const
{
- if (!t)
- return 0;
-
if (selection_) {
// we can't move into anything new during selection
if (Cursor_.size() == Anchor_.size())
// return 0;
}
- MathInset * p;
-
- p = t->nucleus();
- if (p && p->nargs() && p->covers(x, y))
- return p;
-
- p = t->up();
- if (p && p->nargs() && p->covers(x, y))
- return p;
-
- p = t->down();
- if (p && p->nargs() && p->covers(x, y))
- return p;
-
- return 0;
+ return t->nargs() && t->covers(x, y);
}
selHandle(sel);
lastcode_ = LM_TC_VAR;
- MathInset * p = prevInset();
- if (openable(p, sel)) {
- pushRight(p);
+ if (hasPrevAtom() && openable(prevAtom(), sel)) {
+ if (prevAtom()->isHyperActive()) {
+ lyxerr << "entering hyperactive inset\n";
+ }
+ pushRight(prevAtom());
return true;
}
-
- return posLeft() || idxLeft() || popLeft();
+
+ return posLeft() || idxLeft() || popLeft() || selection_;
}
selHandle(sel);
lastcode_ = LM_TC_VAR;
- MathInset * p = nextInset();
- if (openable(p, sel)) {
- pushLeft(p);
+ if (hasNextAtom() && openable(nextAtom(), sel)) {
+ if (nextAtom()->isHyperActive()) {
+ lyxerr << "entering hyperactive inset\n";
+ int x, y;
+ getPos(x, y);
+ nextAtom()->edit(formula()->view(), x, y, 0);
+ }
+ pushLeft(nextAtom());
return true;
}
- return posRight() || idxRight() || popRight();
+ return posRight() || idxRight() || popRight() || selection_;
}
void MathCursor::first()
{
Cursor_.clear();
- pushLeft(outerPar());
+ pushLeft(formula_->par());
}
lastcode_ = LM_TC_VAR;
first();
- cursor().par_ = outerPar();
+ cursor().par_ = &formula_->par();
while (1) {
- idx() = -1;
- cursor().pos_ = -1;
+ idx() = 0;
+ cursor().pos_ = 0;
//lyxerr << "found idx: " << idx() << " cursor: " << pos() << "\n";
int distmin = 1 << 30; // large enough
- for (int i = 0; i < par()->nargs(); ++i) {
+ for (unsigned int i = 0; i < par()->nargs(); ++i) {
MathXArray const & ar = par()->xcell(i);
int x1 = x - ar.xo();
int y1 = y - ar.yo();
- int c = ar.x2pos(x1);
+ MathXArray::size_type c = ar.x2pos(x1);
int xx = abs(x1 - ar.pos2x(c));
int yy = abs(y1);
//lyxerr << "idx: " << i << " xx: " << xx << " yy: " << yy
}
//lyxerr << "found idx: " << idx() << " cursor: "
// << pos() << "\n";
- if (MathInset * p = positionable(nextAtom(), x, y))
- pushLeft(p);
- else if (MathInset * p = positionable(prevAtom(), x, y))
- pushRight(p);
+ if (hasNextAtom() && positionable(nextAtom(), x, y))
+ pushLeft(nextAtom());
+ else if (hasPrevAtom() && positionable(prevAtom(), x, y))
+ pushRight(prevAtom());
else
break;
}
}
+void MathCursor::plainInsert(MathAtom const & t)
+{
+ array().insert(pos(), t);
+ ++pos();
+}
+
+
void MathCursor::insert(char c, MathTextCodes t)
{
//lyxerr << "inserting '" << c << "'\n";
- array().insert(pos(), new MathCharInset(c, t));
- posRight();
+ plainInsert(MathAtom(new MathCharInset(c, t)));
}
-void MathCursor::insert(MathInset * p)
+void MathCursor::insert(MathAtom const & t)
{
macroModeClose();
if (selection_) {
- if (p->nargs())
+ if (t->nargs())
selCut();
else
selDel();
}
- array().insert(pos(), p); // this invalidates the pointer!
- p = array().at(pos())->nucleus();
- posRight();
+ plainInsert(t);
}
-void MathCursor::niceInsert(MathInset * p)
+void MathCursor::niceInsert(MathAtom const & t)
{
- if (!p) {
- lyxerr << "should not happen\n";
- return;
- }
selCut();
- //cerr << "\n2: "; p->write(cerr, true); cerr << "\n";
- insert(p); // inserting invalidates the pointer!
- p = prevAtom()->nucleus();
- //cerr << "\n3: "; p->write(cerr, true); cerr << "\n";
+ insert(t); // inserting invalidates the pointer!
+ MathAtom const & p = prevAtom();
if (p->nargs()) {
posLeft();
right(); // do not push for e.g. MathSymbolInset
selPaste();
}
- p->metrics(p->size());
+#ifdef WITH_WARNINGS
+#warning "redraw disabled"
+#endif
+ //p->metrics(p->size());
}
}
+void MathCursor::paste(MathArray const & ar)
+{
+ Anchor_ = Cursor_;
+ selection_ = true;
+ array().insert(pos(), ar);
+ pos() += ar.size();
+}
+
+
void MathCursor::backspace()
{
- if (posLeft()) {
- plainErase();
+ if (pos() == 0) {
+ pullArg(false);
return;
- }
+ }
- if (size()) {
- pullArg(false);
+ if (selection_) {
+ selDel();
return;
}
- erase();
+ MathScriptInset * p = prevAtom()->asScriptInset();
+ if (p) {
+ p->removeScript(p->hasUp());
+ // Don't delete if there is anything left
+ if (p->hasUp() || p->hasDown())
+ return;
+ }
+
+ --pos();
+ plainErase();
}
void MathCursor::erase()
{
- dump("erase 1");
if (inMacroMode())
return;
}
// delete empty cells if necessary
- if (pos() == 0 && array().empty()) {
+ if (array().empty()) {
bool popit;
bool removeit;
par()->idxDelete(idx(), popit, removeit);
return;
}
- if (pos() < size())
- plainErase();
+ if (pos() == size())
+ return;
- dump("erase 2");
+ MathScriptInset * p = nextAtom()->asScriptInset();
+ if (p) {
+ p->removeScript(p->hasUp());
+ // Don't delete if there is anything left
+ if (p->hasUp() || p->hasDown())
+ return;
+ }
+
+ plainErase();
}
if (par()->nrows() > 1)
par()->delRow(row());
+
+ if (pos() > size())
+ pos() = size();
}
macroModeClose();
selHandle(sel);
- if (selection_)
- return goUp();
-
- // check whether we could move into a superscript on the right or on the left
- if (prevAtom() && prevAtom()->up()) {
- pushRight(prevAtom()->up());
- return true;
- }
+ if (!selection_) {
+ // check whether we could move into a superscript
+ if (hasPrevAtom()) {
+ MathAtom & p = prevAtom();
+ if (p->asScriptInset() && p->asScriptInset()->hasUp()) {
+ pushRight(p);
+ idx() = 1;
+ pos() = size();
+ return true;
+ }
+ }
- if (nextAtom() && nextAtom()->up()) {
- pushLeft(nextAtom()->up());
- return true;
+ if (hasNextAtom()) {
+ MathAtom & n = nextAtom();
+ if (n->asScriptInset() && n->asScriptInset()->hasUp()) {
+ pushLeft(n);
+ idx() = 1;
+ pos() = 0;
+ return true;
+ }
+ }
}
- return goUp();
+ return goUp() || selection_;
}
macroModeClose();
selHandle(sel);
- if (selection_)
- return goDown();
-
- // check whether we could move into an subscript on the right or on the left
- if (prevAtom() && prevAtom()->down()) {
- pushRight(prevAtom()->down());
- return true;
- }
+ if (!selection_) {
+ // check whether we could move into a subscript
+ if (hasPrevAtom()) {
+ MathAtom & p = prevAtom();
+ if (p->asScriptInset() && p->asScriptInset()->hasDown()) {
+ pushRight(p);
+ idx() = 0;
+ pos() = size();
+ return true;
+ }
+ }
- if (nextAtom() && nextAtom()->down()) {
- pushLeft(nextAtom()->down());
- return true;
+ if (hasNextAtom()) {
+ MathAtom & n = nextAtom();
+ if (n->asScriptInset() && n->asScriptInset()->hasDown()) {
+ pushLeft(n);
+ idx() = 0;
+ pos() = 0;
+ return true;
+ }
+ }
}
- return goDown();
+ return goDown() || selection_;
}
bool MathCursor::toggleLimits()
{
- MathAtom * t = prevAtom();
+ if (!hasPrevAtom())
+ return false;
+ MathScriptInset * t = prevAtom()->asScriptInset();
if (!t)
return false;
int old = t->limits();
}
-void MathCursor::setSize(MathStyles size)
+void MathCursor::macroModeClose()
{
- par()->userSetSize(size);
+ string s = macroName();
+ if (s.size()) {
+ size_type old = pos();
+ pos() -= s.size();
+ array().erase(pos(), old);
+ interpret(s);
+ }
}
-void MathCursor::macroModeClose()
+int MathCursor::macroNamePos() const
{
- string s = macroName();
- if (s.size()) {
- pos() = pos() - s.size();
- for (unsigned i = 0; i < s.size(); ++i)
- plainErase();
- lastcode_ = LM_TC_VAR;
- interpret("\\" + s);
+ for (int i = pos() - 1; i >= 0; --i) {
+ MathAtom & p = array().at(i);
+ if (p->code() == LM_TC_TEX && p->getChar() == '\\')
+ return i;
}
+ return -1;
}
string MathCursor::macroName() const
{
string s;
- for (int i = pos() - 1; i >= 0; --i) {
- MathInset * p = array().at(i)->nucleus();
- if (p && p->code() == LM_TC_TEX)
- s = p->getChar() + s;
- else
- break;
- }
+ for (int i = macroNamePos(); i >= 0 && i < int(pos()); ++i)
+ s += array().at(i)->getChar();
return s;
}
seldump("selDel");
if (selection_) {
theSelection.erase(*this);
+ if (pos() > size())
+ pos() = size();
selClear();
}
}
{
seldump("selPaste");
theSelection.paste(*this);
- selClear();
+ theSelection.grab(*this);
+ //selClear();
}
}
+void MathCursor::selGet(MathArray & ar)
+{
+ seldump("selGet");
+ if (!selection_)
+ return;
+
+ theSelection.grab(*this);
+ ar = theSelection.glue();
+}
+
+
+
void MathCursor::drawSelection(Painter & pain) const
{
if (!selection_)
MathCursorPos i1;
MathCursorPos i2;
getSelection(i1, i2);
-
//lyxerr << "selection from: " << i1 << " to " << i2 << "\n";
if (i1.idx_ == i2.idx_) {
int y2 = c.yo() + c.descent();
pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
} else {
- std::vector<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
+ std::vector<MathInset::idx_type> indices
+ = (*i1.par_)->idxBetween(i1.idx_, i2.idx_);
for (unsigned i = 0; i < indices.size(); ++i) {
MathXArray & c = i1.xcell(indices[i]);
int x1 = c.xo();
pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
}
}
-}
-
-MathTextCodes MathCursor::nextCode() const
-{
- //return (pos() == size()) ? LM_TC_VAR : nextInset()->code();
- return LM_TC_VAR;
+#if 0
+ // draw anchor if different from selection boundary
+ MathCursorPos anc = Anchor_.back();
+ if (anc != i1 && anc != i2) {
+ MathXArray & c = anc.xcell();
+ int x = c.xo() + c.pos2x(anc.pos_);
+ int y1 = c.yo() - c.ascent();
+ int y2 = c.yo() + c.descent();
+ pain.line(x, y1, x, y2, LColor::mathline);
+ }
+#endif
}
getSelection(i1, i2);
if (i1.idx_ == i2.idx_) {
MathArray & ar = i1.cell();
- for (int pos = i1.pos_; pos != i2.pos_; ++pos) {
- MathInset * p = ar.at(pos)->nucleus();
- if (p)
- p->handleFont(t);
- }
+ for (MathInset::pos_type pos = i1.pos_; pos != i2.pos_; ++pos)
+ ar.at(pos)->handleFont(t);
}
} else
lastcode_ = (lastcode_ == t) ? LM_TC_VAR : t;
selCut();
p->cell(0) = theSelection.glue();
}
- insert(p); // this invalidates p!
- p = prevAtom()->nucleus();
- pushRight(p);
+ insert(MathAtom(p)); // this invalidates p!
+ pushRight(prevAtom());
}
}
-MathInset * MathCursor::par() const
+MathAtom & MathCursor::par() const
{
- return cursor().par_;
+ return *cursor().par_;
}
}
-int MathCursor::idx() const
+MathCursor::idx_type MathCursor::idx() const
{
return cursor().idx_;
}
-int & MathCursor::idx()
+MathCursor::idx_type & MathCursor::idx()
{
return cursor().idx_;
}
-int MathCursor::pos() const
+MathCursor::pos_type MathCursor::pos() const
{
return cursor().pos_;
}
-int & MathCursor::pos()
+MathCursor::pos_type & MathCursor::pos()
{
return cursor().pos_;
}
bool MathCursor::inMacroMode() const
{
- return lastcode_ == LM_TC_TEX;
+ return macroNamePos() != -1;
}
}
-MathArrayInset * MathCursor::enclosingArray(int & idx) const
+MathGridInset * MathCursor::enclosingGrid(MathCursor::idx_type & idx) const
{
for (int i = Cursor_.size() - 1; i >= 0; --i) {
- if (Cursor_[i].par_->isArray()) {
+ MathGridInset * p = (*Cursor_[i].par_)->asGridInset();
+ if (p) {
idx = Cursor_[i].idx_;
- return static_cast<MathArrayInset *>(Cursor_[i].par_);
+ return p;
}
}
return 0;
void MathCursor::pullArg(bool goright)
{
- // pullArg
dump("pullarg");
MathArray a = array();
+
+ MathScriptInset const * p = par()->asScriptInset();
+ if (p) {
+ // special handling for scripts
+ const bool up = p->hasUp();
+ popLeft();
+ MathScriptInset * q = nextAtom()->asScriptInset();
+ if (q)
+ q->removeScript(up);
+ ++pos();
+ array().insert(pos(), a);
+ return;
+ }
+
if (popLeft()) {
plainErase();
array().insert(pos(), a);
}
-MathStyles MathCursor::style() const
-{
- return xarray().style();
-}
-
-
void MathCursor::normalize() const
{
#ifdef WITH_WARNINGS
#endif
MathCursor * it = const_cast<MathCursor *>(this);
- if (idx() < 0)
- lyxerr << "this should not really happen - 1: " << idx() << "\n";
if (idx() >= par()->nargs()) {
- lyxerr << "this should not really happen - 2: "
+ lyxerr << "this should not really happen - 1: "
<< idx() << " " << par()->nargs() << "\n";
dump("error 2");
}
- it->idx() = max(idx(), 0);
it->idx() = min(idx(), par()->nargs() - 1);
- if (pos() < 0)
- lyxerr << "this should not really happen - 3: " << pos() << "\n";
if (pos() > size()) {
- lyxerr << "this should not really happen - 4: "
- << pos() << " " << size() << "\n";
+ lyxerr << "this should not really happen - 2: "
+ << pos() << " " << size() << " in idx: " << it->idx()
+ << " in atom: '";
+ WriteStream wi(0, lyxerr, false);
+ it->par()->write(wi);
+ lyxerr << "\n";
dump("error 4");
}
- it->pos() = max(pos(), 0);
it->pos() = min(pos(), size());
}
-int MathCursor::size() const
+MathCursor::size_type MathCursor::size() const
{
return array().size();
}
-int MathCursor::col() const
+MathCursor::col_type MathCursor::col() const
{
return par()->col(idx());
}
-int MathCursor::row() const
+MathCursor::row_type MathCursor::row() const
{
return par()->row(idx());
}
-/*
-char MathCursorPos::getChar() const
-{
- return array().getChar(pos());
-}
-
-
-string MathCursorPos::readString()
-{
- string s;
- int code = nextCode();
- for ( ; OK() && nextCode() == code; Next())
- s += getChar();
-
- return s;
-}
-*/
-
-
-MathInset * MathCursor::prevInset() const
+bool MathCursor::hasPrevAtom() const
{
- return prevAtom() ? prevAtom()->nucleus() : 0;
+ return pos() > 0;
}
-MathInset * MathCursor::nextInset() const
+bool MathCursor::hasNextAtom() const
{
- return nextAtom() ? nextAtom()->nucleus() : 0;
+ return pos() < size();
}
-MathSpaceInset * MathCursor::prevSpaceInset() const
-{
- MathInset * p = prevInset();
- return (p && p->isSpaceInset()) ? static_cast<MathSpaceInset *>(p) : 0;
-}
-
-
-MathAtom const * MathCursor::prevAtom() const
+MathAtom const & MathCursor::prevAtom() const
{
+ lyx::Assert(pos() > 0);
return array().at(pos() - 1);
}
-MathAtom * MathCursor::prevAtom()
+MathAtom & MathCursor::prevAtom()
{
+ lyx::Assert(pos() > 0);
return array().at(pos() - 1);
}
-MathAtom const * MathCursor::nextAtom() const
+MathAtom const & MathCursor::nextAtom() const
{
+ lyx::Assert(pos() < size());
return array().at(pos());
}
-MathAtom * MathCursor::nextAtom()
+MathAtom & MathCursor::nextAtom()
{
+ lyx::Assert(pos() < size());
return array().at(pos());
}
MathArray & MathCursor::array() const
{
static MathArray dummy;
- if (!par()) {
- lyxerr << "############ par_ not valid\n";
- return dummy;
- }
- if (idx() < 0 || idx() >= par()->nargs()) {
+ if (idx() >= par()->nargs()) {
lyxerr << "############ idx_ " << idx() << " not valid\n";
return dummy;
}
while (popRight())
;
- MathMatrixInset * p = outerPar();
+ MathHullInset * p = formula()->par()->asHullInset();
+ if (!p)
+ return;
+
if (p->getType() == LM_OT_SIMPLE || p->getType() == LM_OT_EQUATION) {
p->mutate(LM_OT_EQNARRAY);
idx() = 0;
p->addRow(row());
// split line
- const int r = row();
- for (int c = col() + 1; c < p->ncols(); ++c) {
- const int i1 = p->index(r, c);
- const int i2 = p->index(r + 1, c);
- lyxerr << "swapping cells " << i1 << " and " << i2 << "\n";
- p->cell(i1).swap(p->cell(i2));
- }
+ const row_type r = row();
+ for (col_type c = col() + 1; c < p->ncols(); ++c)
+ p->cell(p->index(r, c)).swap(p->cell(p->index(r + 1, c)));
// split cell
splitCell();
}
+void MathCursor::readLine(MathArray & ar) const
+{
+ idx_type base = row() * par()->ncols();
+ for (idx_type off = 0; off < par()->ncols(); ++off)
+ ar.push_back(par()->cell(base + off));
+}
+
+
char MathCursor::valign() const
{
- int idx;
- MathArrayInset * p = enclosingArray(idx);
- return p ? p->valign() : 0;
+ idx_type idx;
+ MathGridInset * p = enclosingGrid(idx);
+ return p ? p->valign() : '\0';
}
char MathCursor::halign() const
{
- int idx;
- MathArrayInset * p = enclosingArray(idx);
- return p ? p->halign(idx % p->ncols()) : 0;
+ idx_type idx;
+ MathGridInset * p = enclosingGrid(idx);
+ return p ? p->halign(idx % p->ncols()) : '\0';
}
if (par()->idxUp(idx(), pos()))
return true;
+ // leave subscript to the nearest side
+ MathScriptInset * p = par()->asScriptInset();
+ if (p && idx() == 0) {
+ if (pos() <= size() / 2)
+ popLeft();
+ else
+ popRight();
+ return true;
+ }
+
// if not, apply brute force.
int x0;
int y0;
getPos(x0, y0);
std::vector<MathCursorPos> save = Cursor_;
y0 -= xarray().ascent();
- for (int y = y0 - 4; y > outerPar()->yo() - outerPar()->ascent(); y -= 4) {
+ for (int y = y0 - 4; y > formula()->upperY(); y -= 4) {
setPos(x0, y);
if (save != Cursor_ && xarray().yo() < y0)
return true;
if (par()->idxDown(idx(), pos()))
return true;
+ // leave superscript to the nearest side
+ MathScriptInset * p = par()->asScriptInset();
+ if (p && idx() == 1) {
+ if (pos() <= size() / 2)
+ popLeft();
+ else
+ popRight();
+ return true;
+ }
+
// if not, apply brute force.
int x0;
int y0;
getPos(x0, y0);
std::vector<MathCursorPos> save = Cursor_;
y0 += xarray().descent();
- for (int y = y0 + 4; y < outerPar()->yo() + outerPar()->descent(); y += 4) {
+ for (int y = y0 + 4; y < formula()->lowerY(); y += 4) {
setPos(x0, y);
if (save != Cursor_ && xarray().yo() > y0)
return true;
}
-MathMatrixInset * MathCursor::outerPar() const
+bool MathCursor::interpret(string const & s)
{
- return
- static_cast<MathMatrixInset *>(const_cast<MathInset *>(formula_->par()));
-}
-
-
-void MathCursor::interpret(string const & s)
-{
- //lyxerr << "interpret: '" << s << "'\n";
- //lyxerr << "in: " << in_word_set(s) << " \n";
-
+ //lyxerr << "interpret 1: '" << s << "'\n";
if (s.empty())
- return;
+ return true;
- char c = s[0];
+ if (s.size() == 1)
+ return interpret(s[0]);
- //lyxerr << "char: '" << c << "' int: " << int(c) << endl;
- //owner_->getIntl()->getTrans().TranslateAndInsert(c, lt);
- //lyxerr << "trans: '" << c << "' int: " << int(c) << endl;
+ //lyxerr << "char: '" << s[0] << "' int: " << int(s[0]) << endl;
+ //owner_->getIntl()->getTrans().TranslateAndInsert(s[0], lt);
+ //lyxerr << "trans: '" << s[0] << "' int: " << int(s[0]) << endl;
- if (s.size() > 7 && s.substr(0, 7) == "matrix ") {
- int m = 1;
- int n = 1;
+ if (s.size() >= 5 && s.substr(0, 5) == "cases") {
+ unsigned int n = 1;
+ istringstream is(s.substr(6).c_str());
+ is >> n;
+ n = std::max(1u, n);
+ niceInsert(MathAtom(new MathCasesInset(n)));
+ return true;
+ }
+
+ if (s.size() >= 6 && s.substr(0, 6) == "matrix") {
+ unsigned int m = 1;
+ unsigned int n = 1;
string v_align;
string h_align;
istringstream is(s.substr(7).c_str());
is >> m >> n >> v_align >> h_align;
- m = std::max(1, m);
- n = std::max(1, n);
+ m = std::max(1u, m);
+ n = std::max(1u, n);
v_align += 'c';
- MathArrayInset * p = new MathArrayInset(m, n);
- p->valign(v_align[0]);
- p->halign(h_align);
- niceInsert(p);
- return;
+ niceInsert(MathAtom(new MathArrayInset(m, n, v_align[0], h_align)));
+ return true;
}
if (s == "\\over" || s == "\\choose" || s == "\\atop") {
MathArray ar = array();
- MathInset * p = createMathInset(s.substr(1));
- p->cell(0).swap(array());
+ MathAtom t = createMathInset(s.substr(1));
+ t->asNestInset()->cell(0).swap(array());
pos() = 0;
- niceInsert(p);
+ niceInsert(t);
popRight();
left();
- return;
- }
-
- if (s.size() > 1) {
- niceInsert(createMathInset(s.substr(1)));
- return;
+ return true;
}
+ niceInsert(createMathInset(s.substr(1)));
+ return true;
+}
- // we got just a single char now
+bool MathCursor::interpret(char c)
+{
+ //lyxerr << "interpret 2: '" << c << "'\n";
if (c == '^' || c == '_') {
- bool const up = (s[0] == '^');
- selCut();
- if (!prevInset()) {
- insert('{', LM_TC_TEX);
- insert('}', LM_TC_TEX);
+ macroModeClose();
+ const bool up = (c == '^');
+ selCut();
+ if (hasPrevAtom() && prevAtom()->asScriptInset()) {
+ prevAtom()->asScriptInset()->ensure(up);
+ pushRight(prevAtom());
+ idx() = up;
+ pos() = size();
+ } else if (hasNextAtom() && nextAtom()->asScriptInset()) {
+ nextAtom()->asScriptInset()->ensure(up);
+ pushLeft(nextAtom());
+ idx() = up;
+ pos() = 0;
+ } else {
+ plainInsert(MathAtom(new MathScriptInset(up)));
+ prevAtom()->asScriptInset()->ensure(up);
+ pushRight(prevAtom());
+ idx() = up;
+ pos() = 0;
}
- MathInset * par = prevAtom()->ensure(up);
- pushRight(par);
selPaste();
- return;
+ dump("1");
+ return true;
+ }
+
+
+ // handle macroMode
+ if (inMacroMode()) {
+ string name = macroName();
+
+ if (name == "\\" && c == '#') {
+ insert(c, LM_TC_TEX);
+ return true;
+ }
+
+ if (name == "\\" && c == '\\') {
+ backspace();
+ interpret("\\backslash");
+ return true;
+ }
+
+ if (name == "\\#" && '1' <= c && c <= '9') {
+ insert(c, LM_TC_TEX);
+ macroModeClose();
+ return true;
+ }
+
+ if (isalpha(c)) {
+ insert(c, LM_TC_TEX);
+ return true;
+ }
+
+ if (name == "\\") {
+ insert(c, LM_TC_TEX);
+ macroModeClose();
+ return true;
+ }
+
+ macroModeClose();
+ return true;
}
if (selection_)
selDel();
if (lastcode_ == LM_TC_TEXTRM) {
+ // suppress direct insertion of to spaces in a row
+ // the still allows typing '<space>a<space>' and deleting the 'a', but
+ // it is better than nothing
+ if (hasPrevAtom() && prevAtom()->getChar() == ' ')
+ return true;
insert(c, LM_TC_TEXTRM);
- return;
+ return true;
}
if (c == ' ') {
- if (inMacroMode()) {
- macroModeClose();
- lastcode_ = LM_TC_VAR;
- return;
+ if (hasPrevAtom() && prevAtom()->asSpaceInset()) {
+ prevAtom()->asSpaceInset()->incSpace();
+ return true;
}
+
+ if (mathcursor->popRight())
+ return true;
- MathSpaceInset * p = prevSpaceInset();
- if (p) {
- p->incSpace();
- return;
- }
+ // if are at the very end, leave the formula
+ return pos() != size();
+ }
- if (mathcursor->popRight())
- return;
+/*
+ if (strchr("{}", c)) {
+ insert(c, LM_TC_TEX);
+ return true;
+ }
+*/
-#warning look here
- // this would not work if the inset is in an table!
- //bv->text->cursorRight(bv, true);
- //result = FINISHED;
- return;
+ if (c == '{') {
+ niceInsert(MathAtom(new MathBraceInset));
+ return true;
}
- if (lastcode_ != LM_TC_TEX && strchr("#$%{}", c)) {
- insert(new MathSpecialCharInset(c));
- lastcode_ = LM_TC_VAR;
- return;
+ if (c == '}') {
+ return true;
}
- if (lastcode_ == LM_TC_TEX) {
- if (macroName().empty()) {
- if (strchr("$%{}", c)) {
- insert(new MathCharInset(c, LM_TC_TEX));
- lastcode_ = LM_TC_VAR;
- return;
- }
- insert(c, LM_TC_TEX);
- if (!isalpha(c) && c != '#') {
- macroModeClose();
- lastcode_ = LM_TC_VAR;
- }
- } else {
- if ('1' <= c && c <= '9' && macroName() == "#") {
- insert(c, LM_TC_TEX);
- macroModeClose();
- lastcode_ = LM_TC_VAR;
- }
- else if (isalpha(c))
- insert(c, LM_TC_TEX);
- else {
- macroModeClose();
- lastcode_ = LM_TC_VAR;
- }
- }
- return;
+ if (strchr("#$%", c)) {
+ insert(MathAtom(new MathSpecialCharInset(c)));
+ lastcode_ = LM_TC_VAR;
+ return true;
}
- if (isalpha(c) && (lastcode_ == LM_TC_GREEK || lastcode_ == LM_TC_GREEK1)) {
- static char const greekl[][26] =
- {"alpha", "beta", "chi", "delta", "epsilon", "phi",
- "gamma", "eta", "iota", "", "kappa", "lambda", "mu",
- "nu", "omikron", "pi", "omega", "rho", "sigma",
- "tau", "upsilon", "theta", "", "xi", "upsilon", "zeta"};
- static char const greeku[][26] =
- {"Alpha", "Beta", "Chi", "Delta", "Epsilon", "Phi",
- "Gamma", "Eta", "Iota", "", "Kappa", "Lambda", "Mu",
- "Nu", "Omikron", "Pi", "Omega", "Rho", "Sigma", "Tau",
- "Upsilon", "Theta", "", "xi", "Upsilon", "Zeta"};
-
- latexkeys const * l = 0;
- if ('a' <= c && c <= 'z')
- l = in_word_set(greekl[c - 'a']);
- if ('A' <= c && c <= 'Z')
- l = in_word_set(greeku[c - 'A']);
-
- if (l)
- insert(createMathInset(l));
- else
- insert(c, LM_TC_VAR);
+ if (isalpha(c) && lastcode_ == LM_TC_GREEK) {
+ insert(c, LM_TC_VAR);
+ return true;
+ }
-#warning greek insert problem? look here!
- if (lastcode_ == LM_TC_GREEK1)
- lastcode_ = LM_TC_VAR;
- return;
+ if (isalpha(c) && lastcode_ == LM_TC_GREEK1) {
+ insert(c, LM_TC_VAR);
+ lastcode_ = LM_TC_VAR;
+ return true;
}
if (c == '\\') {
- lastcode_ = LM_TC_TEX;
+ insert(c, LM_TC_TEX);
//bv->owner()->message(_("TeX mode"));
- return;
+ return true;
}
// no special circumstances, so insert the character without any fuss
- insert(c);
+ insert(c, LM_TC_MIN);
+ return true;
}
}
-MathArray & MathCursorPos::cell(int idx) const
+MathArray & MathCursorPos::cell(MathCursor::idx_type idx) const
{
- return par_->cell(idx);
+ return (*par_)->cell(idx);
}
MathArray & MathCursorPos::cell() const
{
- return par_->cell(idx_);
+ return (*par_)->cell(idx_);
}
-MathXArray & MathCursorPos::xcell(int idx) const
+MathXArray & MathCursorPos::xcell(MathCursor::idx_type idx) const
{
- return par_->xcell(idx);
+ return (*par_)->xcell(idx);
}
MathXArray & MathCursorPos::xcell() const
{
- return par_->xcell(idx_);
+ return (*par_)->xcell(idx_);
}
return normal;
}
+
+void MathCursor::stripFromLastEqualSign()
+{
+ // find position of last '=' in the array
+ MathArray & ar = cursor().cell();
+ MathArray::const_iterator et = ar.end();
+ for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+ if ((*it)->getChar() == '=')
+ et = it;
+
+ // delete everything behind this position
+ ar.erase(et - ar.begin(), ar.size());
+ pos() = ar.size();
+}
+
+
projects / lyx.git / blobdiff