X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.cpp;h=ef81e683aed532eb86d148b4bfcad49feb79c652;hb=27d580b5c057d565b9b4b50c811f6e1fab7f1246;hp=214fd6872640340a878953762c6b0ccf2c5b1b25;hpb=b1e077a7d25fa156f7070a9b84e7dd9303fc7411;p=lyx.git

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 214fd68726..ef81e683ae 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -22,7 +22,6 @@
 #include "BufferView.h"
 #include "Changes.h"
 #include "Encoding.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "LyXRC.h"
@@ -30,7 +29,6 @@
 #include "MetricsInfo.h"
 #include "Paragraph.h"
 #include "ParagraphMetrics.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "TextMetrics.h"
 #include "VSpace.h"
@@ -41,13 +39,12 @@
 #include "insets/InsetText.h"
 
 #include "support/debug.h"
+#include "support/gettext.h"
 #include "support/textutils.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 #include <boost/crc.hpp>
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
@@ -62,7 +59,7 @@ RowPainter::RowPainter(PainterInfo & pi,
 	  pars_(text.paragraphs()),
 	  row_(row), pit_(pit), par_(text.paragraphs()[pit]),
 	  pm_(text_metrics_.parMetrics(pit)),
-	  bidi_(bidi), erased_(pi_.erased_),
+	  bidi_(bidi), change_(pi_.change_),
 	  xo_(x), yo_(y), width_(text_metrics_.width())
 {
 	bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
@@ -71,14 +68,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()), /**/);
 }
 
 
 FontInfo RowPainter::labelFont() const
 {
-	return text_.labelFont(pi_.base.bv->buffer(), par_);
+	return text_.labelFont(par_);
 }
 
 
@@ -97,7 +94,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 {
 	Font const font = text_metrics_.displayFont(pit_, pos);
 
-	BOOST_ASSERT(inset);
+	LASSERT(inset, return);
 	// Backup full_repaint status because some insets (InsetTabular)
 	// requires a full repaint
 	bool pi_full_repaint = pi_.full_repaint;
@@ -108,11 +105,14 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 		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_);
+	pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos);
+
+	int const x1 = int(x_);
+	pi_.base.bv->coordCache().insets().add(inset, x1, yo_);
 	// insets are painted completely. Recursive
-	inset->drawSelection(pi_, int(x_), yo_);
-	inset->draw(pi_, int(x_), yo_);
+	inset->drawBackground(pi_, x1, yo_);
+	inset->drawSelection(pi_, x1, yo_);
+	inset->draw(pi_, x1, yo_);
 
 	Dimension const & dim = pm_.insetDimension(inset);
 
@@ -124,28 +124,6 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 	pi_.full_repaint = pi_full_repaint;
 
 #ifdef DEBUG_METRICS
-	int const x1 = int(x_ - dim.width());
-	Dimension dim2;
-	BOOST_ASSERT(max_witdh_ > 0);
-	int right_margin = text_metrics_.rightMargin(pm_);
-	int const w = max_witdh_ - leftMargin() - right_margin;
-	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 << "." << endl;
-	if (dim->asc != dim2.asc)
-		lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
-		       << " draw ascent " << dim.ascent()
-		       << "> 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 << "." << endl;
-	BOOST_ASSERT(dim2.wid == dim.wid);
-	BOOST_ASSERT(dim2.asc == dim.asc);
-	BOOST_ASSERT(dim2.des == dim.des);
 	int const x2 = x1 + dim.wid;
 	int const y1 = yo_ + dim.des;
 	int const y2 = yo_ - dim.asc;
@@ -173,7 +151,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, FontInfo 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_.displayFont(pit_, i));
@@ -207,7 +185,7 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, FontInfo 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_.displayFont(pit_, i));
@@ -226,10 +204,6 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 {
 	// 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
 	vector<char_type> str;
 	str.reserve(100);
@@ -244,17 +218,38 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo 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 const & change_running = par_.lookupChange(pos);
+
+	// selected text?
+	bool const selection = pos >= row_.sel_beg && pos < row_.sel_end;
+
+	char_type prev_char = ' ';
 	// 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;
+
+		Change const & change = par_.lookupChange(pos);
+		if (!change_running.isSimilarTo(change))
+			// Track change type or author has changed.
 			break;
 
 		char_type c = par_.getChar(pos);
 
+		if (c == '\t' || prev_char == '\t') {
+			prev_char = c;
+			break;
+		}
+
 		if (!isPrintableNonspace(c))
 			break;
 
@@ -277,10 +272,10 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo 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;
 		*/
 
@@ -299,17 +294,21 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 
 	docstring s(&str[0], str.size());
 
-	if (prev_change != Change::UNCHANGED) {
-		FontInfo 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 (s[0] == '\t')
+		s.replace(0,1,from_ascii("    "));
+
+	if (!selection && !change_running.changed()) {
 		x_ += pi_.pain.text(int(x_), yo_, s, font);
+		return;
 	}
+	
+	FontInfo copy = font;
+	if (change_running.changed())
+		copy.setPaintColor(change_running.color());
+	else if (selection)
+		copy.setPaintColor(Color_selectiontext);
+
+	x_ += pi_.pain.text(int(x_), yo_, s, copy);
 }
 
 
@@ -328,6 +327,13 @@ void RowPainter::paintForeignMark(double orig_x, Language const * lang,
 }
 
 
+void RowPainter::paintMisspelledMark(double orig_x, int desc)
+{
+	int const y = yo_ + desc;
+	pi_.pain.wavyHorizontalLine(int(orig_x), y, int(x_) - int(orig_x), Color_red);
+}
+
+
 void RowPainter::paintFromPos(pos_type & vpos)
 {
 	pos_type const pos = bidi_.vis2log(vpos);
@@ -345,8 +351,8 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
 	// draw as many chars as we can
 	if ((!hebrew && !arabic)
-		|| (hebrew && !Encodings::isComposeChar_hebrew(c))
-		|| (arabic && !Encodings::isComposeChar_arabic(c))) {
+		|| (hebrew && !Encodings::isHebrewComposeChar(c))
+		|| (arabic && !Encodings::isArabicComposeChar(c))) {
 		paintChars(vpos, orig_font.fontInfo(), hebrew, arabic);
 	} else if (hebrew) {
 		paintHebrewComposeChar(vpos, orig_font.fontInfo());
@@ -355,6 +361,9 @@ void RowPainter::paintFromPos(pos_type & vpos)
 	}
 
 	paintForeignMark(orig_x, orig_font.language());
+
+	if (lyxrc.spellcheck_continuously && orig_font.isMisspelled())
+		paintMisspelledMark(orig_x, 3);
 }
 
 
@@ -383,7 +392,7 @@ void RowPainter::paintChangeBar()
 void RowPainter::paintAppendix()
 {
 	// only draw the appendix frame once (for the main text)
-	if (!par_.params().appendix() || !text_.isMainText(pi_.base.bv->buffer()))
+	if (!par_.params().appendix() || !text_.isMainText())
 		return;
 
 	int y = yo_ - row_.ascent();
@@ -423,7 +432,7 @@ void RowPainter::paintDepthBar()
 		int const w = nestMargin() / 5;
 		int x = int(xo_) + w * i;
 		// only consider the changebar space if we're drawing outermost text
-		if (text_.isMainText(pi_.base.bv->buffer()))
+		if (text_.isMainText())
 			x += changebarMargin();
 
 		int const starty = yo_ - row_.ascent();
@@ -493,8 +502,8 @@ void RowPainter::paintFirst()
 		}
 	}
 
-	bool const is_rtl = text_.isRTL(buffer, par_);
-	bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
+	bool const is_rtl = text_.isRTL(par_);
+	bool const is_seq = text_.isFirstInSequence(pit_);
 	//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
 
 	// should we print a label?
@@ -584,22 +593,62 @@ void RowPainter::paintFirst()
 }
 
 
+/** Check if the current paragraph is the last paragraph in a
+    proof environment */
+static int getEndLabel(pit_type p, Text const & text)
+{
+	ParagraphList const & pars = text.paragraphs();
+	pit_type pit = p;
+	depth_type par_depth = pars[p].getDepth();
+	while (pit != pit_type(pars.size())) {
+		Layout const & layout = pars[pit].layout();
+		int const endlabeltype = layout.endlabeltype;
+
+		if (endlabeltype != END_LABEL_NO_LABEL) {
+			if (p + 1 == pit_type(pars.size()))
+				return endlabeltype;
+
+			depth_type const next_depth =
+				pars[p + 1].getDepth();
+			if (par_depth > next_depth ||
+			    (par_depth == next_depth && layout != pars[p + 1].layout()))
+				return endlabeltype;
+			break;
+		}
+		if (par_depth == 0)
+			break;
+		pit = text.outerHook(pit);
+		if (pit != pit_type(pars.size()))
+			par_depth = pars[pit].getDepth();
+	}
+	return END_LABEL_NO_LABEL;
+}
+
+
 void RowPainter::paintLast()
 {
-	bool const is_rtl = text_.isRTL(pi_.base.bv->buffer(), par_);
-	int const endlabel = getEndLabel(pit_, text_.paragraphs());
+	bool const is_rtl = text_.isRTL(par_);
+	int const endlabel = getEndLabel(pit_, text_);
 
 	// paint imaginary end-of-paragraph character
 
-	if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
-		FontMetrics const & fm = theFontMetrics(pi_.base.bv->buffer().params().getFont());
+	Change const & change = par_.lookupChange(par_.size());
+	if (change.changed()) {
+		FontMetrics const & fm =
+			theFontMetrics(pi_.base.bv->buffer().params().getFont());
 		int const length = fm.maxAscent() / 2;
-		ColorCode col = par_.isInserted(par_.size()) ? Color_addedtext : Color_deletedtext;
+		Color col = change.color();
 
 		pi_.pain.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
 			   Painter::line_solid, Painter::line_thick);
-		pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
-			   Painter::line_solid, Painter::line_thick);
+
+		if (change.deleted()) {
+			pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1 + length,
+				yo_ + 2, col, Painter::line_solid, Painter::line_thick);
+		} else {
+			pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1,
+				yo_ + 2, col, Painter::line_solid, Painter::line_thick);
+		}
 	}
 
 	// draw an endlabel
@@ -631,14 +680,20 @@ void RowPainter::paintLast()
 		FontInfo const font = labelFont();
 		FontMetrics const & fm = theFontMetrics(font);
 		docstring const & str = par_.layout().endlabelstring();
-		double const x = is_rtl ?
-			x_ - fm.width(str)
-			: - text_metrics_.rightMargin(pm_) - row_.width();
+		double const x = is_rtl ? x_ - fm.width(str) : x_;
 		pi_.pain.text(int(x), yo_, str, font);
 		break;
 	}
 
 	case END_LABEL_NO_LABEL:
+		if (lyxrc.paragraph_markers && size_type(pit_ + 1) < pars_.size()) {
+			docstring const s = docstring(1, char_type(0x00B6));
+			FontInfo f = FontInfo();
+			FontMetrics const & fm = theFontMetrics(f);
+			f.setColor(Color_paragraphmarker);
+			pi_.pain.text(int(x_), yo_, s, f);
+			x_ += fm.width(s);
+		}
 		break;
 	}
 }
@@ -646,16 +701,25 @@ void RowPainter::paintLast()
 
 void RowPainter::paintOnlyInsets()
 {
+	CoordCache const & cache = pi_.base.bv->coordCache();
 	pos_type const end = row_.endpos();
 	for (pos_type pos = row_.pos(); pos != end; ++pos) {
 		// 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())
+		if (x_ > pi_.base.bv->workWidth() 
+		    || !cache.getInsets().has(inset))
 			continue;
-		x_ = pi_.base.bv->coordCache().getInsets().x(inset);
+		x_ = cache.getInsets().x(inset);
+
+		bool const pi_selected = pi_.selected;
+		Cursor const & cur = pi_.base.bv->cursor();
+		if (cur.selection() && cur.text() == &text_ 
+			  && cur.anchor().text() == &text_)
+			pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos; 
 		paintInset(inset, pos);
+		pi_.selected = pi_selected;
 	}
 }
 
@@ -677,9 +741,8 @@ void RowPainter::paintText()
 
 	Layout const & layout = par_.layout();
 
-	bool running_strikeout = false;
-	bool is_struckout = false;
-	int last_strikeout_x = 0;
+	Change change_running;
+	int change_last_x = 0;
 
 	// check for possible inline completion
 	DocIterator const & inlineCompletionPos = pi_.base.bv->inlineCompletionPos();
@@ -737,28 +800,35 @@ void RowPainter::paintText()
 			++vpos;
 			continue;
 		}
-
-		is_struckout = par_.isDeleted(pos);
-
-		if (is_struckout && !running_strikeout) {
-			running_strikeout = true;
-			last_strikeout_x = int(x_);
+		Change const & change = par_.lookupChange(pos);
+		if (change.changed() && !change_running.changed()) {
+			change_running = change;
+			change_last_x = int(x_);
 		}
 
 		Inset const * inset = par_.getInset(pos);
 		bool const highly_editable_inset = inset
-			&& inset->editable() == Inset::HIGHLY_EDITABLE;
+			&& inset->editable();
 
-		// If we reach the end of a struck out range, paint it.
+		// If we reach the end of a change or if the author changes, paint it.
 		// We also don't paint across things like tables
-		if (running_strikeout && (highly_editable_inset || !is_struckout)) {
+		if (change_running.changed() && (highly_editable_inset
+			|| !change.changed() || !change_running.isSimilarTo(change))) {
 			// Calculate 1/3 height of the buffer's default font
 			FontMetrics const & fm
 				= 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);
-			running_strikeout = false;
+			int const y_bar = change_running.deleted() ?
+				yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
+			pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+				change_running.color(), Painter::line_solid,
+				Painter::line_thin);
+
+			// Change might continue with a different author or type
+			if (change.changed() && !highly_editable_inset) {
+				change_running = change;
+				change_last_x = int(x_);
+			} else
+				change_running.setUnchanged();
 		}
 
 		if (body_pos > 0 && pos == body_pos - 1) {
@@ -784,7 +854,14 @@ void RowPainter::paintText()
 		} else if (inset) {
 			// If outer row has changed, nested insets are repaint completely.
 			pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
+			
+			bool const pi_selected = pi_.selected;
+			Cursor const & cur = pi_.base.bv->cursor();
+			if (cur.selection() && cur.text() == &text_ 
+				  && cur.anchor().text() == &text_)
+				pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos; 
 			paintInset(inset, pos);
+			pi_.selected = pi_selected;
 			++vpos;
 
 		} else {
@@ -798,14 +875,14 @@ void RowPainter::paintText()
 	}
 
 	// if we reach the end of a struck out range, paint it
-	if (running_strikeout) {
-		// calculate 1/3 height of the buffer's default font
+	if (change_running.changed()) {
 		FontMetrics const & fm
 			= 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);
-		running_strikeout = false;
+		int const y_bar = change_running.deleted() ?
+				yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
+		pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+			change_running.color(), Painter::line_solid, Painter::line_thin);
+		change_running.setUnchanged();
 	}
 }
 
@@ -828,8 +905,6 @@ void RowPainter::paintInlineCompletion(Font const & font)
 	// right to left?
 	if (rtl) {
 		swap(s1, s2);
-		reverse(s1.begin(), s1.end());
-		reverse(s2.begin(), s2.end());
 		swap(c1, c2);
 	}