Thanks, Andre.

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index f92e55bcc2a080ec6668bc01fa1ce39474c468b7..ef81e683aed532eb86d148b4bfcad49feb79c652 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -362,7 +362,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
        paintForeignMark(orig_x, orig_font.language());
 
-       if (orig_font.isMisspelled())
+       if (lyxrc.spellcheck_continuously && orig_font.isMisspelled())
                paintMisspelledMark(orig_x, 3);
 }
 
@@ -649,7 +649,6 @@ void RowPainter::paintLast()
                        pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1,
                                yo_ + 2, col, Painter::line_solid, Painter::line_thick);
                }
-
        }
 
        // draw an endlabel
@@ -681,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;
        }
 }