Workaround for #6865: smarter FontList::setMisspelled implementation

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 930c44cd694638850efa04cbf0c1e44bf7209367..f767924dbe12897299dec821e4a460926d503f60 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -29,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"
@@ -331,7 +330,7 @@ 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);
+       pi_.pain.line(int(orig_x), y, int(x_), y, Color_red, Painter::line_onoffdash, Painter::line_thin);
 }
 
 
@@ -363,8 +362,8 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
        paintForeignMark(orig_x, orig_font.language());
 
-       if (orig_font.isMisspelled())
-               paintMisspelledMark(orig_x, 3);
+       if (lyxrc.spellcheck_continuously && orig_font.isMisspelled())
+               paintMisspelledMark(orig_x, 2);
 }
 
 
@@ -504,7 +503,7 @@ void RowPainter::paintFirst()
        }
 
        bool const is_rtl = text_.isRTL(par_);
-       bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
+       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(par_);
-       int const endlabel = getEndLabel(pit_, text_.paragraphs());
+       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;
        }
 }
@@ -680,7 +716,7 @@ void RowPainter::paintOnlyInsets()
                bool const pi_selected = pi_.selected;
                Cursor const & cur = pi_.base.bv->cursor();
                if (cur.selection() && cur.text() == &text_ 
-                         && cur.anchor().text() == &text_)
+                         && cur.normalAnchor().text() == &text_)
                        pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos; 
                paintInset(inset, pos);
                pi_.selected = pi_selected;
@@ -822,7 +858,7 @@ void RowPainter::paintText()
                        bool const pi_selected = pi_.selected;
                        Cursor const & cur = pi_.base.bv->cursor();
                        if (cur.selection() && cur.text() == &text_ 
-                                 && cur.anchor().text() == &text_)
+                                 && cur.normalAnchor().text() == &text_)
                                pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos; 
                        paintInset(inset, pos);
                        pi_.selected = pi_selected;