X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=a0a3c05f83bb3ed35115edd7e21222b97ea12dc0;hb=d2574b7d8e2716d3d3aea92df6576bd01c421a6c;hp=fc23249c0e4f05f9b34efe63ebe7fdff65469408;hpb=e3f01ff2f012c716f68f2510ec4b29b3ef9c6652;p=lyx.git

diff --git a/src/text.C b/src/text.C
index fc23249c0e..a0a3c05f83 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1458,6 +1458,8 @@ bool LyXText::selectWordWhenUnderCursor(LCursor & cur, word_location loc)
 
 void LyXText::acceptChange(LCursor & cur)
 {
+	// FIXME: change tracking (MG)
+
 	BOOST_ASSERT(this == cur.text());
 
 	if (!cur.selection() && cur.lastpos() != 0)
@@ -1470,25 +1472,17 @@ void LyXText::acceptChange(LCursor & cur)
 	DocIterator it = cur.selectionBegin();
 	DocIterator et = cur.selectionEnd();
 	pit_type pit = it.pit();
-	bool isDeleted = pars_[pit].isDeleted(it.pos());
 	for (; pit <= et.pit(); ++pit) {
-		pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
-		pos_type right =
-		    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
+		pos_type left  = (pit == it.pit() ? it.pos() : 0);
+		pos_type right = (pit == et.pit() ? et.pos() : pars_[pit].size());
 		pars_[pit].acceptChanges(left, right);
-	}
-	if (isDeleted) {
-		ParagraphList & plist = paragraphs();
-		if (it.pit() + 1 < et.pit())
-			pars_.erase(boost::next(plist.begin(), it.pit() + 1),
-				    boost::next(plist.begin(), et.pit()));
 
-		// Paragraph merge if appropriate:
-		// FIXME: change tracking (MG)
-		if (pars_[it.pit()].isDeleted(pars_[it.pit()].size())) {
-			setCursorIntern(cur, it.pit() + 1, 0);
-			backspacePos0(cur);
-		}
+		// merge paragraph if appropriate:
+		// if (right >= pars_[pit].size() && pit + 1 < et.pit() &&
+		//    pars_[pit].isDeleted(pars_[pit].size())) {
+		//	setCursorIntern(cur, pit + 1, 0);
+		//	backspacePos0(cur);
+		//}
 	}
 	finishUndo();
 	cur.clearSelection();
@@ -1498,6 +1492,8 @@ void LyXText::acceptChange(LCursor & cur)
 
 void LyXText::rejectChange(LCursor & cur)
 {
+	// FIXME: change tracking (MG)
+
 	BOOST_ASSERT(this == cur.text());
 
 	if (!cur.selection() && cur.lastpos() != 0)
@@ -1510,24 +1506,17 @@ void LyXText::rejectChange(LCursor & cur)
 	DocIterator it = cur.selectionBegin();
 	DocIterator et = cur.selectionEnd();
 	pit_type pit = it.pit();
-	bool isInserted = pars_[pit].isInserted(it.pos());
 	for (; pit <= et.pit(); ++pit) {
-		pos_type left  = ( pit == it.pit() ? it.pos() : 0 );
-		pos_type right =
-		    ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
+		pos_type left  = (pit == it.pit() ? it.pos() : 0);
+		pos_type right = (pit == et.pit() ? et.pos() : pars_[pit].size());
 		pars_[pit].rejectChanges(left, right);
-	}
-	if (isInserted) {
-		ParagraphList & plist = paragraphs();
-		if (it.pit() + 1 < et.pit())
-			pars_.erase(boost::next(plist.begin(), it.pit() + 1),
-				    boost::next(plist.begin(), et.pit()));
-		// Paragraph merge if appropriate:
-		// FIXME: change tracking (MG)
-		if (pars_[it.pit()].isInserted(pars_[it.pit()].size())) {
-			setCursorIntern(cur, it.pit() + 1, 0);
-			backspacePos0(cur);
-		}
+
+		// merge paragraph if appropriate:	
+		// if (right >= pars_[pit].size() && pit + 1 < et.pit() &&
+		//    pars_[pit].isInserted(pars_[pit].size())) {
+		//	setCursorIntern(cur, pit + 1, 0);
+		//	backspacePos0(cur);
+		//}
 	}
 	finishUndo();
 	cur.clearSelection();
@@ -1844,6 +1833,8 @@ bool LyXText::redoParagraph(BufferView & bv, pit_type const pit)
 	Paragraph & par = pars_[pit];
 	Buffer const & buffer = *bv.buffer();
 
+	bool changed = false;
+
 	// Add bibitem insets if necessary
 	if (par.layout()->labeltype == LABEL_BIBLIO) {
 		bool hasbibitem(false);
@@ -1882,7 +1873,7 @@ bool LyXText::redoParagraph(BufferView & bv, pit_type const pit)
 			bufferfont :
 			getFont(buffer, par, ii->pos);
 		MetricsInfo mi(&bv, font, w);
-		ii->inset->metrics(mi, dim);
+		changed |= ii->inset->metrics(mi, dim);
 	}
 
 	// rebreak the paragraph
@@ -1919,16 +1910,16 @@ bool LyXText::redoParagraph(BufferView & bv, pit_type const pit)
 	dim.asc += par.rows()[0].ascent();
 	dim.des -= par.rows()[0].ascent();
 
-	bool const same = dim.height() == par.dim().height();
+	changed |= dim.height() != par.dim().height();
 
 	par.dim() = dim;
 	//lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
 
-	return !same;
+	return changed;
 }
 
 
-void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
+bool LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 {
 	//BOOST_ASSERT(mi.base.textwidth);
 	if (mi.base.textwidth)
@@ -1938,10 +1929,12 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 	// save the caller's font locally:
 	font_ = mi.base.font;
 
+	bool changed = false;
+
 	unsigned int h = 0;
 	unsigned int w = 0;
 	for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) {
-		redoParagraph(*mi.base.bv, pit);
+		changed |= redoParagraph(*mi.base.bv, pit);
 		Paragraph & par = paragraphs()[pit];
 		h += par.height();
 		if (w < par.width())
@@ -1952,7 +1945,9 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
 	dim.asc = pars_[0].ascent();
 	dim.des = h - dim.asc;
 
+	changed |= dim_ != dim;
 	dim_ = dim;
+	return changed;
 }