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

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 9b58b9a1be..95c7c15526 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -16,47 +16,39 @@
 #include "lyxtext.h"
 #include "paragraph_pimpl.h"
 
-using lyx::pos_type;
-using lyx::pit_type;
-
-using std::string;
 
+namespace lyx {
 
-namespace {
+using std::string;
 
-bool moveItem(Paragraph & from, Paragraph & to,
-	BufferParams const & params, pos_type i, pos_type j,
-	Change change = Change(Change::INSERTED));
 
-bool moveItem(Paragraph & from, Paragraph & to,
-	BufferParams const & params, pos_type i, pos_type j,
-	Change change)
+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;
 }
 
-}
-
 
 void breakParagraph(BufferParams const & bparams,
 	ParagraphList & pars, pit_type par_offset, pos_type pos, int flag)
@@ -114,16 +106,14 @@ 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;
 			}
 		}
 
 		for (pos_type i = pos_end; i >= pos; --i)
-			par.eraseIntern(i);
+			// FIXME: change tracking (MG)
+			par.eraseChar(i, false); // erase without change tracking
 	}
 
 	if (pos) {
@@ -180,22 +170,22 @@ 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)
 				par.setChange(k, Change(Change::INSERTED));
-			par.erase(k);
+			// FIXME: change tracking (MG)
+			par.eraseChar(k, false);
 		}
 	}
 }
@@ -210,38 +200,29 @@ 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));
 }
 
 
-pit_type depthHook(pit_type pit,
-	ParagraphList const & pars, Paragraph::depth_type depth)
+pit_type depthHook(pit_type pit, ParagraphList const & pars, depth_type depth)
 {
 	pit_type newpit = pit;
 
@@ -264,7 +245,7 @@ pit_type outerHook(pit_type par_offset, ParagraphList const & pars)
 
 	if (par.getDepth() == 0)
 		return pars.size();
-	return depthHook(par_offset, pars, Paragraph::depth_type(par.getDepth() - 1));
+	return depthHook(par_offset, pars, depth_type(par.getDepth() - 1));
 }
 
 
@@ -285,7 +266,7 @@ bool isFirstInSequence(pit_type par_offset, ParagraphList const & pars)
 int getEndLabel(pit_type p, ParagraphList const & pars)
 {
 	pit_type pit = p;
-	Paragraph::depth_type par_depth = pars[p].getDepth();
+	depth_type par_depth = pars[p].getDepth();
 	while (pit != pit_type(pars.size())) {
 		LyXLayout_ptr const & layout = pars[pit].layout();
 		int const endlabeltype = layout->endlabeltype;
@@ -294,7 +275,7 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
 			if (p + 1 == pit_type(pars.size()))
 				return endlabeltype;
 
-			Paragraph::depth_type const next_depth =
+			depth_type const next_depth =
 				pars[p + 1].getDepth();
 			if (par_depth > next_depth ||
 			    (par_depth == next_depth && layout != pars[p + 1].layout()))
@@ -313,7 +294,7 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
 
 LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars)
 {
-	Paragraph::depth_type par_depth = pars[par_offset].getDepth();
+	depth_type par_depth = pars[par_offset].getDepth();
 	LyXFont tmpfont(LyXFont::ALL_INHERIT);
 
 	// Resolve against environment font information
@@ -344,3 +325,6 @@ int numberOfOptArgs(Paragraph const & par)
 	}
 	return num;
 }
+
+
+} // namespace lyx