findadv: using \w instead of [[:word:]] makes test-case std::regex compatible; also...

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index a93f9ba4cd3dce3ef33cb0d31193aff3f0847e2b..13c1d02cdf83496c5c3951fc1ff0f9f0c44cc264 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -482,11 +482,11 @@ bool TextMetrics::redoParagraph(pit_type const pit)
        if (text_->isMainText()) {
                if (pit == 0) {
                        pm.rows().front().dimension().asc += 20;
-                       /* coverity[copy_paste_error]: coverity thinks that we
-                        * should update pm.dim().asc below, but all the rows
-                        * heights are actually counted as part of the paragraph metric
-                        * descent see loop above).
+                       /* coverity thinks that we should update pm.dim().asc
+                        * below, but all the rows heights are actually counted as
+                        * part of the paragraph metric descent see loop above).
                         */
+                       // coverity[copy_paste_error]
                        pm.dim().des += 20;
                }
                ParagraphList const & pars = text_->paragraphs();
@@ -1140,8 +1140,10 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
                 * how boundary helps here.
                 */
                else if (pos == cit->endpos
-                        && cit + 1 != row.end()
-                        && cit->isRTL() != (cit + 1)->isRTL())
+                        && ((!cit->isRTL() && cit + 1 != row.end()
+                             && (cit + 1)->isRTL())
+                            || (cit->isRTL() && cit != row.begin()
+                                && !(cit - 1)->isRTL())))
                        boundary = true;
        }
 
@@ -1328,23 +1330,19 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
        }
        pit_type pit = getPitNearY(y);
        LASSERT(pit != -1, return 0);
-
-       int yy = y; // is modified by getPitAndRowNearY
-       Row const & row = getPitAndRowNearY(yy, pit, assert_in_view, up);
-
+       Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up);
        cur.pit() = pit;
 
        // Do we cover an inset?
-       InsetList::InsetTable * it = checkInsetHit(pit, x, yy);
+       InsetList::InsetTable * it = checkInsetHit(pit, x, y);
 
        if (!it) {
                // No inset, set position in the text
                bool bound = false; // is modified by getPosNearX
-               int xx = x; // is modified by getPosNearX
-               cur.pos() = getPosNearX(row, xx, bound);
+               cur.pos() = getPosNearX(row, x, bound);
                cur.boundary(bound);
                cur.setCurrentFont();
-               cur.setTargetX(xx);
+               cur.setTargetX(x);
                return 0;
        }
 
@@ -1357,23 +1355,15 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
        cur.setTargetX(x);
 
        // Try to descend recursively inside the inset.
-       Inset * edited = inset->editXY(cur, x, yy);
+       Inset * edited = inset->editXY(cur, x, y);
        if (edited == inset && cur.pos() == it->pos) {
                // non-editable inset, set cursor after the inset if x is
                // nearer to that position (bug 9628)
-               CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
-               Dimension const & dim = insetCache.dim(inset);
-               Point p = insetCache.xy(inset);
-               bool const is_rtl = text_->isRTL(text_->getPar(pit));
-               if (is_rtl) {
-                       // "in front of" == "right of"
-                       if (abs(p.x_ - x) < abs(p.x_ + dim.wid - x))
-                               cur.posForward();
-               } else {
-                       // "in front of" == "left of"
-                       if (abs(p.x_ + dim.wid - x) < abs(p.x_ - x))
-                               cur.posForward();
-               }
+               bool bound = false; // is modified by getPosNearX
+               cur.pos() = getPosNearX(row, x, bound);
+               cur.boundary(bound);
+               cur.setCurrentFont();
+               cur.setTargetX(x);
        }
 
        if (cur.top().text() == text_)