X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=19a71ffbb99154ad41ed597c0ab4431929aaf0b5;hb=c0f4aa8c4b786dcfb3699b175dff63f109abba98;hp=d93870d9ca22f56c742ca8a6c476809d80741a90;hpb=9173fe2c5ea1075633b49747878956daec49d0b7;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index d93870d9ca..19a71ffbb9 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -28,18 +28,21 @@
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "FuncRequest.h"
+#include "HSpace.h"
 #include "InsetList.h"
 #include "Layout.h"
 #include "Length.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
 #include "rowpainter.h"
 #include "Text.h"
 #include "TextClass.h"
 #include "VSpace.h"
+#include "WordLangTuple.h"
+
+#include "insets/InsetText.h"
 
 #include "mathed/MacroTable.h"
 #include "mathed/MathMacroTemplate.h"
@@ -48,9 +51,11 @@
 #include "frontends/Painter.h"
 
 #include "support/debug.h"
-#include <cstdlib>
+#include "support/docstring_list.h"
 #include "support/lassert.h"
 
+#include <cstdlib>
+
 using namespace std;
 
 
@@ -130,7 +135,7 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text)
 	dim_.asc = 10;
 	dim_.des = 10;
 
-	//text_->updateLabels(bv->buffer());
+	//text_->updateBuffer(bv->buffer());
 }
 
 
@@ -174,17 +179,6 @@ ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo)
 }
 
 
-int TextMetrics::parPosition(pit_type pit) const
-{
-	if (pit < par_metrics_.begin()->first)
-		return -1000000;
-	if (pit > par_metrics_.rbegin()->first)
-		return +1000000;
-
-	return par_metrics_[pit].position();
-}
-
-
 bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 {
 	LASSERT(mi.base.textwidth > 0, /**/);
@@ -239,11 +233,9 @@ int TextMetrics::rightMargin(pit_type const pit) const
 
 void TextMetrics::applyOuterFont(Font & font) const
 {
-	Font lf(font_);
-	lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo());
-	lf.fontInfo().realize(font.fontInfo());
-	lf.setLanguage(font.language());
-	font = lf;
+	FontInfo lf(font_.fontInfo());
+	lf.reduce(bv_->buffer().params().getFont().fontInfo());
+	font.fontInfo().realize(lf); 
 }
 
 
@@ -262,7 +254,7 @@ Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
 	// We specialize the 95% common case:
 	if (!par.getDepth()) {
 		Font f = par.getFontSettings(params, pos);
-		if (!text_->isMainText(buffer))
+		if (!text_->isMainText())
 			applyOuterFont(f);
 		bool lab = layout.labeltype == LABEL_MANUAL && pos < body_pos;
 
@@ -283,14 +275,14 @@ Font TextMetrics::displayFont(pit_type pit, pos_type pos) const
 	Font font = par.getFontSettings(params, pos);
 	font.fontInfo().realize(layoutfont);
 
-	if (!text_->isMainText(buffer))
+	if (!text_->isMainText())
 		applyOuterFont(font);
 
 	// Realize against environment font information
 	// NOTE: the cast to pit_type should be removed when pit_type
 	// changes to a unsigned integer.
 	if (pit < pit_type(pars.size()))
-		font.fontInfo().realize(outerFont(pit, pars).fontInfo());
+		font.fontInfo().realize(text_->outerFont(pit).fontInfo());
 
 	// Realize with the fonts of lesser depth.
 	font.fontInfo().realize(params.getFont().fontInfo());
@@ -317,7 +309,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 	if (!lyxrc.rtl_support)
 		return false;
 
-	// no RTL boundary at line start
+	// no RTL boundary at paragraph start
 	if (pos == 0)
 		return false;
 
@@ -330,16 +322,44 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 		Font const & font) const
 {
-	if (!lyxrc.rtl_support)
+	if (!lyxrc.rtl_support
+	    // no RTL boundary at paragraph start
+	    || pos == 0
+	    // if the metrics have not been calculated, then we are not
+	    // on screen and can safely ignore issues about boundaries.
+	    || !contains(pit))
+		return false;
+
+	ParagraphMetrics & pm = par_metrics_[pit];
+	// no RTL boundary in empty paragraph
+	if (pm.rows().empty())
+		return false;
+
+	pos_type endpos = pm.getRow(pos - 1, false).endpos();
+	pos_type startpos = pm.getRow(pos, false).pos();
+	// no RTL boundary at line start:
+	// abc\n   -> toggle to RTL ->    abc\n     (and not:    abc\n|
+	// |                              |                               )
+	if (pos == startpos && pos == endpos) // start of cur row, end of prev row
 		return false;
 
 	Paragraph const & par = text_->getPar(pit);
+	// no RTL boundary at line break:
+	// abc|\n    -> move right ->   abc\n       (and not:    abc\n|
+	// FED                          FED|                     FED     )
+	if (startpos == pos && endpos == pos && endpos != par.size() 
+		&& (par.isNewline(pos - 1) 
+			|| par.isLineSeparator(pos - 1) 
+			|| par.isSeparator(pos - 1)))
+		return false;
+	
 	bool left = font.isVisibleRightToLeft();
 	bool right;
 	if (pos == par.size())
 		right = par.isRTL(bv_->buffer().params());
 	else
 		right = displayFont(pit, pos).isVisibleRightToLeft();
+	
 	return left != right;
 }
 
@@ -347,7 +367,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 bool TextMetrics::redoParagraph(pit_type const pit)
 {
 	Paragraph & par = text_->getPar(pit);
-	// IMPORTANT NOTE: We pass 'false' explicitely in order to not call
+	// IMPORTANT NOTE: We pass 'false' explicitly in order to not call
 	// redoParagraph() recursively inside parMetrics.
 	Dimension old_dim = parMetrics(pit, false).dim();
 	ParagraphMetrics & pm = par_metrics_[pit];
@@ -384,7 +404,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 		LYXERR(Debug::INFO, "MacroContext not initialised!"
 			<< " Going through the buffer again and hope"
 			<< " the context is better then.");
-		bv_->buffer().updateLabels();
+		bv_->buffer().updateBuffer();
 		parPos = text_->macrocontextPosition();
 		LASSERT(!parPos.empty(), /**/);
 		parPos.pit() = pit;
@@ -415,7 +435,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
 			- right_margin;
 		Font const & font = ii->inset->noFontChange() ?
 			bufferfont : displayFont(pit, ii->pos);
-		MacroContext mc(buffer, parPos);
+		MacroContext mc(&buffer, parPos);
 		MetricsInfo mi(bv_, font.fontInfo(), w, mc);
 		ii->inset->metrics(mi, dim);
 		Dimension const old_dim = pm.insetDimension(ii->inset);
@@ -492,7 +512,6 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 	row.label_hfill = 0;
 	row.separator = 0;
 
-	Buffer & buffer = bv_->buffer();
 	Paragraph const & par = text_->getPar(pit);
 
 	double w = width - row.width();
@@ -503,7 +522,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 	//lyxerr << "row.width() " << row.width() << endl;
 	//lyxerr << "w " << w << endl;
 
-	bool const is_rtl = text_->isRTL(buffer, par);
+	bool const is_rtl = text_->isRTL(par);
 	if (is_rtl)
 		row.x = rightMargin(pit);
 	else
@@ -547,7 +566,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 			align = par.params().align();
 
 		// handle alignment inside tabular cells
-		Inset const & owner = par.inInset();
+		Inset const & owner = text_->inset();
 		switch (owner.contentAlignment()) {
 			case LYX_ALIGN_CENTER:
 			case LYX_ALIGN_LEFT:
@@ -561,7 +580,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 				break;
 		}
 
-		// Display-style insets should always be on a centred row
+		// Display-style insets should always be on a centered row
 		if (Inset const * inset = par.getInset(row.pos())) {
 			switch (inset->display()) {
 				case Inset::AlignLeft:
@@ -571,9 +590,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 					align = LYX_ALIGN_CENTER;
 					break;
 				case Inset::Inline:
-				case Inset::AlignRight:
 					// unchanged (use align)
 					break;
+				case Inset::AlignRight:
+					align = LYX_ALIGN_RIGHT;
+					break;
 			}
 		}
 
@@ -618,7 +639,7 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 		if (body_pos > 0
 		    && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
 		{
-			row.x += theFontMetrics(text_->labelFont(buffer, par)).
+			row.x += theFontMetrics(text_->labelFont(par)).
 				width(layout.labelsep);
 			if (body_pos <= end)
 				row.x += row.label_hfill;
@@ -654,7 +675,6 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
 
 int TextMetrics::labelFill(pit_type const pit, Row const & row) const
 {
-	Buffer & buffer = bv_->buffer();
 	Paragraph const & par = text_->getPar(pit);
 
 	pos_type last = par.beginOfBody();
@@ -676,7 +696,7 @@ int TextMetrics::labelFill(pit_type const pit, Row const & row) const
 		return 0;
 
 	FontMetrics const & fm
-		= theFontMetrics(text_->labelFont(buffer, par));
+		= theFontMetrics(text_->labelFont(par));
 
 	return max(0, fm.width(label) - w);
 }
@@ -762,10 +782,9 @@ private:
 
 } // anon namespace
 
-pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
-		pit_type pos) const
+pos_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
+		pos_type pos) const
 {
-	Buffer & buffer = bv_->buffer();
 	ParagraphMetrics const & pm = par_metrics_[pit];
 	Paragraph const & par = text_->getPar(pit);
 	pos_type const end = par.size();
@@ -800,11 +819,24 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 	// pixel width since last breakpoint
 	int chunkwidth = 0;
 
+	docstring const s(1, char_type(0x00B6));
+	Font f;
+	int par_marker_width = theFontMetrics(f).width(s);
+
 	FontIterator fi = FontIterator(*this, par, pit, pos);
 	pos_type point = end;
 	pos_type i = pos;
+
+	ParagraphList const & pars_ = text_->paragraphs();
+	bool const draw_par_end_marker = lyxrc.paragraph_markers
+		&& size_type(pit + 1) < pars_.size();
+				
 	for ( ; i < end; ++i, ++fi) {
 		int thiswidth = pm.singleWidth(i, *fi);
+		
+		if (draw_par_end_marker && i == end - 1)
+			// enlarge the last character to hold the end-of-par marker
+			thiswidth += par_marker_width;
 
 		// add inline completion width
 		if (inlineCompletionLPos == i) {
@@ -816,7 +848,7 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 		// add the auto-hfill from label end to the body
 		if (body_pos && i == body_pos) {
 			FontMetrics const & fm = theFontMetrics(
-				text_->labelFont(buffer, par));
+				text_->labelFont(par));
 			int add = fm.width(layout.labelsep);
 			if (par.isLineSeparator(i - 1))
 				add -= singleWidth(pit, i - 1);
@@ -888,7 +920,6 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 		pos_type const first, pos_type const end) const
 {
-	Buffer & buffer = bv_->buffer();
 	// get the pure distance
 	ParagraphMetrics const & pm = par_metrics_[pit];
 	Paragraph const & par = text_->getPar(pit);
@@ -913,13 +944,18 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 		for ( ; i < end; ++i, ++fi) {
 			if (body_pos > 0 && i == body_pos) {
 				FontMetrics const & fm = theFontMetrics(
-					text_->labelFont(buffer, par));
+					text_->labelFont(par));
 				w += fm.width(par.layout().labelsep);
 				if (par.isLineSeparator(i - 1))
 					w -= singleWidth(pit, i - 1);
 				w = max(w, label_end);
 			}
-			w += pm.singleWidth(i, *fi);
+			
+			// a line separator at the end of a line (but not at the end of a 
+			// paragraph) will not be drawn and should therefore not count for
+			// the row width.
+			if (!par.isLineSeparator(i) || i != end - 1 || end == par.size())
+				w += pm.singleWidth(i, *fi);
 
 			// add inline completion width
 			if (inlineCompletionLPos == i) {
@@ -930,9 +966,21 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 		}
 	}
 
+	// count the paragraph end marker.
+	if (end == par.size() && lyxrc.paragraph_markers) {
+		ParagraphList const & pars_ = text_->paragraphs();
+		if (size_type(pit + 1) < pars_.size()) {
+			// enlarge the last character to hold the
+			// end-of-par marker
+			docstring const s(1, char_type(0x00B6));
+			Font f;
+			w += theFontMetrics(f).width(s);
+		}
+	}
+
 	if (body_pos > 0 && body_pos >= end) {
 		FontMetrics const & fm = theFontMetrics(
-			text_->labelFont(buffer, par));
+			text_->labelFont(par));
 		w += fm.width(par.layout().labelsep);
 		if (end > 0 && par.isLineSeparator(end - 1))
 			w -= singleWidth(pit, end - 1);
@@ -964,18 +1012,18 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 	Buffer const & buffer = bv_->buffer();
 	Font font = displayFont(pit, first);
 	FontSize const tmpsize = font.fontInfo().size();
-	font.fontInfo() = text_->layoutFont(buffer, pit);
+	font.fontInfo() = text_->layoutFont(pit);
 	FontSize const size = font.fontInfo().size();
 	font.fontInfo().setSize(tmpsize);
 
-	FontInfo labelfont = text_->labelFont(buffer, par);
+	FontInfo labelfont = text_->labelFont(par);
 
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 	FontMetrics const & fontmetrics = theFontMetrics(font);
 
 	// these are minimum values
 	double const spacing_val = layout.spacing.getValue()
-		* text_->spacing(buffer, par);
+		* text_->spacing(par);
 	//lyxerr << "spacing_val = " << spacing_val << endl;
 	int maxasc  = int(fontmetrics.maxAscent()  * spacing_val);
 	int maxdesc = int(fontmetrics.maxDescent() * spacing_val);
@@ -1013,6 +1061,7 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 	++maxdesc;
 
 	ParagraphList const & pars = text_->paragraphs();
+	Inset const & inset = text_->inset();
 
 	// is it a top line?
 	if (first == 0 && topBottomSpace) {
@@ -1020,8 +1069,8 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 		// some parskips VERY EASY IMPLEMENTATION
 		if (bufparams.paragraph_separation
 		    == BufferParams::ParagraphSkipSeparation
-			&& par.ownerCode() != ERT_CODE
-			&& par.ownerCode() != LISTINGS_CODE
+			&& inset.lyxCode() != ERT_CODE
+			&& inset.lyxCode() != LISTINGS_CODE
 			&& pit > 0
 			&& ((layout.isParagraph() && par.getDepth() == 0)
 			    || (pars[pit - 1].layout().isParagraph()
@@ -1039,20 +1088,20 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 		    && !par.params().labelString().empty()) {
 			labeladdon = int(labelfont_metrics.maxHeight()
 				     * layout.spacing.getValue()
-				     * text_->spacing(buffer, par));
+				     * text_->spacing(par));
 		}
 
 		// special code for the top label
 		if ((layout.labeltype == LABEL_TOP_ENVIRONMENT
 		     || layout.labeltype == LABEL_BIBLIO
 		     || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
-		    && isFirstInSequence(pit, pars)
+		    && text_->isFirstInSequence(pit)
 		    && !par.labelString().empty())
 		{
 			labeladdon = int(
 				  labelfont_metrics.maxHeight()
 					* layout.spacing.getValue()
-					* text_->spacing(buffer, par)
+					* text_->spacing(par)
 				+ (layout.topsep + layout.labelbottomsep) * dh);
 		}
 
@@ -1060,7 +1109,7 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 		// a section, or between the items of a itemize or enumerate
 		// environment.
 
-		pit_type prev = depthHook(pit, pars, par.getDepth());
+		pit_type prev = text_->depthHook(pit, par.getDepth());
 		Paragraph const & prevpar = pars[prev];
 		if (prev != pit
 		    && prevpar.layout() == layout
@@ -1073,7 +1122,7 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 				layoutasc = layout.topsep * dh;
 		}
 
-		prev = outerHook(pit, pars);
+		prev = text_->outerHook(pit);
 		if (prev != pit_type(pars.size())) {
 			maxasc += int(pars[prev].layout().parsep * dh);
 		} else if (pit != 0) {
@@ -1098,7 +1147,7 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
 
 			if (pars[cpit].getDepth() > pars[nextpit].getDepth()) {
 				usual = pars[cpit].layout().bottomsep * dh;
-				cpit = depthHook(cpit, pars, pars[nextpit].getDepth());
+				cpit = text_->depthHook(cpit, pars[nextpit].getDepth());
 				if (pars[cpit].layout() != pars[nextpit].layout()
 					|| pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString())
 				{
@@ -1173,12 +1222,18 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 		return 0;
 	}
 
+	// if the first character is a separator, 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 (par.isSeparator(bidi.vis2log(vc)))
+		++vc;
+
 	while (vc < end && tmpx <= x) {
 		c = bidi.vis2log(vc);
 		last_tmpx = tmpx;
 		if (body_pos > 0 && c == body_pos - 1) {
 			FontMetrics const & fm = theFontMetrics(
-				text_->labelFont(buffer, par));
+				text_->labelFont(par));
 			tmpx += row.label_hfill + fm.width(layout.labelsep);
 			if (par.isLineSeparator(body_pos - 1))
 				tmpx -= singleWidth(pit, body_pos - 1);
@@ -1204,7 +1259,7 @@ 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(buffer, par) : false;
+	bool const rtl = lastrow ? text_->isRTL(par) : false;
 	if (lastrow &&
 	    ((rtl  &&  left_side && vc == row.pos() && x < tmpx - 5) ||
 	     (!rtl && !left_side && vc == end  && x > tmpx + 5))) {
@@ -1370,7 +1425,7 @@ pit_type TextMetrics::getPitNearY(int y)
 }
 
 
-Row const & TextMetrics::getPitAndRowNearY(int y, pit_type & pit,
+Row const & TextMetrics::getPitAndRowNearY(int & y, pit_type & pit,
 	bool assert_in_view, bool up)
 {
 	ParagraphMetrics const & pm = par_metrics_[pit];
@@ -1384,25 +1439,29 @@ Row const & TextMetrics::getPitAndRowNearY(int y, pit_type & pit,
 		if (yy + rit->height() > y)
 			break;
 
-	if (assert_in_view && yy + rit->height() != y) {
-		if (!up) {
-			if (rit != pm.rows().begin())
+	if (assert_in_view) {
+		if (!up && yy + rit->height() > y) {
+			if (rit != pm.rows().begin()) {
+				y = yy;
 				--rit;
-			else if (pit != 0) {
+			} else if (pit != 0) {
 				--pit;
 				newParMetricsUp();
 				ParagraphMetrics const & pm2 = par_metrics_[pit];
 				rit = pm2.rows().end();
 				--rit;
+				y = yy;
 			}
-		} else  {
-			if (rit != rlast)
+		} else if (up && yy != y) {
+			if (rit != rlast) {
+				y = yy + rit->height();
 				++rit;
-			else if (pit != int(par_metrics_.size())) {
+			} else if (pit < int(text_->paragraphs().size()) - 1) {
 				++pit;
 				newParMetricsDown();
 				ParagraphMetrics const & pm2 = par_metrics_[pit];
 				rit = pm2.rows().begin();
+				y = pm2.position();
 			}
 		}
 	}
@@ -1421,10 +1480,11 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	}
 	pit_type pit = getPitNearY(y);
 	LASSERT(pit != -1, return 0);
+	
+	int yy = y; // is modified by getPitAndRowNearY
+	Row const & row = getPitAndRowNearY(yy, pit, assert_in_view, up);
 
-	Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up);
-	bool bound = false;
-
+	bool bound = false; // is modified by getColumnNearX
 	int xx = x; // is modified by getColumnNearX
 	pos_type const pos = row.pos()
 		+ getColumnNearX(pit, row, xx, bound);
@@ -1434,7 +1494,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	cur.setTargetX(x);
 
 	// try to descend into nested insets
-	Inset * inset = checkInsetHit(x, y);
+	Inset * inset = checkInsetHit(x, yy);
 	//lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
 	if (!inset) {
 		// Either we deconst editXY or better we move current_font
@@ -1446,23 +1506,22 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 	}
 
 	ParagraphList const & pars = text_->paragraphs();
-	Inset const * insetBefore = pos ? pars[pit].getInset(pos - 1) : 0;
-	//Inset * insetBehind = pars[pit].getInset(pos);
+	Inset const * inset_before = pos ? pars[pit].getInset(pos - 1) : 0;
 
 	// This should be just before or just behind the
 	// cursor position set above.
-	LASSERT((pos != 0 && inset == insetBefore)
+	LASSERT(inset == inset_before 
 		|| inset == pars[pit].getInset(pos), /**/);
 
 	// Make sure the cursor points to the position before
 	// this inset.
-	if (inset == insetBefore) {
+	if (inset == inset_before) {
 		--cur.pos();
 		cur.boundary(false);
 	}
 
 	// Try to descend recursively inside the inset.
-	inset = inset->editXY(cur, x, y);
+	inset = inset->editXY(cur, x, yy);
 
 	if (cur.top().text() == text_)
 		cur.setCurrentFont();
@@ -1587,8 +1646,10 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 	if (end <= row_pos)
 		cursor_vpos = row_pos;
 	else if (ppos >= end)
-		cursor_vpos = text_->isRTL(buffer, par) ? row_pos : end;
+		cursor_vpos = text_->isRTL(par) ? row_pos : end;
 	else if (ppos > row_pos && ppos >= end)
+		//FIXME: this code is never reached!
+		//       (see http://www.lyx.org/trac/changeset/8251)
 		// Place cursor after char at (logical) position pos - 1
 		cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
 			? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
@@ -1623,6 +1684,15 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 	if (end > 0 && end < par.size() && par.isSeparator(end - 1))
 		skipped_sep_vpos = bidi.log2vis(end - 1);
 
+	if (lyxrc.paragraph_markers && text_->isRTL(par)) {
+		ParagraphList const & pars_ = text_->paragraphs();
+		if (size_type(pit + 1) < pars_.size()) {
+			FontInfo f;
+			docstring const s = docstring(1, char_type(0x00B6));
+			x += theFontMetrics(f).width(s);
+		}
+	}
+
 	// Inline completion RTL special case row_pos == cursor_pos:
 	// "__|b" => cursor_pos is right of __
 	if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) {
@@ -1639,7 +1709,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 		pos_type pos = bidi.vis2log(vpos);
 		if (body_pos > 0 && pos == body_pos - 1) {
 			FontMetrics const & labelfm = theFontMetrics(
-				text_->labelFont(buffer, par));
+				text_->labelFont(par));
 			x += row.label_hfill + labelfm.width(par.layout().labelsep);
 			if (par.isLineSeparator(body_pos - 1))
 				x -= singleWidth(pit, body_pos - 1);
@@ -1808,7 +1878,7 @@ int TextMetrics::leftMargin(int max_width,
 
 	int l_margin = 0;
 
-	if (text_->isMainText(buffer))
+	if (text_->isMainText())
 		l_margin += bv_->leftMargin();
 
 	l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
@@ -1816,7 +1886,7 @@ int TextMetrics::leftMargin(int max_width,
 
 	if (par.getDepth() != 0) {
 		// find the next level paragraph
-		pit_type newpar = outerHook(pit, pars);
+		pit_type newpar = text_->outerHook(pit);
 		if (newpar != pit_type(pars.size())) {
 			if (pars[newpar].layout().isEnvironment()) {
 				l_margin = leftMargin(max_width, newpar);
@@ -1838,7 +1908,7 @@ int TextMetrics::leftMargin(int max_width,
 	    && pit > 0 && pars[pit - 1].layout().nextnoindent)
 		parindent.erase();
 
-	FontInfo const labelfont = text_->labelFont(buffer, par);
+	FontInfo const labelfont = text_->labelFont(par);
 	FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
 
 	switch (layout.margintype) {
@@ -1885,7 +1955,7 @@ int TextMetrics::leftMargin(int max_width,
 			   // theorems (JMarc)
 			   || (layout.labeltype == LABEL_STATIC
 			       && layout.latextype == LATEX_ENVIRONMENT
-			       && !isFirstInSequence(pit, pars))) {
+			       && !text_->isFirstInSequence(pit))) {
 			l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
 		} else if (layout.labeltype != LABEL_TOP_ENVIRONMENT
 			   && layout.labeltype != LABEL_BIBLIO
@@ -1934,11 +2004,11 @@ int TextMetrics::leftMargin(int max_width,
 	       || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
 	       || (layout.labeltype == LABEL_STATIC
 	           && layout.latextype == LATEX_ENVIRONMENT
-	           && !isFirstInSequence(pit, pars)))
+	           && !text_->isFirstInSequence(pit)))
 	    && align == LYX_ALIGN_BLOCK
 	    && !par.params().noindent()
 	    // in some insets, paragraphs are never indented
-	    && !par.inInset().neverIndent()
+	    && !text_->inset().neverIndent()
 	    // display style insets are always centered, omit indentation
 	    && !(!par.empty()
 		    && par.isInset(pos)
@@ -1947,11 +2017,16 @@ int TextMetrics::leftMargin(int max_width,
 	         || tclass.isPlainLayout(par.layout()))
 	        || buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation)
 	    )
-	{
-		l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
-			parindent);
-	}
-
+		{
+			// use the parindent of the layout when the default indentation is used
+			// otherwise use the indentation set in the document settings
+			if (buffer.params().getIndentation().asLyXCommand() == "default")
+				l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
+				parindent);
+			else
+				l_margin += buffer.params().getIndentation().inPixels(*bv_);
+		}
+	
 	return l_margin;
 }
 
@@ -2055,6 +2130,19 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 		row.setCrc(pm.computeRowSignature(row, bparams));
 		bool row_has_changed = row.changed();
 
+		// Take this opportunity to spellcheck the row contents.
+		if (row_has_changed && lyxrc.spellcheck_continuously) {
+			WordLangTuple wl;
+			// dummy variable, not used.
+			static docstring_list suggestions;
+			pos_type from = row.pos();
+			pos_type to = row.endpos();
+			while (from < row.endpos()) {
+				text_->getPar(pit).spellCheck(from, to, wl, suggestions, false);
+				from = to + 1;
+			}
+		}
+
 		// Don't paint the row if a full repaint has not been requested
 		// and if it has not changed.
 		if (!pi.full_repaint && !row_has_changed) {
@@ -2079,7 +2167,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 		// 12 lines lower):
 		if (lyxerr.debugging(Debug::PAINTING) && inside
 			&& (row.selection() || pi.full_repaint || row_has_changed)) {
-				string const foreword = text_->isMainText(bv_->buffer()) ?
+				string const foreword = text_->isMainText() ?
 					"main text redraw " : "inset text redraw: ";
 			LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i
 				<< " row_selection="	<< row.selection()
@@ -2094,11 +2182,16 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
 		rp.paintAppendix();
 		rp.paintDepthBar();
 		rp.paintChangeBar();
-		if (i == 0)
+		bool const is_rtl = text_->isRTL(text_->getPar(pit));
+		if (i == 0 && !is_rtl)
 			rp.paintFirst();
+		if (i == nrows - 1 && is_rtl)
+			rp.paintLast();
 		rp.paintText();
-		if (i == nrows - 1)
+		if (i == nrows - 1 && !is_rtl)
 			rp.paintLast();
+		if (i == 0 && is_rtl)
+			rp.paintFirst();
 		y += row.descent();
 		// Restore full_repaint status.
 		pi.full_repaint = tmp;
@@ -2124,7 +2217,6 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	bool const begin_boundary = beg.pos() >= row.endpos();
 	bool const end_boundary = row.sel_end == row.endpos();
 
-	Buffer & buffer = bv_->buffer();
 	DocIterator cur = beg;
 	cur.boundary(begin_boundary);
 	int x1 = cursorX(beg.top(), begin_boundary);
@@ -2132,12 +2224,12 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
 	int const y2 = y1 + row.height();
 
-	int const rm = text_->isMainText(buffer) ? bv_->rightMargin() : 0;
-	int const lm = text_->isMainText(buffer) ? bv_->leftMargin() : 0;
+	int const rm = text_->isMainText() ? bv_->rightMargin() : 0;
+	int const lm = text_->isMainText() ? bv_->leftMargin() : 0;
 
 	// draw the margins
 	if (row.begin_margin_sel) {
-		if (text_->isRTL(buffer, beg.paragraph())) {
+		if (text_->isRTL(beg.paragraph())) {
 			pi.pain.fillRectangle(x + x1, y1,  width() - rm - x1, y2 - y1,
 				Color_selection);
 		} else {
@@ -2147,7 +2239,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 	}
 
 	if (row.end_margin_sel) {
-		if (text_->isRTL(buffer, beg.paragraph())) {
+		if (text_->isRTL(beg.paragraph())) {
 			pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1,
 				Color_selection);
 		} else {
@@ -2164,7 +2256,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 
 	// go through row and draw from RTL boundary to RTL boundary
 	while (cur < end) {
-		bool drawNow = false;
+		bool draw_now = false;
 
 		// simplified cursorForward code below which does not
 		// descend into insets and which does not go into the
@@ -2179,7 +2271,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 			// because:  ab|cDDEEFFghi -> abc|DDEEFFghi
 			++cur.pos();
 			cur.boundary(true);
-			drawNow = true;
+			draw_now = true;
 		} else {
 			// move right
 			++cur.pos();
@@ -2194,7 +2286,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
 			x1 = cursorX(cur.top(), cur.boundary());
 		}
 
-		if (!(cur < end) || drawNow) {
+		if (!(cur < end) || draw_now) {
 			x2 = cursorX(cur.top(), cur.boundary());
 			pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1,
 				Color_selection);