Thanks, Andre.

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 5c8f694b505117316ad526b4838715663641ab5f..ef81e683aed532eb86d148b4bfcad49feb79c652 100644 (file)
--- 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,6 +39,7 @@
 #include "insets/InsetText.h"
 
 #include "support/debug.h"
+#include "support/gettext.h"
 #include "support/textutils.h"
 
 #include "support/lassert.h"
@@ -76,7 +75,7 @@ RowPainter::RowPainter(PainterInfo & pi,
 
 FontInfo RowPainter::labelFont() const
 {
-       return text_.labelFont(pi_.base.bv->buffer(), par_);
+       return text_.labelFont(par_);
 }
 
 
@@ -363,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);
 }
 
@@ -393,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();
@@ -433,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();
@@ -503,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?
@@ -594,10 +593,42 @@ 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
 
@@ -618,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
@@ -650,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;
        }
 }