anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change tracking:

Browse Source 
* src/paragraph_funcs.C: fix end-of-par handling;
	fix various CT-related comments


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15757 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-11-05 19:00:53 +00:00
parent c15a94ccf0
commit 30748f1b03
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/paragraph_funcs.C
View File

@ -179,7 +179,7 @@ void breakParagraphConservative(BufferParams const & bparams,
tmp.setChange(tmp.size(), Change(par.lookupChange(par.size()).type));
// If tracking changes, set all the text that is to be
// erased to Type::INSERTED.
// erased to Change::INSERTED.
for (pos_type k = pos_end; k >= pos; --k) {
if (bparams.trackChanges)
// FIXME: Change tracking (MG)
@ -200,30 +200,23 @@ void mergeParagraph(BufferParams const & bparams,
pos_type pos_end = next.size() - 1;
pos_type pos_insert = par.size();
// What happens is the following. Later on, moveItem() will copy
// over characters from the next paragraph to be inserted into this
// position. Now, if the first char to be so copied is "red" (i.e.,
// marked deleted) and the paragraph break is marked "blue",
// insertChar will trigger (eventually, through record(), and see
// del() and erase() in changes.C) a "hard" character deletion.
// Which doesn't make sense of course at this pos, but the effect is
// to shorten the change range to which this para break belongs, by
// one. It will (should) remain "orphaned", having no CT info to it,
// and check() in changes.C will assert. Setting the para break
// forcibly to "black" prevents this scenario. -- MV 13.3.2006
// The imaginary end-of-paragraph character (at par.size()) has to be
// marked as unmodified. Otherwise, its change is adopted by the first
// character of the next paragraph.
// FIXME: change tracking (MG)
par.setChange(par.size(), Change(Change::UNCHANGED));
Change::Type cr = next.lookupChange(next.size()).type;
Change change = next.lookupChange(next.size());
// ok, now copy the paragraph
for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
if (moveItem(next, i, par, pos_insert + j, bparams)) {
++j;
}
}
// Move the change status of "carriage return" over
// Move the change of the end-of-paragraph character
// FIXME: change tracking (MG)
par.setChange(par.size(), Change(cr));
par.setChange(par.size(), change);
pars.erase(boost::next(pars.begin(), par_offset + 1));
}