X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=f291e397f01ffe1da1c6bab78c91a8f49429c652;hb=f1f63fcad0a5512dc277fd8e401ac6cd5736c699;hp=fd576c31b2a254a460999dddede9be56606a9b37;hpb=13126b8060e2cd532facf4462e0576d33a0781c2;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index fd576c31b2..f291e397f0 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -158,6 +158,7 @@ pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
 
 pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
 {
+	LASSERT(!par_metrics_.empty(), /**/);
 	ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin();
 	return make_pair(it->first, &it->second);
 }
@@ -374,6 +375,21 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	main_text_ = (text_ == &buffer.text());
 	bool changed = false;
 
+	// FIXME: This check ought to be done somewhere else. It is the reason
+	// why text_ is not	const. But then, where else to do it?
+	// Well, how can you end up with either (a) a biblio environment that
+	// has no InsetBibitem or (b) a biblio environment with more than one
+	// InsetBibitem? I think the answer is: when paragraphs are merged;
+	// when layout is set; when material is pasted.
+	int const moveCursor = par.checkBiblio(buffer);
+	if (moveCursor > 0)
+		const_cast<Cursor &>(bv_->cursor()).posForward();
+	else if (moveCursor < 0) {
+		Cursor & cursor = const_cast<Cursor &>(bv_->cursor());
+		if (cursor.pos() >= -moveCursor)
+			cursor.posBackward();
+	}
+
 	// Optimisation: this is used in the next two loops
 	// so better to calculate that once here.
 	int const right_margin = rightMargin(pm);
@@ -396,12 +412,11 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 	}
 
 	// redo insets
-	// FIXME: We should always use getFont(), see documentation of
-	// noFontChange() in Inset.h.
 	Font const bufferfont = buffer.params().getFont();
 	InsetList::const_iterator ii = par.insetList().begin();
 	InsetList::const_iterator iend = par.insetList().end();
 	for (; ii != iend; ++ii) {
+		// FIXME Doesn't this HAVE to be non-empty?
 		// position already initialized?
 		if (!parPos.empty()) {
 			parPos.pos() = ii->pos;
@@ -418,8 +433,8 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		Dimension dim;
 		int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
 			- right_margin;
-		Font const & font = ii->inset->noFontChange() ?
-			bufferfont : displayFont(pit, ii->pos);
+		Font const & font = ii->inset->inheritFont() ?
+			displayFont(pit, ii->pos) : bufferfont;
 		MacroContext mc(&buffer, parPos);
 		MetricsInfo mi(bv_, font.fontInfo(), w, mc);
 		ii->inset->metrics(mi, dim);
@@ -583,6 +598,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			}
 		}
 
+		// Has the user requested we not justify stuff?
+		if (!bv_->buffer().params().justification
+		    && align == LYX_ALIGN_BLOCK)
+			align = LYX_ALIGN_LEFT;
+
 		switch (align) {
 		case LYX_ALIGN_BLOCK: {
 			int const ns = numberOfSeparators(par, row);
@@ -687,6 +707,8 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
 }
 
 
+#if 0
+// Not used, see TextMetrics::rowBreakPoint. 
 // this needs special handling - only newlines count as a break point
 static pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 {
@@ -698,6 +720,7 @@ static pos_type addressBreakPoint(pos_type i, Paragraph const & par)
 
 	return end;
 }
+#endif
 
 
 int TextMetrics::labelEnd(pit_type const pit) const
@@ -778,8 +801,13 @@ pos_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 
 	Layout const & layout = par.layout();
 
+#if 0
+	//FIXME: As long as leftMargin() is not correctly implemented for 
+	// MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here.
+	// Otherwise, long rows will be painted off the screen.
 	if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX)
 		return addressBreakPoint(pos, par);
+#endif
 
 	pos_type const body_pos = par.beginOfBody();
 
@@ -1052,16 +1080,14 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 	if (first == 0 && topBottomSpace) {
 		BufferParams const & bufparams = buffer.params();
 		// some parskips VERY EASY IMPLEMENTATION
-		if (bufparams.paragraph_separation
-		    == BufferParams::ParagraphSkipSeparation
-			&& inset.lyxCode() != ERT_CODE
-			&& inset.lyxCode() != LISTINGS_CODE
-			&& pit > 0
-			&& ((layout.isParagraph() && par.getDepth() == 0)
-			    || (pars[pit - 1].layout().isParagraph()
-				&& pars[pit - 1].getDepth() == 0)))
-		{
-				maxasc += bufparams.getDefSkip().inPixels(*bv_);
+		if (bufparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
+		    && !inset.getLayout().parbreakIsNewline()
+		    && !par.layout().parbreak_is_newline
+		    && pit > 0
+		    && ((layout.isParagraph() && par.getDepth() == 0)
+			|| (pars[pit - 1].layout().isParagraph()
+			    && pars[pit - 1].getDepth() == 0))) {
+			maxasc += bufparams.getDefSkip().inPixels(*bv_);
 		}
 
 		if (par.params().startOfAppendix())
@@ -1213,12 +1239,13 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 
 	// If lastrow is false, we don't need to compute
 	// the value of rtl.
-	bool const rtl = lastrow ? text_->isRTL(par) : false;
+	bool const rtl_on_lastrow = lastrow ? text_->isRTL(par) : false;
 
 	// if the first character is a separator, and we are in RTL
 	// text, this character will not be painted on screen
-	// and thus we should not count it and skip to the next.
-	if (rtl && par.isSeparator(bidi.vis2log(vc)))
+	// and thus we should not count it and skip to the next. Only
+	// in freespacing paragraphs, this first character is painted.
+	if (!par.isFreeSpacing() && par.isSeparator(bidi.vis2log(vc)))
 		++vc;
 
 	while (vc < end && tmpx <= x) {
@@ -1248,8 +1275,8 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 	boundary = false;
 
 	if (lastrow &&
-	    ((rtl  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
-	     (!rtl && !left_side && vc == end  && x > tmpx + 5))) {
+	    ((rtl_on_lastrow  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
+	     (!rtl_on_lastrow && !left_side && vc == end  && x > tmpx + 5))) {
 		if (!par.isNewline(end - 1))
 			c = end;
 	} else if (vc == row.pos()) {
@@ -1362,7 +1389,8 @@ pit_type TextMetrics::getPitNearY(int y)
 	int yy = -1;
 	ParMetricsCache::const_iterator it = par_metrics_.begin();
 	ParMetricsCache::const_iterator et = par_metrics_.end();
-	ParMetricsCache::const_iterator last = et; last--;
+	ParMetricsCache::const_iterator last = et;
+	--last;
 
 	ParagraphMetrics const & pm = it->second;
 
@@ -1498,7 +1526,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	// This should be just before or just behind the
 	// cursor position set above.
 	LASSERT(inset == inset_before 
-		|| inset == pars[pit].getInset(pos), /**/);
+		|| inset == pars[pit].getInset(pos), return 0);
 
 	// Make sure the cursor points to the position before
 	// this inset.
@@ -1956,16 +1984,18 @@ int TextMetrics::leftMargin(int max_width,
 
 	case MARGIN_RIGHT_ADDRESS_BOX: {
 #if 0
-		// ok, a terrible hack. The left margin depends on the widest
-		// row in this paragraph.
-		RowList::iterator rit = par.rows().begin();
-		RowList::iterator end = par.rows().end();
-		// FIXME: This is wrong.
+		// The left margin depends on the widest row in this paragraph.
+		// This code is wrong because it depends on the rows, but at the
+		// same time this function is used in redoParagraph to construct
+		// the rows. 
+		ParagraphMetrics const & pm = par_metrics_[pit];
+		RowList::const_iterator rit = pm.rows().begin();
+		RowList::const_iterator end = pm.rows().end();
 		int minfill = max_width;
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
-		l_margin += theFontMetrics(params.getFont()).signedWidth(layout.leftmargin);
+		l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(layout.leftmargin);
 		l_margin += minfill;
 #endif
 		// also wrong, but much shorter.