#pragma implementation
#endif
+#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_deliminset.h"
#include "math_factory.h"
#include "math_hullinset.h"
#include "math_iterator.h"
+#include "math_macroarg.h"
#include "math_mathmlstream.h"
#include "math_parser.h"
#include "math_replace.h"
#include "math_specialcharinset.h"
#include "math_support.h"
-#include "debug.h"
-#include "LColor.h"
-#include "Painter.h"
-
-#include "support/lstrings.h"
-#include "support/LAssert.h"
-
#include <algorithm>
#include <cctype>
{
MathCursorPos i1;
MathCursorPos i2;
- cursor.getSelection(i1, i2);
+ cursor.getSelection(i1, i2);
// shouldn'tt we assert on i1.par_ == i2.par_?
if (i1.idx_ == i2.idx_) {
data_ = MathGridInset(1, 1);
} else {
row_type r1, r2;
col_type c1, c2;
- region(i1, i2, r1, r2, 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 (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 {
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)
+ 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();
}
}
void paste(MathCursor & cursor) const
- {
- 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)));
- }
+ {
+ 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
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::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()) {
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::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;
}
}
-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;
}
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;
}
}
+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();
}
}
-void MathCursor::normalize() const
+void MathCursor::normalize()
{
-#ifdef WITH_WARNINGS
-#warning This is evil!
-#endif
- MathCursor * it = const_cast<MathCursor *>(this);
+ // 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();
+ }
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());
}
void MathCursor::splitCell()
{
- if (idx() + 1 == par()->nargs())
+ if (idx() + 1 == par()->nargs())
return;
MathArray ar = array();
ar.erase(0, pos());
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") {
return true;
}
+
bool MathCursor::script(bool up)
{
macroModeClose();
bool MathCursor::interpret(char c)
{
- //lyxerr << "interpret 2: '" << c << "'\n";
+ if (inMacroArgMode()) {
+ --pos();
+ plainErase();
+ if ('1' <= c && c <= '9')
+ insert(MathAtom(new MathMacroArgument(c - '0')));
+ else {
+ insert(MathAtom(new MathSpecialCharInset('#')));
+ interpret(c); // try again
+ }
+ 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;
// fall through in the other cases
}
- if (lastcode_ == LM_TC_TEXTRM) {
+ 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...
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, lastcode_);
+ insert(c, lastcode_ == LM_TC_MIN ? MathCharInset::nativeCode(c) : lastcode_);
lastcode_ = LM_TC_MIN;
return true;
}
// delete everything behind this position
ar.erase(et - ar.begin(), ar.size());
- pos() = ar.size();
+ pos() = ar.size();
}
+void MathCursor::setSelection(cursor_type const & where, size_type n)
+{
+ selection_ = true;
+ Anchor_ = where;
+ Cursor_ = where;
+ cursor().pos_ += n;
+}
+
+
+string MathCursor::info() const
+{
+ std::ostringstream os;
+ if (pos() > 0)
+ prevAtom()->infoize(os);
+ return os.str();
+}
projects / lyx.git / blobdiff