* the GNU General Public Licence version 2 or later.
*/
+#include <config.h>
+
#ifdef __GNUG__
#pragma implementation
#endif
-#include <config.h>
-#include <algorithm>
-#include <cctype>
-
#include "support/lstrings.h"
#include "support/LAssert.h"
#include "debug.h"
#include "LColor.h"
#include "Painter.h"
+#include "math_cursor.h"
#include "formulabase.h"
#include "math_arrayinset.h"
#include "math_braceinset.h"
+#include "math_boxinset.h"
#include "math_casesinset.h"
#include "math_charinset.h"
-#include "math_cursor.h"
#include "math_deliminset.h"
#include "math_factory.h"
#include "math_hullinset.h"
#include "math_iterator.h"
+#include "math_macroarg.h"
+#include "math_macrotemplate.h"
#include "math_mathmlstream.h"
#include "math_parser.h"
#include "math_replace.h"
#include "math_specialcharinset.h"
#include "math_support.h"
+#include <algorithm>
+#include <cctype>
+
#define FILEDEBUG 0
using std::endl;
using std::max;
using std::swap;
using std::isalnum;
+using std::vector;
+using std::ostringstream;
namespace {
struct Selection
{
+ typedef MathInset::col_type col_type;
+ typedef MathInset::row_type row_type;
+ typedef MathInset::idx_type idx_type;
+
+ Selection()
+ : data_(1, 1)
+ {}
+
+ void region(MathCursorPos const & i1, MathCursorPos const & i2,
+ row_type & r1, row_type & r2, col_type & c1, col_type & c2)
+ {
+ MathInset * p = i1.par_;
+ c1 = p->col(i1.idx_);
+ c2 = p->col(i2.idx_);
+ if (c1 > c2)
+ swap(c1, c2);
+ r1 = p->row(i1.idx_);
+ r2 = p->row(i2.idx_);
+ if (r1 > r2)
+ swap(r1, r2);
+ }
+
void grab(MathCursor const & cursor)
{
- data_.clear();
MathCursorPos i1;
MathCursorPos i2;
- cursor.getSelection(i1, i2);
- if (i1.idx_ == i2.idx_)
- data_.push_back(MathArray(i1.cell(), i1.pos_, i2.pos_));
- else {
- 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]));
+ cursor.getSelection(i1, i2);
+ // shouldn'tt we assert on i1.par_ == i2.par_?
+ if (i1.idx_ == i2.idx_) {
+ data_ = MathGridInset(1, 1);
+ data_.cell(0) = MathArray(i1.cell(), i1.pos_, i2.pos_);
+ } else {
+ row_type r1, r2;
+ col_type c1, c2;
+ region(i1, i2, r1, r2, c1, c2);
+ data_ = MathGridInset(c2 - c1 + 1, r2 - r1 + 1);
+ for (row_type row = 0; row < data_.nrows(); ++row)
+ for (col_type col = 0; col < data_.ncols(); ++col) {
+ idx_type i = i1.par_->index(row + r1, col + c1);
+ data_.cell(data_.index(row, col)) = i1.par_->cell(i);
+ }
}
}
{
MathCursorPos i1;
MathCursorPos i2;
- cursor.getSelection(i1, i2);
+ cursor.getSelection(i1, i2);
if (i1.idx_ == i2.idx_)
i1.cell().erase(i1.pos_, i2.pos_);
else {
- 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();
+ MathInset * p = i1.par_;
+ row_type r1, r2;
+ col_type c1, c2;
+ region(i1, i2, r1, r2, c1, c2);
+ for (row_type row = r1; row <= r2; ++row)
+ for (col_type col = c1; col <= c2; ++col)
+ p->cell(p->index(row, col)).erase();
}
cursor.cursor() = i1;
}
void paste(MathCursor & cursor) const
{
- MathArray ar = glue();
- cursor.paste(ar);
+ if (data_.nargs() == 1) {
+ // single cell/part of cell
+ cursor.insert(data_.cell(0));
+ } else {
+ // mulitple cells
+ idx_type idx;
+ MathGridInset * p = cursor.enclosingGrid(idx);
+ col_type const numcols = min(data_.ncols(), p->ncols() - p->col(idx));
+ row_type const numrows = min(data_.nrows(), p->nrows() - p->row(idx));
+ for (row_type row = 0; row < numrows; ++row)
+ for (col_type col = 0; col < numcols; ++col) {
+ idx_type i = p->index(row + p->row(idx), col + p->col(idx));
+ p->cell(i).push_back(data_.cell(data_.index(row, col)));
+ }
+ }
}
// glues selection to one cell
MathArray glue() const
{
MathArray ar;
- for (unsigned i = 0; i < data_.size(); ++i)
- ar.push_back(data_[i]);
+ for (unsigned i = 0; i < data_.nargs(); ++i)
+ ar.push_back(data_.cell(i));
return ar;
}
void clear()
{
- data_.clear();
+ data_ = MathGridInset(1, 1);
}
- std::vector<MathArray> data_;
+ MathGridInset data_;
};
MathCursor::MathCursor(InsetFormulaBase * formula, bool left)
- : formula_(formula), lastcode_(LM_TC_VAR), selection_(false)
+ : formula_(formula), lastcode_(LM_TC_MIN), selection_(false)
{
left ? first() : last();
}
bool MathCursor::popLeft()
{
- //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " left\n";
+ //cerr << "Leaving atom to the left\n";
if (Cursor_.size() <= 1)
return false;
- //if (nextInset())
- // nextInset()->removeEmptyScripts();
Cursor_.pop_back();
- //if (nextAtom())
- // nextAtom()->removeEmptyScripts();
return true;
}
//cerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
if (Cursor_.size() <= 1)
return false;
- //if (nextInset())
- // nextInset()->removeEmptyScripts();
Cursor_.pop_back();
- //if (nextInset())
- // nextInset()->removeEmptyScripts();
posRight();
return true;
}
bool MathCursor::isInside(MathInset const * p) const
{
- for (unsigned i = 0; i < Cursor_.size(); ++i)
- if (Cursor_[i].par_ == p)
+ for (unsigned i = 0; i < Cursor_.size(); ++i)
+ if (Cursor_[i].par_ == p)
return true;
return false;
}
dump("Left 1");
if (inMacroMode()) {
macroModeClose();
- lastcode_ = LM_TC_VAR;
+ lastcode_ = LM_TC_MIN;
return true;
}
selHandle(sel);
- lastcode_ = LM_TC_VAR;
+ lastcode_ = LM_TC_MIN;
if (hasPrevAtom() && openable(prevAtom(), sel)) {
if (prevAtom()->isHyperActive()) {
}
pushRight(prevAtom());
return true;
- }
+ }
return posLeft() || idxLeft() || popLeft() || selection_;
}
dump("Right 1");
if (inMacroMode()) {
macroModeClose();
- lastcode_ = LM_TC_VAR;
+ lastcode_ = LM_TC_MIN;
return true;
}
selHandle(sel);
- lastcode_ = LM_TC_VAR;
+ lastcode_ = LM_TC_MIN;
if (hasNextAtom() && openable(nextAtom(), sel)) {
if (nextAtom()->isHyperActive()) {
}
+bool positionable(MathCursor::cursor_type const & cursor,
+ MathCursor::cursor_type const & anchor)
+{
+ // avoid deeper nested insets when selecting
+ if (cursor.size() > anchor.size())
+ return false;
+
+ // anchor might be deeper, should have same path then
+ for (MathCursor::cursor_type::size_type i = 0; i < cursor.size(); ++i)
+ if (cursor[i].par_ != anchor[i].par_)
+ return false;
+
+ // position should be ok.
+ return true;
+}
+
void MathCursor::setPos(int x, int y)
{
dump("setPos 1");
- cursor_type best_cursor;
- double best_dist = 1e10;
-
- MathIterator it(formula()->par().nucleus());
- MathIterator et;
- for ( ; it != et; ++it) {
- if (selection_) {
- // avoid deeper nested insets when selecting
- if (it.cursor().size() > Anchor_.size())
- continue;
- // anchor might be deeper!
- if (it.cursor().size() == Anchor_.size())
- if (it.par() != Anchor_.back().par_)
- continue;
- //if (it.par() != Anchor_[it.cursor().size()].par_)
- // continue;
- }
- //lyxerr << it.position() << endl;
- int xo = it.position().xpos();
- int yo = it.position().ypos();
- double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
- if (d < best_dist) {
- best_dist = d;
- best_cursor = it.cursor();
- }
+ bool res = bruteFind(x, y,
+ formula()->xlow(), formula()->xhigh(),
+ formula()->ylow(), formula()->yhigh());
+ if (!res) {
+ // this ccan happen on creation of "math-display"
+ dump("setPos 1.5");
+ first();
}
- if (best_dist < 1e10)
- Cursor_ = best_cursor;
- //lyxerr << "x: " << x << " y: " << y << " dist: " << best_dist << "\n";
dump("setPos 2");
}
dump("home 1");
selHandle(sel);
macroModeClose();
- lastcode_ = LM_TC_VAR;
- if (!par()->idxHome(idx(), pos()))
+ lastcode_ = LM_TC_MIN;
+ if (!par()->idxHome(idx(), pos()))
popLeft();
dump("home 2");
}
dump("end 1");
selHandle(sel);
macroModeClose();
- lastcode_ = LM_TC_VAR;
+ lastcode_ = LM_TC_MIN;
if (!par()->idxEnd(idx(), pos()))
popRight();
dump("end 2");
}
+void MathCursor::markInsert()
+{
+ //lyxerr << "inserting mark\n";
+ array().insert(pos(), MathAtom(new MathCharInset(0, lastcode_)));
+}
+
+
+void MathCursor::markErase()
+{
+ //lyxerr << "deleting mark\n";
+ array().erase(pos());
+}
+
+
void MathCursor::plainInsert(MathAtom const & t)
{
array().insert(pos(), t);
}
+void MathCursor::insert(char c)
+{
+ insert(c, lastcode_);
+}
+
+
void MathCursor::insert(MathAtom const & t)
{
macroModeClose();
}
-void MathCursor::niceInsert(MathAtom const & t)
+void MathCursor::niceInsert(MathAtom const & t)
{
selCut();
insert(t); // inserting invalidates the pointer!
if (pos() == 0) {
pullArg(false);
return;
- }
+ }
if (selection_) {
selDel();
MathScriptInset * p = prevAtom()->asScriptInset();
if (p) {
p->removeScript(p->hasUp());
- // Don't delete if there is anything left
+ // Don't delete if there is anything left
if (p->hasUp() || p->hasDown())
return;
}
MathScriptInset * p = nextAtom()->asScriptInset();
if (p) {
p->removeScript(p->hasUp());
- // Don't delete if there is anything left
+ // Don't delete if there is anything left
if (p->hasUp() || p->hasDown())
return;
}
return;
}
- if (par()->nrows() > 1)
- par()->delRow(row());
+ if (par()->nrows() > 1) {
+ // grid are the only things with more than one row...
+ lyx::Assert(par()->asGridInset());
+ par()->asGridInset()->delRow(hullRow());
+ }
- if (idx() > par()->nargs())
- idx() = par()->nargs();
+ if (idx() >= par()->nargs())
+ idx() = par()->nargs() - 1;
if (pos() > size())
pos() = size();
dump("up 1");
macroModeClose();
selHandle(sel);
-
- if (!selection_) {
- MathInset::idx_type i = 0;
- MathInset::pos_type p = 0;
-
- // check whether we could move into the inset
- if (hasPrevAtom() && prevAtom()->idxLastUp(i, p)) {
- pushRight(prevAtom());
- idx() = i;
- pos() = p;
- return true;
- }
-
- if (hasNextAtom() && nextAtom()->idxFirstUp(i, p)) {
- pushLeft(nextAtom());
- idx() = i;
- pos() = p;
- return true;
- }
- }
-
- return goUp() || selection_;
+ cursor_type save = Cursor_;
+ if (goUpDown(true))
+ return true;
+ Cursor_ = save;
+ return selection_;
}
dump("down 1");
macroModeClose();
selHandle(sel);
-
- if (!selection_) {
- MathInset::idx_type i = 0;
- MathInset::pos_type p = 0;
-
- // check whether we could move into the inset
- if (hasPrevAtom() && prevAtom()->idxLastDown(i, p)) {
- pushRight(prevAtom());
- idx() = i;
- pos() = p;
- return true;
- }
-
- if (hasNextAtom() && nextAtom()->idxFirstDown(i, p)) {
- pushLeft(nextAtom());
- idx() = i;
- pos() = p;
- return true;
- }
- }
-
- return goDown() || selection_;
+ cursor_type save = Cursor_;
+ if (goUpDown(false))
+ return true;
+ Cursor_ = save;
+ return selection_;
}
}
-int MathCursor::macroNamePos() const
+MathInset::difference_type MathCursor::macroNamePos() const
{
- for (int i = pos() - 1; i >= 0; --i) {
+ for (MathInset::difference_type i = pos() - 1; i >= 0; --i) {
MathAtom & p = array().at(i);
if (p->code() == LM_TC_TEX && p->getChar() == '\\')
return i;
string MathCursor::macroName() const
{
string s;
- for (int i = macroNamePos(); i >= 0 && i < int(pos()); ++i)
+ MathInset::difference_type i = macroNamePos();
+ for (; i >= 0 && i < int(pos()); ++i)
s += array().at(i)->getChar();
return s;
}
MathCursorPos i1;
MathCursorPos i2;
getSelection(i1, i2);
- //lyxerr << "selection from: " << i1 << " to " << i2 << "\n";
if (i1.idx_ == i2.idx_) {
MathXArray & c = i1.xcell();
int y2 = c.yo() + c.descent();
pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
} else {
- std::vector<MathInset::idx_type> indices
+ 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]);
if (selection_) {
MathCursorPos i1;
MathCursorPos i2;
- getSelection(i1, i2);
+ getSelection(i1, i2);
if (i1.idx_ == i2.idx_) {
MathArray & ar = i1.cell();
for (MathInset::pos_type pos = i1.pos_; pos != i2.pos_; ++pos)
ar.at(pos)->handleFont(t);
}
- } else
+ } else
lastcode_ = (lastcode_ == t) ? LM_TC_VAR : t;
}
#ifdef WITH_WARNINGS
#warning This should probably take cellXOffset and cellYOffset into account
#endif
- dump("getPos 1");
x = xarray().xo() + xarray().pos2x(pos());
y = xarray().yo();
- dump("getPos 2");
}
}
-InsetFormulaBase const * MathCursor::formula()
+InsetFormulaBase * MathCursor::formula()
{
return formula_;
}
}
+bool MathCursor::inMacroArgMode() const
+{
+ return pos() > 0 && prevAtom()->getChar() == '#';
+}
+
+
bool MathCursor::selection() const
{
return selection_;
MathGridInset * MathCursor::enclosingGrid(MathCursor::idx_type & idx) const
{
- for (int i = Cursor_.size() - 1; i >= 0; --i) {
+ for (MathInset::difference_type i = Cursor_.size() - 1; i >= 0; --i) {
MathGridInset * p = Cursor_[i].par_->asGridInset();
if (p) {
idx = Cursor_[i].idx_;
if (popLeft()) {
plainErase();
array().insert(pos(), a);
- if (goright)
+ if (goright)
pos() += a.size();
+ } else {
+ formula()->mutateToText();
}
}
-void MathCursor::normalize() const
+void MathCursor::touch()
{
-#ifdef WITH_WARNINGS
-#warning This is evil!
+ cursor_type::const_iterator it = Cursor_.begin();
+ cursor_type::const_iterator et = Cursor_.end();
+ for ( ; it != et; ++it)
+ it->xcell().touch();
+}
+
+
+void MathCursor::normalize()
+{
+#if 0
+ // rebreak
+ {
+ MathIterator it = ibegin(formula()->par().nucleus());
+ MathIterator et = iend(formula()->par().nucleus());
+ for (; it != et; ++it)
+ if (it.par()->asBoxInset())
+ it.par()->asBoxInset()->rebreak();
+ }
#endif
- MathCursor * it = const_cast<MathCursor *>(this);
if (idx() >= par()->nargs()) {
lyxerr << "this should not really happen - 1: "
<< idx() << " " << par()->nargs() << "\n";
dump("error 2");
}
- it->idx() = min(idx(), par()->nargs() - 1);
+ idx() = min(idx(), par()->nargs() - 1);
if (pos() > size()) {
lyxerr << "this should not really happen - 2: "
- << pos() << " " << size() << " in idx: " << it->idx()
+ << pos() << " " << size() << " in idx: " << idx()
<< " in atom: '";
WriteStream wi(lyxerr, false);
- it->par()->write(wi);
+ par()->write(wi);
lyxerr << "\n";
dump("error 4");
}
- it->pos() = min(pos(), size());
+ pos() = min(pos(), size());
+
+ // remove empty scripts if possible
+ for (pos_type i = 0; i < size(); ++i) {
+ MathScriptInset * p = array().at(i)->asScriptInset();
+ if (p) {
+ p->removeEmptyScripts();
+ if (p->empty())
+ array().erase(i);
+ }
+ }
+
+ // fix again position
+ pos() = min(pos(), size());
}
}
-MathCursor::col_type MathCursor::col() const
+MathCursor::col_type MathCursor::hullCol() const
{
- return par()->col(idx());
+ return Cursor_[0].par_->asGridInset()->col(Cursor_[0].idx_);
}
-MathCursor::row_type MathCursor::row() const
+MathCursor::row_type MathCursor::hullRow() const
{
- return par()->row(idx());
+ return Cursor_[0].par_->asGridInset()->row(Cursor_[0].idx_);
}
return dummy;
}
+ if (Cursor_.size() == 0) {
+ lyxerr << "############ Cursor_.size() == 0 not valid\n";
+ return dummy;
+ }
+
return cursor().cell();
}
MathXArray & MathCursor::xarray() const
{
+ static MathXArray dummy;
+
+ if (Cursor_.size() == 0) {
+ lyxerr << "############ Cursor_.size() == 0 not valid\n";
+ return dummy;
+ }
+
return cursor().xcell();
}
void MathCursor::splitCell()
{
- if (idx() + 1 == par()->nargs())
+ if (idx() + 1 == par()->nargs())
return;
MathArray ar = array();
ar.erase(0, pos());
p->mutate(LM_OT_EQNARRAY);
idx() = 0;
pos() = size();
- return;
- }
-
- p->addRow(row());
+ } else {
+ p->addRow(hullRow());
- // split line
- 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 line
+ const row_type r = hullRow();
+ for (col_type c = hullCol() + 1; c < p->ncols(); ++c)
+ p->cell(p->index(r, c)).swap(p->cell(p->index(r + 1, c)));
- // split cell
- splitCell();
- p->cell(idx()).swap(p->cell(idx() + p->ncols() - 1));
+ // split cell
+ splitCell();
+ p->cell(idx()).swap(p->cell(idx() + p->ncols() - 1));
+ }
}
-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));
-}
+//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
MathCursorPos & MathCursor::cursor()
{
+ lyx::Assert(Cursor_.size());
return Cursor_.back();
}
MathCursorPos const & MathCursor::cursor() const
{
+ lyx::Assert(Cursor_.size());
return Cursor_.back();
}
-bool MathCursor::goUp()
+bool MathCursor::goUpDown(bool up)
{
- // first ask the inset if it knows better then we
- if (par()->idxUp(idx(), pos())) {
- //lyxerr << "ask cell\n";
- int xlow, xhigh, ylow, yhigh;
- xarray().boundingBox(xlow, xhigh, ylow, yhigh);
- bruteFind(xlow, xhigh, ylow, yhigh);
- return true;
- }
-
- // if not, apply brute force.
- //lyxerr << "brute force\n";
- return
- bruteFind(
- formula()->xlow(),
- formula()->xhigh(),
- formula()->ylow(),
- xarray().yo() - 4 - xarray().ascent()
- );
-}
+ int xlow, xhigh, ylow, yhigh;
+ int xo, yo;
+ getPos(xo, yo);
-bool MathCursor::goDown()
-{
- // first ask the inset if it knows better then we
- if (par()->idxDown(idx(), pos())) {
- //lyxerr << "ask cell\n";
- int xlow, xhigh, ylow, yhigh;
- xarray().boundingBox(xlow, xhigh, ylow, yhigh);
- bruteFind(xlow, xhigh, ylow, yhigh);
+ // try current cell first
+ xarray().boundingBox(xlow, xhigh, ylow, yhigh);
+ if (up)
+ yhigh = yo - 4;
+ else
+ ylow = yo + 4;
+ if (bruteFind(xo, yo, xlow, xhigh, ylow, yhigh))
return true;
- }
- // if not, apply brute force.
- //lyxerr << "brute force\n";
- return
- bruteFind(
- formula()->xlow(),
- formula()->xhigh(),
- xarray().yo() + 4 + xarray().descent(),
- formula()->yhigh()
- );
+ // try to find an inset that knows better then we
+ while (1) {
+ // we found a cell that think something "below" us.
+ if (up) {
+ if (par()->idxUp(idx()))
+ break;
+ } else {
+ if (par()->idxDown(idx()))
+ break;
+ }
+
+ if (!popLeft()) {
+ // no such inset found, just take something "above"
+ return
+ bruteFind(xo, yo,
+ formula()->xlow(),
+ formula()->xhigh(),
+ up ? formula()->ylow() : yo + 4,
+ up ? yo - 4 : formula()->yhigh()
+ );
+ }
+ }
+ xarray().boundingBox(xlow, xhigh, ylow, yhigh);
+ bruteFind(xo, yo, xlow, xhigh, ylow, yhigh);
+ return true;
}
-bool MathCursor::bruteFind(int xlow, int xhigh, int ylow, int yhigh)
+bool MathCursor::bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhigh)
{
- int x;
- int y;
- getPos(x, y);
- //lyxerr << "looking at range: "
- // << "[" << xlow << "..." << xhigh << "]"
- // << " x [" << ylow << "..." << yhigh << "]"
- // << " xo: " << x << " yo: " << y << "\n";
-
cursor_type best_cursor;
double best_dist = 1e10;
- MathIterator it(formula()->par().nucleus());
- MathIterator et;
- for ( ; it != et; ++it) {
- int xo = it.position().xpos();
- int yo = it.position().ypos();
- if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
- double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
- if (d < best_dist) {
- best_dist = d;
- best_cursor = it.cursor();
+ MathIterator it = ibegin(formula()->par().nucleus());
+ MathIterator et = iend(formula()->par().nucleus());
+ while (1) {
+ // avoid invalid nesting when selecting
+ if (!selection_ || positionable(it.cursor(), Anchor_)) {
+ MathCursorPos const & top = it.position();
+ int xo = top.xpos();
+ int yo = top.ypos();
+ if (xlow - 2 <= xo && xo <= xhigh + 2 &&
+ ylow - 2 <= yo && yo <= yhigh + 2)
+ {
+ double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
+ if (d < best_dist) {
+ best_dist = d;
+ best_cursor = it.cursor();
+ }
}
}
+
+ if (it == et)
+ break;
+ ++it;
}
+
if (best_dist < 1e10)
Cursor_ = best_cursor;
return best_dist < 1e10;
return interpret(s[0]);
//lyxerr << "char: '" << s[0] << "' int: " << int(s[0]) << endl;
- //owner_->getIntl()->getTrans().TranslateAndInsert(s[0], lt);
+ //owner_->getIntl()->getTrans().TranslateAndInsert(s[0], lt);
//lyxerr << "trans: '" << s[0] << "' int: " << int(s[0]) << endl;
if (s.size() >= 5 && s.substr(0, 5) == "cases") {
unsigned int n = 1;
istringstream is(s.substr(5).c_str());
is >> n;
- n = std::max(1u, n);
+ n = max(1u, n);
niceInsert(MathAtom(new MathCasesInset(n)));
return true;
}
string h_align;
istringstream is(s.substr(6).c_str());
is >> m >> n >> v_align >> h_align;
- m = std::max(1u, m);
- n = std::max(1u, n);
+ m = max(1u, m);
+ n = max(1u, n);
v_align += 'c';
- niceInsert(MathAtom(new MathArrayInset(m, n, v_align[0], h_align)));
+ niceInsert(MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
return true;
}
if (s == "\\over" || s == "\\choose" || s == "\\atop") {
MathArray ar = array();
- MathAtom t = createMathInset(s.substr(1));
+ MathAtom t(createMathInset(s.substr(1)));
t->asNestInset()->cell(0).swap(array());
pos() = 0;
niceInsert(t);
return true;
}
+ latexkeys const * l = in_word_set(s.substr(1));
+ if (l && (l->token == LM_TK_FONT || l->token == LM_TK_OLDFONT)) {
+ lastcode_ = static_cast<MathTextCodes>(l->id);
+ return true;
+ }
+
+ // prevent entering of recursive macros
+ if (formula()->lyxCode() == Inset::MATHMACRO_CODE
+ && formula()->getInsetName() == s.substr(1))
+ {
+ lyxerr << "can't enter recursive macro\n";
+ return true;
+ }
+
niceInsert(createMathInset(s.substr(1)));
return true;
}
+bool MathCursor::script(bool up)
+{
+ macroModeClose();
+ 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;
+ }
+ selPaste();
+ dump("1");
+ return true;
+}
+
+
bool MathCursor::interpret(char c)
{
- //lyxerr << "interpret 2: '" << c << "'\n";
- if (c == '^' || c == '_') {
- 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;
+ if (inMacroArgMode()) {
+ --pos();
+ plainErase();
+ int n = c - '0';
+ MathMacroTemplate * p = formula()->par()->asMacroTemplate();
+ if (p && 1 <= n && n <= p->numargs())
+ insert(MathAtom(new MathMacroArgument(c - '0')));
+ else {
+ insert(MathAtom(new MathSpecialCharInset('#')));
+ interpret(c); // try again
}
- selPaste();
- 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;
}
macroModeClose();
+
+ if (c == '\\')
+ insert(c, LM_TC_TEX);
+ else if (c != ' ')
+ insert(c, lastcode_);
+
return true;
}
- if (selection_)
+ if (selection_) {
selClear();
+ if (c == ' ')
+ return true;
+ // fall through in the other cases
+ }
- if (lastcode_ == LM_TC_TEXTRM) {
- // suppress direct insertion of to spaces in a row
+ if (lastcode_ == LM_TC_TEXTRM || par()->asBoxInset()) {
+ // suppress direct insertion of two spaces in a row
// the still allows typing '<space>a<space>' and deleting the 'a', but
- // it is better than nothing
+ // it is better than nothing...
if (c == ' ' && hasPrevAtom() && prevAtom()->getChar() == ' ')
return true;
insert(c, LM_TC_TEXTRM);
prevAtom()->asSpaceInset()->incSpace();
return true;
}
-
- if (mathcursor->popRight())
+ if (popRight())
return true;
-
// if are at the very end, leave the formula
return pos() != size();
}
+ if (c == '#') {
+ insert(c, LM_TC_TEX);
+ return true;
+ }
+
/*
if (strchr("{}", c)) {
insert(c, LM_TC_TEX);
return true;
}
- if (strchr("#$%", c)) {
- insert(MathAtom(new MathSpecialCharInset(c)));
+ if (strchr("$%", c)) {
+ insert(MathAtom(new MathSpecialCharInset(c)));
lastcode_ = LM_TC_VAR;
return true;
}
if (c == '\\') {
insert(c, LM_TC_TEX);
//bv->owner()->message(_("TeX mode"));
- return true;
+ return true;
}
// no special circumstances, so insert the character without any fuss
- insert(c, LM_TC_MIN);
+ insert(c, lastcode_ == LM_TC_MIN ? MathCharInset::nativeCode(c) : lastcode_);
+ lastcode_ = LM_TC_MIN;
return true;
}
MathCursorPos MathCursor::normalAnchor() const
{
+ if (Anchor_.size() < Cursor_.size()) {
+ Anchor_ = Cursor_;
+ lyxerr << "unusual Anchor size\n";
+ dump("1");
+ }
+ //lyx::Assert(Anchor_.size() >= Cursor_.size());
// use Anchor on the same level as Cursor
MathCursorPos normal = Anchor_[Cursor_.size() - 1];
if (Cursor_.size() < Anchor_.size() && !(normal < cursor())) {
// delete everything behind this position
ar.erase(et - ar.begin(), ar.size());
- pos() = ar.size();
-}
-
-
-////////////////////////////////////////////////////////////////////////
-
-
-MathCursorPos::MathCursorPos()
- : par_(0), idx_(0), pos_(0)
-{}
-
-
-MathCursorPos::MathCursorPos(MathInset * p)
- : par_(p), idx_(0), pos_(0)
-{}
-
-
-MathArray & MathCursorPos::cell(MathCursor::idx_type idx) const
-{
- return par_->cell(idx);
+ pos() = ar.size();
}
-MathArray & MathCursorPos::cell() const
+void MathCursor::setSelection(cursor_type const & where, size_type n)
{
- return par_->cell(idx_);
-}
-
-
-MathXArray & MathCursorPos::xcell(MathCursor::idx_type idx) const
-{
- return par_->xcell(idx);
-}
-
-
-MathXArray & MathCursorPos::xcell() const
-{
- return par_->xcell(idx_);
-}
-
-
-int MathCursorPos::xpos() const
-{
- return xcell().xo() + xcell().pos2x(pos_);
-}
-
-
-int MathCursorPos::ypos() const
-{
- return xcell().yo();
-}
-
-std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
-{
- os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")";
- return os;
-}
-
-
-bool operator==(MathCursorPos const & ti, MathCursorPos const & it)
-{
- return ti.par_ == it.par_ && ti.idx_ == it.idx_ && ti.pos_ == it.pos_;
-}
-
-
-bool operator!=(MathCursorPos const & ti, MathCursorPos const & it)
-{
- return ti.par_ != it.par_ || ti.idx_ != it.idx_ || ti.pos_ != it.pos_;
+ selection_ = true;
+ Anchor_ = where;
+ Cursor_ = where;
+ cursor().pos_ += n;
}
-bool operator<(MathCursorPos const & ti, MathCursorPos const & it)
+string MathCursor::info() const
{
- if (ti.par_ != it.par_) {
- lyxerr << "can't compare cursor and anchor in different insets\n";
- return true;
- }
- if (ti.idx_ != it.idx_)
- return ti.idx_ < it.idx_;
- return ti.pos_ < it.pos_;
+ ostringstream os;
+ if (pos() > 0)
+ prevAtom()->infoize(os);
+ return os.str();
}
-
-
projects / lyx.git / blobdiff