X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.cpp;h=7c7fd3ef416328d25ebb9dbedaada3b01075b2e2;hb=7c6ae4d7401639ac0dd2eb83b0c1b7c61b0b8c13;hp=12fb486a054becf9686801d0c78c5af91dc0608e;hpb=f176a18434d40eead5f5a64234db9445053cbf76;p=lyx.git

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 12fb486a05..7c7fd3ef41 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -128,6 +128,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 	pi_.base.font = inset->inheritFont() ? font.fontInfo() :
 		pi_.base.bv->buffer().params().getFont().fontInfo();
 	pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
+	Change prev_change = change_;
 	pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos);
 
 	int const x1 = int(x_);
@@ -147,6 +148,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 
 	// Restore full_repaint status.
 	pi_.full_repaint = pi_full_repaint;
+	pi_.change_ = prev_change;
 
 #ifdef DEBUG_METRICS
 	int const x2 = x1 + dim.wid;
@@ -235,6 +237,8 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 	str.reserve(100);
 	str.push_back(prev_char);
 
+	// FIXME: Why only round brackets and why the difference to
+	// Hebrew? See also Paragraph::getUChar
 	if (arabic) {
 		char_type c = str[0];
 		if (c == '(')
@@ -267,9 +271,9 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 		// Maybe a more general fix would be draw character by character
 		// for some predefined fonts on some platform. In arabic and
 		// Hebrew we already do paint this way.
-		if (prev_char == 'f')
+		if (prev_char == 'f' || lyxrc.force_paint_single_char)
 			break;
-		
+
 		pos = bidi_.vis2log(vpos);
 		if (pos < font_span.first || pos > font_span.last)
 			break;
@@ -324,6 +328,8 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 			break;
 		*/
 
+		// FIXME: Why only round brackets and why the difference to
+		// Hebrew? See also Paragraph::getUChar
 		if (arabic) {
 			if (c == '(')
 				c = ')';
@@ -358,6 +364,14 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 }
 
 
+void RowPainter::paintSeparator(double orig_x, double width,
+	FontInfo const & font)
+{
+	pi_.pain.textDecoration(font, int(orig_x), yo_, int(width));
+	x_ += width;
+}
+
+
 void RowPainter::paintForeignMark(double orig_x, Language const * lang,
 		int desc)
 {
@@ -378,10 +392,10 @@ void RowPainter::paintMisspelledMark(double orig_x, bool changed)
 {
 	// if changed the misspelled marker gets placed slightly lower than normal
 	// to avoid drawing at the same vertical offset
-	int const y = yo_ + solid_line_offset_ + solid_line_thickness_
+	float const y = yo_ + solid_line_offset_ + solid_line_thickness_
 		+ (changed ? solid_line_thickness_ + 1 : 0)
 		+ dotted_line_offset_;
-	pi_.pain.line(int(orig_x), y, int(x_), y, Color_error,
+	pi_.pain.line(int(orig_x), int(y), int(x_), int(y), Color_error,
 		Painter::line_onoffdash, dotted_line_thickness_);
 }
 
@@ -547,15 +561,13 @@ int RowPainter::paintAppendixStart(int y)
 
 void RowPainter::paintFirst()
 {
-	ParagraphParameters const & pparams = par_.params();
-	Buffer const & buffer = pi_.base.bv->buffer();
-	BufferParams const & bparams = buffer.params();
+	BufferParams const & bparams = pi_.base.bv->buffer().params();
 	Layout const & layout = par_.layout();
 
 	int y_top = 0;
 
 	// start of appendix?
-	if (pparams.startOfAppendix())
+	if (par_.params().startOfAppendix())
 		y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
 
 	if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
@@ -573,97 +585,114 @@ void RowPainter::paintFirst()
 		}
 	}
 
-	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?
 	if (layout.labeltype >= LABEL_STATIC
-	    && (layout.labeltype != LABEL_STATIC
-		      || layout.latextype != LATEX_ENVIRONMENT
-		      || is_seq)) {
+		&& (layout.labeltype != LABEL_STATIC
+			|| layout.latextype != LATEX_ENVIRONMENT
+			|| is_seq)) {
+		paintLabel();
+	} else if (is_seq
+		&& (layout.labeltype == LABEL_TOP_ENVIRONMENT
+			|| layout.labeltype == LABEL_BIBLIO
+			|| layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
+		// the labels at the top of an environment.
+		// More or less for bibliography
+		paintTopLevelLabel();
+	}
+}
 
-		FontInfo const font = labelFont();
-		FontMetrics const & fm = theFontMetrics(font);
 
-		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") {
-				double spacing_val = 1.0;
-				if (!pparams.spacing().isDefault()) {
-					spacing_val = pparams.spacing().getValue();
-				} else {
-					spacing_val = bparams.spacing().getValue();
-				}
-
-				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();
-
-				if (is_rtl) {
-					x = width_ - leftMargin() -
-						fm.width(str);
-				}
-
-				pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
-			} else {
-				if (is_rtl) {
-					x = width_ - leftMargin()
-						+ fm.width(layout.labelsep);
-				} else {
-					x = x_ - fm.width(layout.labelsep)
-						- fm.width(str);
-				}
-
-				pi_.pain.text(int(x), yo_, str, font);
-			}
+void RowPainter::paintLabel()
+{
+	docstring const str = par_.labelString();
+	if (str.empty())
+		return;
+
+	BufferParams const & bparams = pi_.base.bv->buffer().params();
+	bool const is_rtl = text_.isRTL(par_);
+	Layout const & layout = par_.layout();
+	ParagraphParameters const & pparams = par_.params();
+	FontInfo const font = labelFont();
+	FontMetrics const & fm = theFontMetrics(font);
+
+	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") {
+		double spacing_val = 1.0;
+		if (!pparams.spacing().isDefault()) {
+			spacing_val = pparams.spacing().getValue();
+		} else {
+			spacing_val = bparams.spacing().getValue();
 		}
 
-	// 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)) {
-		FontInfo const font = labelFont();
-		docstring const str = par_.labelString();
-		if (!str.empty()) {
-			double spacing_val = 1.0;
-			if (!pparams.spacing().isDefault())
-				spacing_val = pparams.spacing().getValue();
-			else
-				spacing_val = bparams.spacing().getValue();
-
-			FontMetrics const & fm = theFontMetrics(font);
-
-			int const labeladdon = int(fm.maxHeight()
-				* layout.spacing.getValue() * spacing_val);
-
-			int maxdesc =
-				int(fm.maxDescent() * layout.spacing.getValue() * spacing_val
-				+ (layout.labelbottomsep * defaultRowHeight()));
-
-			double x = x_;
-			if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
-				if (is_rtl)
-					x = leftMargin();
-				x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
-				x -= fm.width(str) / 2;
-			} else if (is_rtl) {
-				x = width_ - leftMargin() -	fm.width(str);
-			}
-			pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+		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();
+
+		if (is_rtl) {
+			x = width_ - leftMargin() -
+				fm.width(str);
+		}
+
+		pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+	} else {
+		if (is_rtl) {
+			x = width_ - leftMargin()
+				+ fm.width(layout.labelsep);
+		} else {
+			x = x_ - fm.width(layout.labelsep)
+				- fm.width(str);
 		}
+
+		pi_.pain.text(int(x), yo_, str, font);
 	}
 }
 
 
+void RowPainter::paintTopLevelLabel()
+{
+	BufferParams const & bparams = pi_.base.bv->buffer().params();
+	bool const is_rtl = text_.isRTL(par_);
+	ParagraphParameters const & pparams = par_.params();
+	Layout const & layout = par_.layout();
+	FontInfo const font = labelFont();
+	docstring const str = par_.labelString();
+	if (str.empty())
+		return;
+
+	double spacing_val = 1.0;
+	if (!pparams.spacing().isDefault())
+		spacing_val = pparams.spacing().getValue();
+	else
+		spacing_val = bparams.spacing().getValue();
+
+	FontMetrics const & fm = theFontMetrics(font);
+
+	int const labeladdon = int(fm.maxHeight()
+		* layout.spacing.getValue() * spacing_val);
+
+	int maxdesc =
+		int(fm.maxDescent() * layout.spacing.getValue() * spacing_val
+		+ (layout.labelbottomsep * defaultRowHeight()));
+
+	double x = x_;
+	if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
+		if (is_rtl)
+			x = leftMargin();
+		x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
+		x -= fm.width(str) / 2;
+	} else if (is_rtl) {
+		x = width_ - leftMargin() -	fm.width(str);
+	}
+	pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+}
+
 /** Check if the current paragraph is the last paragraph in a
     proof environment */
 static int getEndLabel(pit_type p, Text const & text)
@@ -893,9 +922,9 @@ void RowPainter::paintText()
 			// Calculate 1/3 height of the buffer's default font
 			FontMetrics const & fm
 				= theFontMetrics(pi_.base.bv->buffer().params().getFont());
-			int const y_bar = change_running.deleted() ?
+			float const y_bar = change_running.deleted() ?
 				yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
-			pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+			pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
 				change_running.color(), Painter::line_solid, solid_line_thickness_);
 
 			// Change might continue with a different author or type
@@ -920,9 +949,10 @@ void RowPainter::paintText()
 		if (par_.isSeparator(pos)) {
 			Font const orig_font = text_metrics_.displayFont(pit_, pos);
 			double const orig_x = x_;
-			x_ += width_pos;
+			double separator_width = width_pos;
 			if (pos >= body_pos)
-				x_ += row_.separator;
+				separator_width += row_.separator;
+			paintSeparator(orig_x, separator_width, orig_font.fontInfo());
 			paintForeignMark(orig_x, orig_font.language());
 			++vpos;
 
@@ -953,9 +983,9 @@ void RowPainter::paintText()
 	if (change_running.changed()) {
 		FontMetrics const & fm
 			= theFontMetrics(pi_.base.bv->buffer().params().getFont());
-		int const y_bar = change_running.deleted() ?
+		float const y_bar = change_running.deleted() ?
 				yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
-		pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+		pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
 			change_running.color(), Painter::line_solid, solid_line_thickness_);
 		change_running.setUnchanged();
 	}