X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_cursor.C;h=ca2b35904f9b371e1554971a37f62b03d1bc05e3;hb=28c690f63c66d66beb2635fe5d28a6dd45d3c911;hp=92843e5349b98773a4ba3ee74d046dda84632ba2;hpb=7435fca771bf7c8b4ca5d1801162f8c23112f3cf;p=lyx.git diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C index 92843e5349..ca2b35904f 100644 --- a/src/mathed/math_cursor.C +++ b/src/mathed/math_cursor.C @@ -24,6 +24,7 @@ #include #include "support/lstrings.h" +#include "support/LAssert.h" #include "debug.h" #include "LColor.h" #include "Painter.h" @@ -61,8 +62,9 @@ struct Selection if (i1.idx_ == i2.idx_) data_.push_back(MathArray(i1.cell(), i1.pos_, i2.pos_)); else { - std::vector indices = i1.par_->idxBetween(i1.idx_, i2.idx_); - for (unsigned i = 0; i < indices.size(); ++i) + std::vector 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])); } } @@ -72,10 +74,11 @@ struct Selection MathCursorPos i1; MathCursorPos i2; cursor.getSelection(i1, i2); - if (i1.idx_ == i2.idx_) + if (i1.idx_ == i2.idx_) { i1.cell().erase(i1.pos_, i2.pos_); - else { - std::vector indices = i1.par_->idxBetween(i1.idx_, i2.idx_); + } else { + std::vector indices = + (*i1.par_)->idxBetween(i1.idx_, i2.idx_); for (unsigned i = 0; i < indices.size(); ++i) i1.cell(indices[i]).erase(); } @@ -84,7 +87,8 @@ struct Selection void paste(MathCursor & cursor) const { - cursor.insert(glue()); + MathArray ar = glue(); + cursor.paste(ar); } // glues selection to one cell @@ -111,8 +115,7 @@ 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 @@ -120,77 +123,89 @@ std::ostream & operator<<(std::ostream & os, MathCursorPos const & p) } -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) { + //cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n"; MathCursorPos p; - p.par_ = par; - par->idxFirst(p.idx_, p.pos_); + p.par_ = &t; 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 (nextAtom()) - nextAtom()->removeEmptyScripts(); + //if (nextInset()) + // nextInset()->removeEmptyScripts(); Cursor_.pop_back(); - if (nextAtom()) - nextAtom()->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 (nextAtom()) - nextAtom()->removeEmptyScripts(); + //if (nextInset()) + // nextInset()->removeEmptyScripts(); Cursor_.pop_back(); - if (nextAtom()) - nextAtom()->removeEmptyScripts(); + //if (nextInset()) + // nextInset()->removeEmptyScripts(); posRight(); return true; } -MathInset * MathCursor::parInset(int i) const -{ - return Cursor_[i].par_; -} - #if FILEDEBUG -void MathCursor::dump(char const *) const +void MathCursor::dump(char const * what) const { 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"; + + 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"; } + void MathCursor::seldump(char const * str) const { //lyxerr << "SEL: " << str << ": '" << theSelection << "'\n"; @@ -220,36 +235,33 @@ void MathCursor::dump(char const *) const {} 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->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()) @@ -258,21 +270,7 @@ MathInset * MathCursor::positionable(MathAtom * t, int x, int y) const // 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); } @@ -280,7 +278,9 @@ bool MathCursor::posLeft() { if (pos() == 0) return false; + --pos(); + return true; } @@ -289,7 +289,9 @@ bool MathCursor::posRight() { if (pos() == size()) return false; + ++pos(); + return true; } @@ -305,9 +307,8 @@ bool MathCursor::left(bool sel) selHandle(sel); lastcode_ = LM_TC_VAR; - MathInset * p = prevInset(); - if (openable(p, sel)) { - pushRight(p); + if (hasPrevAtom() && openable(prevAtom(), sel)) { + pushRight(prevAtom()); return true; } @@ -326,9 +327,8 @@ bool MathCursor::right(bool sel) selHandle(sel); lastcode_ = LM_TC_VAR; - MathInset * p = nextInset(); - if (openable(p, sel)) { - pushLeft(p); + if (hasNextAtom() && openable(nextAtom(), sel)) { + pushLeft(nextAtom()); return true; } @@ -339,7 +339,7 @@ bool MathCursor::right(bool sel) void MathCursor::first() { Cursor_.clear(); - pushLeft(outerPar()); + pushLeft(formula_->par()); } @@ -359,7 +359,7 @@ void MathCursor::setPos(int x, int y) lastcode_ = LM_TC_VAR; first(); - cursor().par_ = outerPar(); + cursor().par_ = &formula_->par(); while (1) { idx() = 0; @@ -370,7 +370,7 @@ void MathCursor::setPos(int x, int y) 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 @@ -383,10 +383,10 @@ void MathCursor::setPos(int x, int y) } //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; } @@ -424,42 +424,40 @@ void MathCursor::plainErase() } +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 @@ -480,25 +478,42 @@ void MathCursor::insert(MathArray const & ar) } +void MathCursor::paste(MathArray const & ar) +{ + Anchor_ = Cursor_; + selection_ = true; + array().insert(pos(), ar); + pos() += ar.size(); +} + + void MathCursor::backspace() { - if (posLeft()) { - erase(); + 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; @@ -508,7 +523,7 @@ void MathCursor::erase() } // delete empty cells if necessary - if (pos() == 0 && array().empty()) { + if (array().empty()) { bool popit; bool removeit; par()->idxDelete(idx(), popit, removeit); @@ -520,39 +535,15 @@ void MathCursor::erase() if (pos() == size()) return; - // delete nucleus, keep scripts if possible - MathAtom * p = prevAtom(); - MathAtom * n = nextAtom(); - if (pos() > 0) { - bool need_parans = (p->up() && n->up()) || (p->down() && n->down()); - if (need_parans) { - // need empty block - insert('{', LM_TC_TEX); - insert('}', LM_TC_TEX); - p = prevAtom(); - n = nextAtom(); - } - // move indices to the left - if (n->up()) - swap(p->up(), n->up()); - if (n->down()) - swap(p->down(), n->down()); - plainErase(); - return; - } - - // pos == 0 now - if (n->up() || n->down()) { - insert('{', LM_TC_TEX); - insert('}', LM_TC_TEX); - p = prevAtom(); - n = nextAtom(); - swap(p->up(), n->up()); - swap(p->down(), n->down()); + 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(); - dump("erase 2"); } @@ -576,18 +567,27 @@ bool MathCursor::up(bool sel) 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(); @@ -600,18 +600,27 @@ bool MathCursor::down(bool sel) 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(); @@ -620,7 +629,9 @@ bool MathCursor::down(bool sel) bool MathCursor::toggleLimits() { - MathAtom * t = prevAtom(); + if (!hasPrevAtom()) + return false; + MathScriptInset * t = prevAtom()->asScriptInset(); if (!t) return false; int old = t->limits(); @@ -639,25 +650,30 @@ void MathCursor::macroModeClose() { 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); + size_type old = pos(); + pos() -= s.size(); + array().erase(pos(), old); + interpret(s); } } +int MathCursor::macroNamePos() const +{ + 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; } @@ -699,7 +715,8 @@ void MathCursor::selPaste() { seldump("selPaste"); theSelection.paste(*this); - selClear(); + theSelection.grab(*this); + //selClear(); } @@ -752,7 +769,8 @@ void MathCursor::drawSelection(Painter & pain) const int y2 = c.yo() + c.descent(); pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection); } else { - std::vector indices = i1.par_->idxBetween(i1.idx_, i2.idx_); + std::vector 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(); @@ -765,13 +783,6 @@ void MathCursor::drawSelection(Painter & pain) const } -MathTextCodes MathCursor::nextCode() const -{ - //return (pos() == size()) ? LM_TC_VAR : nextInset()->code(); - return LM_TC_VAR; -} - - void MathCursor::handleFont(MathTextCodes t) { macroModeClose(); @@ -781,11 +792,8 @@ void MathCursor::handleFont(MathTextCodes t) getSelection(i1, i2); if (i1.idx_ == i2.idx_) { MathArray & ar = i1.cell(); - for (unsigned 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; @@ -804,9 +812,8 @@ void MathCursor::handleNest(MathInset * p) selCut(); p->cell(0) = theSelection.glue(); } - insert(p); // this invalidates p! - p = prevAtom()->nucleus(); - pushRight(p); + insert(MathAtom(p)); // this invalidates p! + pushRight(prevAtom()); } @@ -820,9 +827,9 @@ void MathCursor::getPos(int & x, int & y) } -MathInset * MathCursor::par() const +MathAtom & MathCursor::par() const { - return cursor().par_; + return *cursor().par_; } @@ -832,25 +839,25 @@ InsetFormulaBase const * MathCursor::formula() } -unsigned int MathCursor::idx() const +MathCursor::idx_type MathCursor::idx() const { return cursor().idx_; } -unsigned int & MathCursor::idx() +MathCursor::idx_type & MathCursor::idx() { return cursor().idx_; } -unsigned int MathCursor::pos() const +MathCursor::pos_type MathCursor::pos() const { return cursor().pos_; } -unsigned int & MathCursor::pos() +MathCursor::pos_type & MathCursor::pos() { return cursor().pos_; } @@ -858,7 +865,7 @@ unsigned int & MathCursor::pos() bool MathCursor::inMacroMode() const { - return lastcode_ == LM_TC_TEX; + return macroNamePos() != -1; } @@ -868,12 +875,13 @@ bool MathCursor::selection() const } -MathArrayInset * MathCursor::enclosingArray(unsigned int & idx) const +MathArrayInset * MathCursor::enclosingArray(MathCursor::idx_type & idx) const { for (int i = Cursor_.size() - 1; i >= 0; --i) { - if (Cursor_[i].par_->isArray()) { + MathArrayInset * p = (*Cursor_[i].par_)->asArrayInset(); + if (p) { idx = Cursor_[i].idx_; - return static_cast(Cursor_[i].par_); + return p; } } return 0; @@ -882,9 +890,22 @@ MathArrayInset * MathCursor::enclosingArray(unsigned int & idx) const 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); @@ -923,82 +944,60 @@ void MathCursor::normalize() const } -unsigned int MathCursor::size() const +MathCursor::size_type MathCursor::size() const { return array().size(); } -unsigned int MathCursor::col() const +MathCursor::col_type MathCursor::col() const { return par()->col(idx()); } -unsigned int MathCursor::row() const +MathCursor::row_type MathCursor::row() const { return par()->row(idx()); } -/* -char MathCursorPos::getChar() const +bool MathCursor::hasPrevAtom() const { - return array().getChar(pos()); + return pos() > 0; } -string MathCursorPos::readString() +bool MathCursor::hasNextAtom() const { - string s; - int code = nextCode(); - for ( ; OK() && nextCode() == code; Next()) - s += getChar(); - - return s; + return pos() < size(); } -*/ -MathInset * MathCursor::prevInset() const -{ - return prevAtom() ? prevAtom()->nucleus() : 0; -} - - -MathInset * MathCursor::nextInset() const -{ - return nextAtom() ? nextAtom()->nucleus() : 0; -} - - -MathSpaceInset * MathCursor::prevSpaceInset() const -{ - MathInset * p = prevInset(); - return (p && p->isSpaceInset()) ? static_cast(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()); } @@ -1006,10 +1005,6 @@ MathAtom * MathCursor::nextAtom() MathArray & MathCursor::array() const { static MathArray dummy; - if (!par()) { - lyxerr << "############ par_ not valid\n"; - return dummy; - } if (idx() >= par()->nargs()) { lyxerr << "############ idx_ " << idx() << " not valid\n"; @@ -1057,7 +1052,10 @@ void MathCursor::breakLine() while (popRight()) ; - MathMatrixInset * p = outerPar(); + MathMatrixInset * p = formula()->par()->asMatrixInset(); + if (!p) + return; + if (p->getType() == LM_OT_SIMPLE || p->getType() == LM_OT_EQUATION) { p->mutate(LM_OT_EQNARRAY); idx() = 0; @@ -1066,10 +1064,10 @@ void MathCursor::breakLine() p->addRow(row()); // split line - const unsigned int r = row(); - for (unsigned int c = col() + 1; c < p->ncols(); ++c) { - const unsigned int i1 = p->index(r, c); - const unsigned int i2 = p->index(r + 1, c); + const row_type r = row(); + for (col_type c = col() + 1; c < p->ncols(); ++c) { + const MathMatrixInset::idx_type i1 = p->index(r, c); + const MathMatrixInset::idx_type i2 = p->index(r + 1, c); lyxerr << "swapping cells " << i1 << " and " << i2 << "\n"; p->cell(i1).swap(p->cell(i2)); } @@ -1083,17 +1081,17 @@ void MathCursor::breakLine() char MathCursor::valign() const { - unsigned int idx; + idx_type idx; MathArrayInset * p = enclosingArray(idx); - return p ? p->valign() : 0; + return p ? p->valign() : '\0'; } char MathCursor::halign() const { - unsigned int idx; + idx_type idx; MathArrayInset * p = enclosingArray(idx); - return p ? p->halign(idx % p->ncols()) : 0; + return p ? p->halign(idx % p->ncols()) : '\0'; } @@ -1122,13 +1120,13 @@ MathCursorPos const & MathCursor::cursor() const } -unsigned int MathCursor::cellXOffset() const +int MathCursor::cellXOffset() const { return par()->cellXOffset(idx()); } -unsigned int MathCursor::cellYOffset() const +int MathCursor::cellYOffset() const { return par()->cellYOffset(idx()); } @@ -1160,7 +1158,8 @@ bool MathCursor::goUp() return true; // leave subscript to the nearest side - if (par()->asScriptInset() && par()->asScriptInset()->down()) { + MathScriptInset * p = par()->asScriptInset(); + if (p && p->hasDown()) { if (pos() <= size() / 2) popLeft(); else @@ -1173,8 +1172,9 @@ bool MathCursor::goUp() int y0; getPos(x0, y0); std::vector save = Cursor_; + MathAtom const & out = formula()->par(); y0 -= xarray().ascent(); - for (int y = y0 - 4; y > outerPar()->yo() - outerPar()->ascent(); y -= 4) { + for (int y = y0 - 4; y > out->yo() - out->ascent(); y -= 4) { setPos(x0, y); if (save != Cursor_ && xarray().yo() < y0) return true; @@ -1191,7 +1191,8 @@ bool MathCursor::goDown() return true; // leave superscript to the nearest side - if (par()->asScriptInset() && par()->asScriptInset()->up()) { + MathScriptInset * p = par()->asScriptInset(); + if (p && p->hasUp()) { if (pos() <= size() / 2) popLeft(); else @@ -1204,8 +1205,9 @@ bool MathCursor::goDown() int y0; getPos(x0, y0); std::vector save = Cursor_; + MathAtom const & out = formula()->par(); y0 += xarray().descent(); - for (int y = y0 + 4; y < outerPar()->yo() + outerPar()->descent(); y += 4) { + for (int y = y0 + 4; y < out->yo() + out->descent(); y += 4) { setPos(x0, y); if (save != Cursor_ && xarray().yo() > y0) return true; @@ -1227,26 +1229,22 @@ bool MathCursor::idxRight() } -MathMatrixInset * MathCursor::outerPar() const -{ - return - static_cast(const_cast(formula_->par())); -} - - void MathCursor::interpret(string const & s) { - //lyxerr << "interpret: '" << s << "'\n"; + //lyxerr << "interpret 1: '" << s << "'\n"; //lyxerr << "in: " << in_word_set(s) << " \n"; if (s.empty()) return; - char c = s[0]; + if (s.size() == 1) { + interpret(s[0]); + return; + } - //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 ") { unsigned int m = 1; @@ -1258,41 +1256,81 @@ void MathCursor::interpret(string const & s) 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); + niceInsert(MathAtom(new MathArrayInset(m, n, v_align[0], h_align))); return; } 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; - } + niceInsert(createMathInset(s.substr(1))); +} + +void MathCursor::interpret(char c) +{ + //lyxerr << "interpret 2: '" << c << "'\n"; + + if (inMacroMode()) { + string name = macroName(); + + if (name == "\\" && c == '#') { + insert(c, LM_TC_TEX); + return; + } + + if (name == "\\" && c == '\\') { + backspace(); + interpret("\\backslash"); + return; + } - // we got just a single char now + if (name == "\\#" && '1' <= c && c <= '9') { + insert(c, LM_TC_TEX); + macroModeClose(); + return; + } + + if (isalpha(c)) { + insert(c, LM_TC_TEX); + return; + } + + if (name == "\\") { + insert(c, LM_TC_TEX); + macroModeClose(); + return; + } + macroModeClose(); + return; + } + + // no macro mode if (c == '^' || c == '_') { - bool const up = (s[0] == '^'); - selCut(); - if (!prevInset()) { - insert('{', LM_TC_TEX); - insert('}', LM_TC_TEX); + const bool up = (c == '^'); + selCut(); + if (hasPrevAtom() && prevAtom()->asScriptInset()) { + prevAtom()->asScriptInset()->ensure(up); + pushRight(prevAtom()); + pos() = size(); + } else if (hasNextAtom() && nextAtom()->asScriptInset()) { + nextAtom()->asScriptInset()->ensure(up); + pushLeft(nextAtom()); + pos() = 0; + } else { + plainInsert(MathAtom(new MathScriptInset(up))); + pushRight(prevAtom()); } - MathInset * par = prevAtom()->ensure(up); - pushRight(par); + idx() = up; selPaste(); return; } @@ -1306,15 +1344,8 @@ void MathCursor::interpret(string const & s) } if (c == ' ') { - if (inMacroMode()) { - macroModeClose(); - lastcode_ = LM_TC_VAR; - return; - } - - MathSpaceInset * p = prevSpaceInset(); - if (p) { - p->incSpace(); + if (hasPrevAtom() && prevAtom()->asSpaceInset()) { + prevAtom()->asSpaceInset()->incSpace(); return; } @@ -1328,51 +1359,28 @@ void MathCursor::interpret(string const & s) return; } - if (lastcode_ != LM_TC_TEX && strchr("#$%{}", c)) { - insert(new MathSpecialCharInset(c)); - lastcode_ = LM_TC_VAR; + if (strchr("{}", c)) { + insert(c, LM_TC_TEX); return; } - 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; - } - } + if (strchr("#$%", c)) { + insert(MathAtom(new MathSpecialCharInset(c))); + lastcode_ = LM_TC_VAR; return; } 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"}; + "gamma", "eta", "iota", "epsilon", "kappa", "lambda", "mu", + "nu", "omikron", "pi", "vartheta", "rho", "sigma", + "tau", "upsilon", "theta", "omega", "xi", "varphi", "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"}; + {"Alpha", "Beta", "chi", "Delta", "varepsilon", "Phi", + "Gamma", "Eta", "Iota", "Epsilon", "Kappa", "Lambda", "Mu", + "Nu", "Omikron", "Pi", "vartheta", "varrho", "Sigma", "varsigma", + "Upsilon", "Theta", "Omega", "Xi", "Varphi", "Zeta"}; latexkeys const * l = 0; if ('a' <= c && c <= 'z') @@ -1392,13 +1400,13 @@ void MathCursor::interpret(string const & s) } if (c == '\\') { - lastcode_ = LM_TC_TEX; + insert(c, LM_TC_TEX); //bv->owner()->message(_("TeX mode")); return; } // no special circumstances, so insert the character without any fuss - insert(c); + insert(c, LM_TC_MIN); } @@ -1424,27 +1432,27 @@ bool operator<(MathCursorPos const & ti, MathCursorPos const & it) } -MathArray & MathCursorPos::cell(unsigned 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(unsigned 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_); } @@ -1459,3 +1467,4 @@ MathCursorPos MathCursor::normalAnchor() const return normal; } +