X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.C;h=a43217cc055591222a2b62d954aecafec8812a6d;hb=2486c96b8d9086471299bf207b85b1ce848246aa;hp=8816bb8da9f6ff19121ca8d3b9715428bfb6e081;hpb=ed064bdee611821c1ebdac78b7a085dfde9f0b5a;p=lyx.git

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 8816bb8da9..a43217cc05 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -19,6 +19,7 @@
 #include "encoding.h"
 #include "gettext.h"
 #include "language.h"
+#include "lyxrow.h"
 #include "lyxtext.h"
 #include "outputparams.h"
 #include "paragraph_pimpl.h"
@@ -57,7 +58,12 @@ using std::pair;
 namespace {
 
 bool moveItem(Paragraph & from, Paragraph & to,
-	BufferParams const & params, pos_type i, pos_type j)
+	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)
 {
 	Paragraph::value_type const tmpchar = from.getChar(i);
 	LyXFont tmpfont = from.getFontSettings(params, i);
@@ -75,11 +81,9 @@ bool moveItem(Paragraph & from, Paragraph & to,
 			return false;
 		}
 		if (tmpinset)
-			to.insertInset(j, tmpinset, tmpfont);
+			to.insertInset(j, tmpinset, tmpfont, change);
 	} else {
-		if (!to.checkInsertChar(tmpfont))
-			return false;
-		to.insertChar(j, tmpchar, tmpfont);
+		to.insertChar(j, tmpchar, tmpfont, change);
 	}
 	return true;
 }
@@ -96,6 +100,9 @@ void breakParagraph(BufferParams const & bparams,
 
 	Paragraph & par = pars[par_offset];
 
+	// we will invalidate the row cache
+	par.rows().clear();
+
 	// without doing that we get a crash when typing <Return> at the
 	// end of a paragraph
 	tmp->layout(bparams.getLyXTextClass().defaultLayout());
@@ -159,10 +166,11 @@ void breakParagraph(BufferParams const & bparams,
 		return;
 	}
 
-	par.params().clear();
-
-	par.layout(bparams.getLyXTextClass().defaultLayout());
-
+        if (!isempty) {
+                par.params().clear();
+                par.layout(bparams.getLyXTextClass().defaultLayout());
+        }
+        
 	// layout stays the same with latex-environments
 	if (flag) {
 		par.layout(tmp->layout());
@@ -188,6 +196,9 @@ void breakParagraphConservative(BufferParams const & bparams,
 	Paragraph & tmp = *pars.insert(pars.begin() + par_offset + 1, Paragraph());
 	Paragraph & par = pars[par_offset];
 
+	if (bparams.tracking_changes)
+		tmp.trackChanges();
+
 	tmp.makeSameLayout(par);
 
 	// When can pos > size()?
@@ -197,12 +208,18 @@ void breakParagraphConservative(BufferParams const & bparams,
 		// paragraph
 		pos_type pos_end = par.size() - 1;
 
-		for (pos_type i = pos, j = pos; i <= pos_end; ++i)
-			if (moveItem(par, tmp, bparams, i, j - pos))
+		for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
+			Change::Type change = par.lookupChange(i);
+			if (moveItem(par, tmp, bparams, i, j - pos, change))
 				++j;
-
-		for (pos_type k = pos_end; k >= pos; --k)
+		}
+		// If tracking changes, set all the text that is to be
+		// erased to Type::INSERTED.
+		for (pos_type k = pos_end; k >= pos; --k) {
+			if (bparams.tracking_changes)
+				par.setChange(k, Change::INSERTED);
 			par.erase(k);
+		}
 	}
 }
 
@@ -217,9 +234,11 @@ void mergeParagraph(BufferParams const & bparams,
 	pos_type pos_insert = par.size();
 
 	// ok, now copy the paragraph
-	for (pos_type i = 0, j = 0; i <= pos_end; ++i)
-		if (moveItem(next, par, bparams, i, pos_insert + j))
+	for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
+		Change::Type change = next.lookupChange(i);
+		if (moveItem(next, par, bparams, i, pos_insert + j, change))
 			++j;
+	}
 
 	pars.erase(pars.begin() + par_offset + 1);
 }
@@ -316,57 +335,16 @@ LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars)
 }
 
 
-pit_type outerPar(Buffer const & buf, InsetBase const * inset)
-{
-	ParIterator pit = const_cast<Buffer &>(buf).par_iterator_begin();
-	ParIterator end = const_cast<Buffer &>(buf).par_iterator_end();
-	for ( ; pit != end; ++pit) {
-		LyXText * text;
-		// the second '=' below is intentional
-		for (int i = 0; (text = inset->getText(i)); ++i)
-			if (&text->paragraphs() == &pit.plist())
-				return pit.outerPar();
-
-		InsetList::const_iterator ii = pit->insetlist.begin();
-		InsetList::const_iterator iend = pit->insetlist.end();
-		for ( ; ii != iend; ++ii)
-			if (ii->inset == inset)
-				return pit.outerPar();
-	}
-	lyxerr << "outerPar: should not happen" << endl;
-	BOOST_ASSERT(false);
-	return buf.paragraphs().size(); // shut up compiler
-}
-
-
-/// return the range of pars [beg, end[ owning the range of y [ystart, yend]
-void getParsInRange(ParagraphList & pars, int ystart, int yend,
-	pit_type & beg, pit_type & end)
-{
-	BOOST_ASSERT(!pars.empty());
-	pit_type const endpar = pars.size();
-	pit_type const begpar = 0;
-
-	for (beg = endpar - 1; beg != begpar && pars[beg].y > ystart; --beg)
-		;
-
-	for (end = beg ; end != endpar && pars[end].y <= yend; ++end)
-		;
-}
-
-
 /// return the number of InsetOptArg in a paragraph
 int numberOfOptArgs(Paragraph const & par)
 {
 	int num = 0;
-	
+
 	InsetList::const_iterator it = par.insetlist.begin();
 	InsetList::const_iterator end = par.insetlist.end();
 	for (; it != end ; ++it) {
-		if (it->inset->lyxCode() == InsetBase::OPTARG_CODE) 
+		if (it->inset->lyxCode() == InsetBase::OPTARG_CODE)
 			++num;
 	}
 	return num;
 }
-
-