X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.cpp;h=6cf341016dfcf6f4292e03ff46859c65a1f13ff5;hb=9aa6b8a8aa432d9a472943fd9eefffc3ed86c063;hp=41919b72ee2f298f9e37f4563e371924da63e978;hpb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;p=lyx.git

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 41919b72ee..6cf341016d 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -10,6 +10,7 @@
  */
 
 #include <config.h>
+#include <algorithm>
 
 #include "rowpainter.h"
 
@@ -17,13 +18,13 @@
 #include "Buffer.h"
 #include "CoordCache.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "Changes.h"
 #include "Encoding.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Language.h"
-#include "Color.h"
+#include "Layout.h"
 #include "LyXRC.h"
 #include "Row.h"
 #include "MetricsInfo.h"
@@ -39,14 +40,13 @@
 
 #include "insets/InsetText.h"
 
+#include "support/debug.h"
 #include "support/textutils.h"
 
+#include "support/lassert.h"
 #include <boost/crc.hpp>
 
-using std::endl;
-using std::max;
-using std::string;
-
+using namespace std;
 
 namespace lyx {
 
@@ -69,14 +69,14 @@ RowPainter::RowPainter(PainterInfo & pi,
 	//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
 	//row_.dump();
 
-	BOOST_ASSERT(pit >= 0);
-	BOOST_ASSERT(pit < int(text.paragraphs().size()));
+	LASSERT(pit >= 0, /**/);
+	LASSERT(pit < int(text.paragraphs().size()), /**/);
 }
 
 
-Font const RowPainter::getLabelFont() const
+FontInfo RowPainter::labelFont() const
 {
-	return text_.getLabelFont(pi_.base.bv->buffer(), par_);
+	return text_.labelFont(pi_.base.bv->buffer(), par_);
 }
 
 
@@ -86,36 +86,6 @@ int RowPainter::leftMargin() const
 		row_.pos());
 }
 
-
-void RowPainter::paintHfill(pos_type const pos, pos_type const body_pos)
-{
-	x_ += 1;
-
-	int const y0 = yo_;
-	int const y1 = y0 - defaultRowHeight() / 2;
-
-	pi_.pain.line(int(x_), y1, int(x_), y0, Color::added_space);
-
-	if (pm_.hfillExpansion(row_, pos)) {
-		int const y2 = (y0 + y1) / 2;
-
-		if (pos >= body_pos) {
-			pi_.pain.line(int(x_), y2, int(x_ + row_.hfill), y2,
-				Color::added_space,
-				Painter::line_onoffdash);
-			x_ += row_.hfill;
-		} else {
-			pi_.pain.line(int(x_), y2, int(x_ + row_.label_hfill), y2,
-				Color::added_space,
-				Painter::line_onoffdash);
-			x_ += row_.label_hfill;
-		}
-		pi_.pain.line(int(x_), y1, int(x_), y0, Color::added_space);
-	}
-	x_ += 2;
-}
-
-
 // If you want to debug inset metrics uncomment the following line:
 //#define DEBUG_METRICS
 // This draws green lines around each inset.
@@ -123,14 +93,18 @@ void RowPainter::paintHfill(pos_type const pos, pos_type const body_pos)
 
 void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 {
-	Font font = text_metrics_.getDisplayFont(pit_, pos);
+	Font const font = text_metrics_.displayFont(pit_, pos);
+
+	LASSERT(inset, /**/);
+	// Backup full_repaint status because some insets (InsetTabular)
+	// requires a full repaint
+	bool pi_full_repaint = pi_.full_repaint;
 
-	BOOST_ASSERT(inset);
 	// FIXME: We should always use font, see documentation of
 	// noFontChange() in Inset.h.
 	pi_.base.font = inset->noFontChange() ?
-		pi_.base.bv->buffer().params().getFont() :
-		font;
+		pi_.base.bv->buffer().params().getFont().fontInfo() :
+		font.fontInfo();
 	pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
 	pi_.erased_ = erased_ || par_.isDeleted(pos);
 	pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
@@ -140,45 +114,48 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 
 	Dimension const & dim = pm_.insetDimension(inset);
 
-	paintForeignMark(x_, font, dim.descent());
+	paintForeignMark(x_, font.language(), dim.descent());
 
 	x_ += dim.width();
 
+	// Restore full_repaint status.
+	pi_.full_repaint = pi_full_repaint;
+
 #ifdef DEBUG_METRICS
 	int const x1 = int(x_ - dim.width());
 	Dimension dim2;
-	BOOST_ASSERT(max_witdh_ > 0);
+	LASSERT(max_witdh_ > 0, /**/);
 	int right_margin = text_metrics_.rightMargin(pm_);
 	int const w = max_witdh_ - leftMargin() - right_margin;
-	MetricsInfo mi(pi_.base.bv, font, w);
+	MetricsInfo mi(pi_.base.bv, font.fontInfo(), w);
 	inset->metrics(mi, dim2);
 	if (dim.wid != dim2.wid)
 		lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
 		       << " draw width " << dim.width()
-		       << "> metrics width " << dim2.wid << "." << std::endl;
+		       << "> metrics width " << dim2.wid << "." << endl;
 	if (dim->asc != dim2.asc)
 		lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
 		       << " draw ascent " << dim.ascent()
-		       << "> metrics ascent " << dim2.asc << "." << std::endl;
+		       << "> metrics ascent " << dim2.asc << "." << endl;
 	if (dim2.descent() != dim.des)
 		lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
 		       << " draw ascent " << dim.descent()
-		       << "> metrics descent " << dim2.des << "." << std::endl;
-	BOOST_ASSERT(dim2.wid == dim.wid);
-	BOOST_ASSERT(dim2.asc == dim.asc);
-	BOOST_ASSERT(dim2.des == dim.des);
+		       << "> metrics descent " << dim2.des << "." << endl;
+	LASSERT(dim2.wid == dim.wid, /**/);
+	LASSERT(dim2.asc == dim.asc, /**/);
+	LASSERT(dim2.des == dim.des, /**/);
 	int const x2 = x1 + dim.wid;
 	int const y1 = yo_ + dim.des;
 	int const y2 = yo_ - dim.asc;
-	pi_.pain.line(x1, y1, x1, y2, Color::green);
-	pi_.pain.line(x1, y1, x2, y1, Color::green);
-	pi_.pain.line(x2, y1, x2, y2, Color::green);
-	pi_.pain.line(x1, y2, x2, y2, Color::green);
+	pi_.pain.line(x1, y1, x1, y2, Color_green);
+	pi_.pain.line(x1, y1, x2, y1, Color_green);
+	pi_.pain.line(x2, y1, x2, y2, Color_green);
+	pi_.pain.line(x1, y2, x2, y2, Color_green);
 #endif
 }
 
 
-void RowPainter::paintHebrewComposeChar(pos_type & vpos, Font const & font)
+void RowPainter::paintHebrewComposeChar(pos_type & vpos, FontInfo const & font)
 {
 	pos_type pos = bidi_.vis2log(vpos);
 
@@ -194,10 +171,10 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, Font const & font)
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
 		c = par_.getChar(i);
-		if (!Encodings::isComposeChar_hebrew(c)) {
+		if (!Encodings::isHebrewComposeChar(c)) {
 			if (isPrintableNonspace(c)) {
 				int const width2 = pm_.singleWidth(i,
-					text_metrics_.getDisplayFont(pit_, i));
+					text_metrics_.displayFont(pit_, i));
 				dx = (c == 0x05e8 || // resh
 				      c == 0x05d3)   // dalet
 					? width2 - width
@@ -212,7 +189,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, Font const & font)
 }
 
 
-void RowPainter::paintArabicComposeChar(pos_type & vpos, Font const & font)
+void RowPainter::paintArabicComposeChar(pos_type & vpos, FontInfo const & font)
 {
 	pos_type pos = bidi_.vis2log(vpos);
 	docstring str;
@@ -228,10 +205,10 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, Font const & font)
 
 	for (pos_type i = pos - 1; i >= 0; --i) {
 		c = par_.getChar(i);
-		if (!Encodings::isComposeChar_arabic(c)) {
+		if (!Encodings::isArabicComposeChar(c)) {
 			if (isPrintableNonspace(c)) {
 				int const width2 = pm_.singleWidth(i,
-						text_metrics_.getDisplayFont(pit_, i));
+						text_metrics_.displayFont(pit_, i));
 				dx = (width2 - width) / 2;
 			}
 			break;
@@ -242,17 +219,13 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, Font const & font)
 }
 
 
-void RowPainter::paintChars(pos_type & vpos, Font const & font,
+void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 			    bool hebrew, bool arabic)
 {
 	// This method takes up 70% of time when typing
 	pos_type pos = bidi_.vis2log(vpos);
-	pos_type const end = row_.endpos();
-	FontSpan const font_span = par_.fontSpan(pos);
-	Change::Type const prev_change = par_.lookupChange(pos).type;
-
 	// first character
-	std::vector<char_type> str;
+	vector<char_type> str;
 	str.reserve(100);
 	str.push_back(par_.getChar(pos));
 
@@ -265,13 +238,26 @@ void RowPainter::paintChars(pos_type & vpos, Font const & font,
 		str[0] = par_.transformChar(c, pos);
 	}
 
+	pos_type const end = row_.endpos();
+	FontSpan const font_span = par_.fontSpan(pos);
+	// Track-change status.
+	Change::Type const change_type = par_.lookupChange(pos).type;
+	// selected text?
+	bool const selection = pos >= row_.sel_beg && pos < row_.sel_end;
+
 	// collect as much similar chars as we can
 	for (++vpos ; vpos < end ; ++vpos) {
 		pos = bidi_.vis2log(vpos);
 		if (pos < font_span.first || pos > font_span.last)
 			break;
 
-		if (prev_change != par_.lookupChange(pos).type)
+		bool const new_selection = pos >= row_.sel_beg && pos < row_.sel_end;
+		if (new_selection != selection)
+			// Selection ends or starts here.
+			break;
+
+		if (change_type != par_.lookupChange(pos).type)
+			// Track change type has changed.
 			break;
 
 		char_type c = par_.getChar(pos);
@@ -298,10 +284,10 @@ void RowPainter::paintChars(pos_type & vpos, Font const & font,
 		 * of arabic and hebrew characters, then these breaks may have
 		 * to be re-applied.
 
-		if (arabic && Encodings::isComposeChar_arabic(c))
+		if (arabic && Encodings::isArabicComposeChar(c))
 			break;
 
-		if (hebrew && Encodings::isComposeChar_hebrew(c))
+		if (hebrew && Encodings::isHebrewComposeChar(c))
 			break;
 		*/
 
@@ -320,61 +306,65 @@ void RowPainter::paintChars(pos_type & vpos, Font const & font,
 
 	docstring s(&str[0], str.size());
 
-	if (prev_change != Change::UNCHANGED) {
-		Font copy(font);
-		if (prev_change == Change::DELETED) {
-			copy.setColor(Color::deletedtext);
-		} else if (prev_change == Change::INSERTED) {
-			copy.setColor(Color::addedtext);
-		}
-		x_ += pi_.pain.text(int(x_), yo_, s, copy);
-	} else {
+	if (!selection && change_type == Change::UNCHANGED) {
 		x_ += pi_.pain.text(int(x_), yo_, s, font);
+		return;
 	}
+	
+	FontInfo copy = font;
+	if (selection)
+		copy.setColor(Color_selectiontext);
+	else if (change_type == Change::DELETED)
+		copy.setColor(Color_deletedtext);
+	else if (change_type == Change::INSERTED)
+		copy.setColor(Color_addedtext);
+
+	x_ += pi_.pain.text(int(x_), yo_, s, copy);
 }
 
 
-void RowPainter::paintForeignMark(double orig_x, Font const & font, int desc)
+void RowPainter::paintForeignMark(double orig_x, Language const * lang,
+		int desc)
 {
 	if (!lyxrc.mark_foreign_language)
 		return;
-	if (font.language() == latex_language)
+	if (lang == latex_language)
 		return;
-	if (font.language() == pi_.base.bv->buffer().params().language)
+	if (lang == pi_.base.bv->buffer().params().language)
 		return;
 
 	int const y = yo_ + 1 + desc;
-	pi_.pain.line(int(orig_x), y, int(x_), y, Color::language);
+	pi_.pain.line(int(orig_x), y, int(x_), y, Color_language);
 }
 
 
 void RowPainter::paintFromPos(pos_type & vpos)
 {
 	pos_type const pos = bidi_.vis2log(vpos);
-	Font orig_font = text_metrics_.getDisplayFont(pit_, pos);
+	Font const orig_font = text_metrics_.displayFont(pit_, pos);
 	double const orig_x = x_;
 
 	// usual characters, no insets
 	char_type const c = par_.getChar(pos);
 
 	// special case languages
-	std::string const & lang = orig_font.language()->lang();
+	string const & lang = orig_font.language()->lang();
 	bool const hebrew = lang == "hebrew";
 	bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" || 
 						lang == "farsi";
 
 	// draw as many chars as we can
 	if ((!hebrew && !arabic)
-		|| (hebrew && !Encodings::isComposeChar_hebrew(c))
-		|| (arabic && !Encodings::isComposeChar_arabic(c))) {
-		paintChars(vpos, orig_font, hebrew, arabic);
+		|| (hebrew && !Encodings::isHebrewComposeChar(c))
+		|| (arabic && !Encodings::isArabicComposeChar(c))) {
+		paintChars(vpos, orig_font.fontInfo(), hebrew, arabic);
 	} else if (hebrew) {
-		paintHebrewComposeChar(vpos, orig_font);
+		paintHebrewComposeChar(vpos, orig_font.fontInfo());
 	} else if (arabic) {
-		paintArabicComposeChar(vpos, orig_font);
+		paintArabicComposeChar(vpos, orig_font.fontInfo());
 	}
 
-	paintForeignMark(orig_x, orig_font);
+	paintForeignMark(orig_x, orig_font.language());
 }
 
 
@@ -396,7 +386,7 @@ void RowPainter::paintChangeBar()
 		? row_.ascent()
 		: row_.height();
 
-	pi_.pain.fillRectangle(5, yo_ - row_.ascent(), 3, height, Color::changebar);
+	pi_.pain.fillRectangle(5, yo_ - row_.ascent(), 3, height, Color_changebar);
 }
 
 
@@ -411,8 +401,8 @@ void RowPainter::paintAppendix()
 	if (par_.params().startOfAppendix())
 		y += 2 * defaultRowHeight();
 
-	pi_.pain.line(1, y, 1, yo_ + row_.height(), Color::appendix);
-	pi_.pain.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), Color::appendix);
+	pi_.pain.line(1, y, 1, yo_ + row_.height(), Color_appendix);
+	pi_.pain.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), Color_appendix);
 }
 
 
@@ -449,20 +439,20 @@ void RowPainter::paintDepthBar()
 		int const starty = yo_ - row_.ascent();
 		int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;
 
-		pi_.pain.line(x, starty, x, starty + h, Color::depthbar);
+		pi_.pain.line(x, starty, x, starty + h, Color_depthbar);
 
 		if (i > prev_depth)
-			pi_.pain.fillRectangle(x, starty, w, 2, Color::depthbar);
+			pi_.pain.fillRectangle(x, starty, w, 2, Color_depthbar);
 		if (i > next_depth)
-			pi_.pain.fillRectangle(x, starty + h, w, 2, Color::depthbar);
+			pi_.pain.fillRectangle(x, starty + h, w, 2, Color_depthbar);
 	}
 }
 
 
 int RowPainter::paintAppendixStart(int y)
 {
-	Font pb_font;
-	pb_font.setColor(Color::appendix);
+	FontInfo pb_font = sane_font;
+	pb_font.setColor(Color_appendix);
 	pb_font.decSize();
 
 	int w = 0;
@@ -475,10 +465,10 @@ int RowPainter::paintAppendixStart(int y)
 	int const text_start = int(xo_ + (width_ - w) / 2);
 	int const text_end = text_start + w;
 
-	pi_.pain.rectText(text_start, y + d, label, pb_font, Color::none, Color::none);
+	pi_.pain.rectText(text_start, y + d, label, pb_font, Color_none, Color_none);
 
-	pi_.pain.line(int(xo_ + 1), y, text_start, y, Color::appendix);
-	pi_.pain.line(text_end, y, int(xo_ + width_ - 2), y, Color::appendix);
+	pi_.pain.line(int(xo_ + 1), y, text_start, y, Color_appendix);
+	pi_.pain.line(text_end, y, int(xo_ + width_ - 2), y, Color_appendix);
 
 	return 3 * defaultRowHeight();
 }
@@ -495,17 +485,16 @@ void RowPainter::paintFirst()
 		y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
 
 	Buffer const & buffer = pi_.base.bv->buffer();
+	Layout const & layout = par_.layout();
 
-	LayoutPtr const & layout = par_.layout();
-
-	if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
+	if (buffer.params().paragraph_separation == BufferParams::ParagraphSkipSeparation) {
 		if (pit_ != 0) {
-			if (layout->latextype == LATEX_PARAGRAPH
+			if (layout.latextype == LATEX_PARAGRAPH
 				&& !par_.getDepth()) {
 				y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
 			} else {
-				LayoutPtr const & playout = pars_[pit_ - 1].layout();
-				if (playout->latextype == LATEX_PARAGRAPH
+				Layout const & playout = pars_[pit_ - 1].layout();
+				if (playout.latextype == LATEX_PARAGRAPH
 					&& !pars_[pit_ - 1].getDepth()) {
 					// is it right to use defskip here, too? (AS)
 					y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
@@ -516,25 +505,25 @@ void RowPainter::paintFirst()
 
 	bool const is_rtl = text_.isRTL(buffer, par_);
 	bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
-	//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
+	//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
 
 	// should we print a label?
-	if (layout->labeltype >= LABEL_STATIC
-	    && (layout->labeltype != LABEL_STATIC
-		      || layout->latextype != LATEX_ENVIRONMENT
+	if (layout.labeltype >= LABEL_STATIC
+	    && (layout.labeltype != LABEL_STATIC
+		      || layout.latextype != LATEX_ENVIRONMENT
 		      || is_seq)) {
 
-		Font const font = getLabelFont();
+		FontInfo const font = labelFont();
 		FontMetrics const & fm = theFontMetrics(font);
 
-		docstring const str = par_.getLabelstring();
+		docstring const str = par_.labelString();
 		if (!str.empty()) {
 			double x = x_;
 
 			// this is special code for the chapter layout. This is
 			// printed in an extra row and has a pagebreak at
 			// the top.
-			if (layout->counter == "chapter") {
+			if (layout.counter == "chapter") {
 				double spacing_val = 1.0;
 				if (!parparams.spacing().isDefault()) {
 					spacing_val = parparams.spacing().getValue();
@@ -542,10 +531,10 @@ void RowPainter::paintFirst()
 					spacing_val = buffer.params().spacing().getValue();
 				}
 
-				int const labeladdon = int(fm.maxHeight() * layout->spacing.getValue() * spacing_val);
+				int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val);
 
-				int const maxdesc = int(fm.maxDescent() * layout->spacing.getValue() * spacing_val)
-					+ int(layout->parsep) * defaultRowHeight();
+				int const maxdesc = int(fm.maxDescent() * layout.spacing.getValue() * spacing_val)
+					+ int(layout.parsep) * defaultRowHeight();
 
 				if (is_rtl) {
 					x = width_ - leftMargin() -
@@ -556,9 +545,9 @@ void RowPainter::paintFirst()
 			} else {
 				if (is_rtl) {
 					x = width_ - leftMargin()
-						+ fm.width(layout->labelsep);
+						+ fm.width(layout.labelsep);
 				} else {
-					x = x_ - fm.width(layout->labelsep)
+					x = x_ - fm.width(layout.labelsep)
 						- fm.width(str);
 				}
 
@@ -569,12 +558,12 @@ void RowPainter::paintFirst()
 	// the labels at the top of an environment.
 	// More or less for bibliography
 	} else if (is_seq &&
-		(layout->labeltype == LABEL_TOP_ENVIRONMENT ||
-		layout->labeltype == LABEL_BIBLIO ||
-		layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
-		Font font = getLabelFont();
-		if (!par_.getLabelstring().empty()) {
-			docstring const str = par_.getLabelstring();
+		(layout.labeltype == LABEL_TOP_ENVIRONMENT ||
+		layout.labeltype == LABEL_BIBLIO ||
+		layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
+		FontInfo const font = labelFont();
+		docstring const str = par_.labelString();
+		if (!str.empty()) {
 			double spacing_val = 1.0;
 			if (!parparams.spacing().isDefault())
 				spacing_val = parparams.spacing().getValue();
@@ -584,14 +573,14 @@ void RowPainter::paintFirst()
 			FontMetrics const & fm = theFontMetrics(font);
 
 			int const labeladdon = int(fm.maxHeight()
-				* layout->spacing.getValue() * spacing_val);
+				* layout.spacing.getValue() * spacing_val);
 
 			int maxdesc =
-				int(fm.maxDescent() * layout->spacing.getValue() * spacing_val
-				+ (layout->labelbottomsep * defaultRowHeight()));
+				int(fm.maxDescent() * layout.spacing.getValue() * spacing_val
+				+ (layout.labelbottomsep * defaultRowHeight()));
 
 			double x = x_;
-			if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
+			if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
 				if (is_rtl)
 					x = leftMargin();
 				x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
@@ -615,7 +604,7 @@ void RowPainter::paintLast()
 	if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
 		FontMetrics const & fm = theFontMetrics(pi_.base.bv->buffer().params().getFont());
 		int const length = fm.maxAscent() / 2;
-		Color::color col = par_.isInserted(par_.size()) ? Color::addedtext : Color::deletedtext;
+		ColorCode col = par_.isInserted(par_.size()) ? Color_addedtext : Color_deletedtext;
 
 		pi_.pain.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
 			   Painter::line_solid, Painter::line_thick);
@@ -628,26 +617,30 @@ void RowPainter::paintLast()
 	switch (endlabel) {
 	case END_LABEL_BOX:
 	case END_LABEL_FILLED_BOX: {
-		Font const font = getLabelFont();
+		FontInfo const font = labelFont();
 		FontMetrics const & fm = theFontMetrics(font);
 		int const size = int(0.75 * fm.maxAscent());
 		int const y = yo_ - size;
-		int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
+		int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
+		int x = is_rtl ? nestMargin() + changebarMargin()
+			: max_row_width - text_metrics_.rightMargin(pm_);
 
-		if (width_ - int(row_.width()) <= size)
-			x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
+		// If needed, move the box a bit to avoid overlapping with text.
+		int const rem = max_row_width - row_.width();
+		if (rem <= 0)
+			x += is_rtl ? rem : - rem;
 
 		if (endlabel == END_LABEL_BOX)
-			pi_.pain.rectangle(x, y, size, size, Color::eolmarker);
+			pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
 		else
-			pi_.pain.fillRectangle(x, y, size, size, Color::eolmarker);
+			pi_.pain.fillRectangle(x, y, size, size, Color_eolmarker);
 		break;
 	}
 
 	case END_LABEL_STATIC: {
-		Font font = getLabelFont();
+		FontInfo const font = labelFont();
 		FontMetrics const & fm = theFontMetrics(font);
-		docstring const & str = par_.layout()->endlabelstring();
+		docstring const & str = par_.layout().endlabelstring();
 		double const x = is_rtl ?
 			x_ - fm.width(str)
 			: - text_metrics_.rightMargin(pm_) - row_.width();
@@ -665,15 +658,12 @@ void RowPainter::paintOnlyInsets()
 {
 	pos_type const end = row_.endpos();
 	for (pos_type pos = row_.pos(); pos != end; ++pos) {
-		if (!par_.isInset(pos))
-			continue;
-
 		// If outer row has changed, nested insets are repaint completely.
 		Inset const * inset = par_.getInset(pos);
-
+		if (!inset)
+			continue;
 		if (x_ > pi_.base.bv->workWidth())
 			continue;
-
 		x_ = pi_.base.bv->coordCache().getInsets().x(inset);
 		paintInset(inset, pos);
 	}
@@ -695,12 +685,24 @@ void RowPainter::paintText()
 		body_pos = 0;
 	}
 
-	LayoutPtr const & layout = par_.layout();
+	Layout const & layout = par_.layout();
 
 	bool running_strikeout = false;
 	bool is_struckout = false;
 	int last_strikeout_x = 0;
 
+	// check for possible inline completion
+	DocIterator const & inlineCompletionPos = pi_.base.bv->inlineCompletionPos();
+	pos_type inlineCompletionVPos = -1;
+	if (inlineCompletionPos.inTexted()
+	    && inlineCompletionPos.text() == &text_
+	    && inlineCompletionPos.pit() == pit_
+	    && inlineCompletionPos.pos() - 1 >= row_.pos()
+	    && inlineCompletionPos.pos() - 1 < row_.endpos()) {
+		// draw logically behind the previous character
+		inlineCompletionVPos = bidi_.log2vis(inlineCompletionPos.pos() - 1);
+	}
+
 	// Use font span to speed things up, see below
 	FontSpan font_span;
 	Font font;
@@ -709,7 +711,7 @@ void RowPainter::paintText()
 	// it's in the last row of a paragraph; see skipped_sep_vpos declaration
 	if (end > 0 && end < par_.size() && par_.isSeparator(end - 1))
 		skipped_sep_vpos = bidi_.log2vis(end - 1);
-	
+
 	for (pos_type vpos = row_.pos(); vpos < end; ) {
 		if (x_ > pi_.base.bv->workWidth())
 			break;
@@ -730,7 +732,12 @@ void RowPainter::paintText()
 		// Use font span to speed things up, see above
 		if (vpos < font_span.first || vpos > font_span.last) {
 			font_span = par_.fontSpan(vpos);
-			font = text_metrics_.getDisplayFont(pit_, vpos);
+			font = text_metrics_.displayFont(pit_, vpos);
+
+			// split font span if inline completion is inside
+			if (font_span.first <= inlineCompletionVPos
+			    && font_span.last > inlineCompletionVPos)
+				font_span.last = inlineCompletionVPos;
 		}
 
 		const int width_pos = pm_.singleWidth(pos, font);
@@ -748,8 +755,9 @@ void RowPainter::paintText()
 			last_strikeout_x = int(x_);
 		}
 
-		bool const highly_editable_inset = par_.isInset(pos)
-			&& isHighlyEditableInset(par_.getInset(pos));
+		Inset const * inset = par_.getInset(pos);
+		bool const highly_editable_inset = inset
+			&& inset->editable() == Inset::HIGHLY_EDITABLE;
 
 		// If we reach the end of a struck out range, paint it.
 		// We also don't paint across things like tables
@@ -759,33 +767,32 @@ void RowPainter::paintText()
 				= theFontMetrics(pi_.base.bv->buffer().params().getFont());
 			int const middle = yo_ - fm.maxAscent() / 3;
 			pi_.pain.line(last_strikeout_x, middle, int(x_), middle,
-				Color::deletedtext, Painter::line_solid, Painter::line_thin);
+				Color_deletedtext, Painter::line_solid, Painter::line_thin);
 			running_strikeout = false;
 		}
 
 		if (body_pos > 0 && pos == body_pos - 1) {
-			int const lwidth = theFontMetrics(getLabelFont())
-				.width(layout->labelsep);
+			int const lwidth = theFontMetrics(labelFont())
+				.width(layout.labelsep);
 
 			x_ += row_.label_hfill + lwidth - width_pos;
 		}
+		
+		// Is the inline completion in front of character?
+		if (font.isRightToLeft() && vpos == inlineCompletionVPos)
+			paintInlineCompletion(font);
 
-		if (par_.isHfill(pos)) {
-			paintHfill(pos, body_pos);
-			++vpos;
-
-		} else if (par_.isSeparator(pos)) {
-			Font orig_font = text_metrics_.getDisplayFont(pit_, pos);
+		if (par_.isSeparator(pos)) {
+			Font const orig_font = text_metrics_.displayFont(pit_, pos);
 			double const orig_x = x_;
 			x_ += width_pos;
 			if (pos >= body_pos)
 				x_ += row_.separator;
-			paintForeignMark(orig_x, orig_font);
+			paintForeignMark(orig_x, orig_font.language());
 			++vpos;
 
-		} else if (par_.isInset(pos)) {
+		} else if (inset) {
 			// If outer row has changed, nested insets are repaint completely.
-			Inset const * inset = par_.getInset(pos);
 			pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
 			paintInset(inset, pos);
 			++vpos;
@@ -794,6 +801,10 @@ void RowPainter::paintText()
 			// paint as many characters as possible.
 			paintFromPos(vpos);
 		}
+
+		// Is the inline completion after character?
+		if (!font.isRightToLeft() && vpos - 1 == inlineCompletionVPos)
+			paintInlineCompletion(font);
 	}
 
 	// if we reach the end of a struck out range, paint it
@@ -803,9 +814,46 @@ void RowPainter::paintText()
 			= theFontMetrics(pi_.base.bv->buffer().params().getFont());
 		int const middle = yo_ - fm.maxAscent() / 3;
 		pi_.pain.line(last_strikeout_x, middle, int(x_), middle,
-			Color::deletedtext, Painter::line_solid, Painter::line_thin);
+			Color_deletedtext, Painter::line_solid, Painter::line_thin);
 		running_strikeout = false;
 	}
 }
 
+
+void RowPainter::paintInlineCompletion(Font const & font)
+{
+	docstring completion = pi_.base.bv->inlineCompletion();
+	FontInfo f = font.fontInfo();
+	bool rtl = font.isRightToLeft();
+	
+	// draw the unique and the non-unique completion part
+	// Note: this is not time-critical as it is
+	// only done once per screen.
+	size_t uniqueTo = pi_.base.bv->inlineCompletionUniqueChars();
+	docstring s1 = completion.substr(0, uniqueTo);
+	docstring s2 = completion.substr(uniqueTo);
+	ColorCode c1 = Color_inlinecompletion;
+	ColorCode c2 = Color_nonunique_inlinecompletion;
+	
+	// right to left?
+	if (rtl) {
+		swap(s1, s2);
+		reverse(s1.begin(), s1.end());
+		reverse(s2.begin(), s2.end());
+		swap(c1, c2);
+	}
+
+	if (s1.size() > 0) {
+		f.setColor(c1);
+		pi_.pain.text(int(x_), yo_, s1, f);
+		x_ += theFontMetrics(font).width(s1);
+	}
+	
+	if (s2.size() > 0) {
+		f.setColor(c2);
+		pi_.pain.text(int(x_), yo_, s2, f);
+		x_ += theFontMetrics(font).width(s2);
+	}
+}
+
 } // namespace lyx