This doesn't return a reference any more.

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 335b2941c6192dfb7b55297b5a8c2ca9cec3e28e..a97b950df27c3249332e85d377d654cf2787c902 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -10,6 +10,7 @@
  */
 
 #include <config.h>
+#include <algorithm>
 
 #include "rowpainter.h"
 
@@ -42,6 +43,7 @@
 #include "support/debug.h"
 #include "support/textutils.h"
 
+#include "support/assert.h"
 #include <boost/crc.hpp>
 
 #include <ostream>
@@ -69,8 +71,8 @@ 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()), /**/);
 }
 
 
@@ -95,7 +97,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 {
        Font const font = text_metrics_.displayFont(pit_, pos);
 
-       BOOST_ASSERT(inset);
+       LASSERT(inset, /**/);
        // Backup full_repaint status because some insets (InsetTabular)
        // requires a full repaint
        bool pi_full_repaint = pi_.full_repaint;
@@ -124,7 +126,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 #ifdef DEBUG_METRICS
        int const x1 = int(x_ - dim.width());
        Dimension dim2;
-       BOOST_ASSERT(max_witdh_ > 0);
+       LASSERT(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);
@@ -141,9 +143,9 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
                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);
+       LASSERT(dim2.wid == dim.wid, /**/);
+       LASSERT(dim2.asc == dim.asc, /**/);
+       LASSERT(dim2.des == dim.des, /**/);
        int const x2 = x1 + dim.wid;
        int const y1 = yo_ + dim.des;
        int const y2 = yo_ - dim.asc;
@@ -171,7 +173,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));
@@ -205,7 +207,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));
@@ -242,12 +244,22 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
                str[0] = par_.transformChar(c, pos);
        }
 
+       // selected text?
+       pit_type const p0 = pi_.base.bv->cursor().selBegin().pit();
+       bool selection = row_.sel_beg > -1 && row_.sel_beg != row_.sel_end 
+               && ((pit_ == p0 &&  (pos >= row_.sel_beg && pos < row_.sel_end))
+                       || (pit_ > p0 &&  pos < row_.sel_end));
+
        // 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 (row_.sel_beg > -1 && row_.sel_beg != row_.sel_end && 
+                       ((pit_ == p0 && pos == row_.sel_beg) || pos == row_.sel_end))
+                       break;
+
                if (prev_change != par_.lookupChange(pos).type)
                        break;
 
@@ -275,10 +287,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;
                */
 
@@ -297,9 +309,11 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 
        docstring s(&str[0], str.size());
 
-       if (prev_change != Change::UNCHANGED) {
+       if (selection || prev_change != Change::UNCHANGED) {
                FontInfo copy = font;
-               if (prev_change == Change::DELETED) {
+               if (selection) {
+                       copy.setColor(Color_selectiontext);
+               } else if (prev_change == Change::DELETED) {
                        copy.setColor(Color_deletedtext);
                } else if (prev_change == Change::INSERTED) {
                        copy.setColor(Color_addedtext);
@@ -343,8 +357,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());
@@ -473,10 +487,9 @@ void RowPainter::paintFirst()
                y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
 
        Buffer const & buffer = pi_.base.bv->buffer();
-
        Layout const & layout = par_.layout();
 
-       if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
+       if (buffer.params().paragraph_separation == BufferParams::ParagraphSkipSeparation) {
                if (pit_ != 0) {
                        if (layout.latextype == LATEX_PARAGRAPH
                                && !par_.getDepth()) {