Allow using \binom without amsmath and add support for \brace and \brack

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index c4290581415051ce98c748c8f6346832a6685d4d..3cd352e51203f08a028fef1bb42403e59e302bc7 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -10,6 +10,7 @@
  */
 
 #include <config.h>
+#include <algorithm>
 
 #include "rowpainter.h"
 
@@ -172,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));
@@ -206,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));
@@ -243,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;
 
@@ -276,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;
                */
 
@@ -298,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);
@@ -344,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());