X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=5c54cc342bd0b1f5611f04566b6d72d180835172;hb=70c0f419f6402fc7d0856bd7a870f80f5f51e30d;hp=b56b9f4a467c9f7c27199c7ef0ed673c0e7ac933;hpb=4288e62d0884d3322cc95a6fe29516bf50e89eeb;p=lyx.git

diff --git a/src/text.C b/src/text.C
index b56b9f4a46..5c54cc342b 100644
--- a/src/text.C
+++ b/src/text.C
@@ -474,8 +474,8 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 	l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
 
 	if (par.getDepth() != 0) {
-	// find the next level paragraph
-	pit_type newpar = outerHook(pit, pars_);
+		// find the next level paragraph
+		pit_type newpar = outerHook(pit, pars_);
 		if (newpar != pit_type(pars_.size())) {
 			if (pars_[newpar].layout()->isEnvironment()) {
 				l_margin = leftMargin(newpar);
@@ -489,6 +489,13 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 		}
 	}
 
+	// This happens after sections in standard classes. The 1.3.x
+	// code compared depths too, but it does not seem necessary
+	// (JMarc)
+	if (par.layout() == tclass.defaultLayout()
+	    && pit > 0 && pars_[pit - 1].layout()->nextnoindent)
+		parindent.erase();
+
 	LyXFont const labelfont = getLabelFont(par);
 	switch (layout->margintype) {
 	case MARGIN_DYNAMIC:
@@ -1716,6 +1723,20 @@ bool LyXText::redoParagraph(pit_type const pit)
 		z = row.endpos();
 	} while (z < par.size());
 
+	// Make sure that if a par ends in newline, there is one more row
+	// under it
+	// FIXME this is a dirty trick. Now the _same_ position in the
+	// paragraph occurs in _two_ different rows, and has two different
+	// display positions, leading to weird behaviour when moving up/down.
+	if (z > 0 && par.isNewline(z - 1)) {
+		Row row(z - 1);
+		row.endpos(z - 1);
+		setRowWidth(pit, row);
+		setHeightOfRow(pit, row);
+		par.rows().push_back(row);
+		dim.des += row.height();
+	}
+	    
 	dim.asc += par.rows()[0].ascent();
 	dim.des -= par.rows()[0].ascent();