anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change tracking:

Browse Source 
* src/changes.C: fix erase() and insert()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15453 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-10-21 15:36:04 +00:00
parent 606e6d7dd5
commit f29d236e84
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/changes.C
View File

@ -160,34 +160,54 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
void Changes::erase(pos_type const pos)
{
if (lyxerr.debugging(Debug::CHANGES)) {
lyxerr[Debug::CHANGES] << "Erasing change at position " << pos << endl;
}
ChangeTable::iterator it = table_.begin();
ChangeTable::iterator end = table_.end();
bool found = false;
for (; it != end; ++it) {
Range & range(it->range);
if (lyxerr.debugging(Debug::CHANGES)) {
lyxerr[Debug::CHANGES] << "era:Range of type " << it->change.type << " is "
<< it->range.start << "," << it->range.end << endl;
// range (pos,pos+x) becomes (pos,pos+x-1)
if (it->range.start > pos) {
--(it->range.start);
}
if (range.contains(pos)) {
found = true;
--range.end;
continue;
}
if (found) {
--range.start;
--range.end;
// range (pos-x,pos) stays (pos-x,pos)
if (it->range.end > pos) {
--(it->range.end);
}
}
merge();
}
void Changes::insert(Change const & change, lyx::pos_type pos)
{
if (lyxerr.debugging(Debug::CHANGES)) {
lyxerr[Debug::CHANGES] << "Inserting change of type " << change.type
<< " at position " << pos << endl;
}
ChangeTable::iterator it = table_.begin();
ChangeTable::iterator end = table_.end();
for (; it != end; ++it) {
// range (pos,pos+x) becomes (pos+1,pos+x+1)
if (it->range.start >= pos) {
++(it->range.start);
}
// range (pos-x,pos) stays as it is
if (it->range.end > pos) {
++(it->range.end);
}
}
set(change, pos, pos + 1); // set will call merge
}
Change const Changes::lookup(pos_type const pos) const
{
ChangeTable::const_iterator it = table_.begin();