anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more math iterator adjustment

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8350 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2004-01-14 17:58:07 +00:00
parent 95ced6f509
commit 04076d27ac
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mathed/formulabase.C
View File

@ -847,13 +847,15 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
//lyxerr << "searching '" << str << "' in " << this << ar << endl; //lyxerr << "searching '" << str << "' in " << this << ar << endl;
for (MathIterator it = current; it != iend(par().nucleus()); ++it) { for (MathIterator it = current; it != iend(par().nucleus()); ++it) {
if (it.cell().matchpart(ar, it.back().pos_)) { CursorSlice & top = it.back();
MathArray const & a = top.asMathInset()->cell(top.idx_);
if (a.matchpart(ar, top.pos_)) {
delete mathcursor; delete mathcursor;
mathcursor = new MathCursor(this, true); mathcursor = new MathCursor(this, true);
//metrics(bv); //metrics(bv);
mathcursor->setSelection(it, ar.size()); mathcursor->setSelection(it, ar.size());
current = it; current = it;
it.back().pos_ += ar.size(); top.pos_ += ar.size();
bv->update(); bv->update();
return true; return true;
} }

3
src/mathed/math_cursor.C
View File

@ -1068,7 +1068,8 @@ void MathCursor::bruteFind2(int x, int y)
MathIterator it = Cursor_; MathIterator it = Cursor_;
it.back().setPos(0); it.back().setPos(0);
MathIterator et = Cursor_; MathIterator et = Cursor_;
et.back().setPos(it.cell().size()); int n = et.back().asMathInset()->cell(et.back().idx_).size();
et.back().setPos(n);
for (int i = 0; ; ++i) { for (int i = 0; ; ++i) {
int xo, yo; int xo, yo;
it.back().getPos(xo, yo); it.back().getPos(xo, yo);

10
src/mathed/math_iterator.C
View File

@ -17,13 +17,6 @@
#include <boost/assert.hpp> #include <boost/assert.hpp>
MathArray const & MathIterator::cell() const
{
CursorSlice const & top = back();
return top.asMathInset()->cell(top.idx_);
}
void MathIterator::operator++() void MathIterator::operator++()
{ {
CursorSlice & top = back(); CursorSlice & top = back();
@ -88,9 +81,8 @@ MathIterator iend(MathInset * p)
{ {
MathIterator it; MathIterator it;
it.push_back(CursorSlice(p)); it.push_back(CursorSlice(p));
return it;
CursorSlice & top = it.back(); CursorSlice & top = it.back();
top.idx_ = top.asMathInset()->nargs() - 1; top.idx_ = top.asMathInset()->nargs() - 1;
top.pos_ = it.cell().size(); top.pos_ = top.asMathInset()->cell(top.idx_).size();
return it; return it;
} }