X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.C;h=95c7c1552633e5d0cd4a93812187742c9499eea2;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=1b739e2695f810f1829fb81535ca219f563f1aa9;hpb=51ed92d70c5020ee6215cceb4404b334d5724e2d;p=lyx.git

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 1b739e2695..95c7c15526 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -22,29 +22,29 @@ namespace lyx {
 using std::string;
 
 
-static bool moveItem(Paragraph & from, Paragraph & to,
-	BufferParams const & params, pos_type i, pos_type j,
-	Change change = Change(Change::INSERTED))
+static bool moveItem(Paragraph & fromPar, pos_type fromPos,
+	Paragraph & toPar, pos_type toPos, BufferParams const & params)
 {
-	Paragraph::value_type const tmpchar = from.getChar(i);
-	LyXFont tmpfont = from.getFontSettings(params, i);
+	Paragraph::value_type const tmpChar = fromPar.getChar(fromPos);
+	LyXFont const tmpFont = fromPar.getFontSettings(params, fromPos);
+	Change const tmpChange = fromPar.lookupChange(fromPos);
 
-	if (tmpchar == Paragraph::META_INSET) {
-		InsetBase * tmpinset = 0;
-		if (from.getInset(i)) {
+	if (tmpChar == Paragraph::META_INSET) {
+		InsetBase * tmpInset = 0;
+		if (fromPar.getInset(fromPos)) {
 			// the inset is not in a paragraph anymore
-			tmpinset = from.insetlist.release(i);
-			from.insetlist.erase(i);
+			tmpInset = fromPar.insetlist.release(fromPos);
+			fromPar.insetlist.erase(fromPos);
 		}
 
-		if (!to.insetAllowed(tmpinset->lyxCode())) {
-			delete tmpinset;
+		if (!toPar.insetAllowed(tmpInset->lyxCode())) {
+			delete tmpInset;
 			return false;
 		}
-		if (tmpinset)
-			to.insertInset(j, tmpinset, tmpfont, change);
+		if (tmpInset)
+			toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange);
 	} else {
-		to.insertChar(j, tmpchar, tmpfont, change);
+		toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
 	}
 	return true;
 }
@@ -106,10 +106,7 @@ void breakParagraph(BufferParams const & bparams,
 		pos_type pos_end = par.size() - 1;
 
 		for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
-			Change::Type change = par.lookupChange(i).type;
-			if (moveItem(par, *tmp, bparams, i, j - pos)) {
-				// FIXME: change tracking (MG)
-				tmp->setChange(j - pos, Change(change));
+			if (moveItem(par, i, *tmp, j - pos, bparams)) {
 				++j;
 			}
 		}
@@ -173,17 +170,16 @@ void breakParagraphConservative(BufferParams const & bparams,
 		pos_type pos_end = par.size() - 1;
 
 		for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
-			Change::Type change = par.lookupChange(i).type;
-			// FIXME: change tracking (MG)
-			if (moveItem(par, tmp, bparams, i, j - pos, Change(change)))
+			if (moveItem(par, i, tmp, j - pos, bparams)) {
 				++j;
+			}
 		}
 		// Move over end-of-par change attr
 		// FIXME: change tracking (MG)
 		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)
@@ -204,31 +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) {
-		Change::Type change = next.lookupChange(i).type;
-		// FIXME: change tracking (MG)
-		if (moveItem(next, par, bparams, i, pos_insert + j, Change(change)))
+		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));
 }