empty file format change due to r29840.

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 37b779312562d260a5401e43321e166115af2a97..d93870d9ca22f56c742ca8a6c476809d80741a90 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -187,7 +187,7 @@ int TextMetrics::parPosition(pit_type pit) const
 
 bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
 {
-       LASSERT(mi.base.textwidth, /**/);
+       LASSERT(mi.base.textwidth > 0, /**/);
        max_width_ = mi.base.textwidth;
        // backup old dimension.
        Dimension const old_dim = dim_;
@@ -321,15 +321,9 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
        if (pos == 0)
                return false;
 
-       Paragraph const & par = text_->getPar(pit);
+       Font const & left_font = displayFont(pit, pos - 1);
 
-       bool left = displayFont(pit, pos - 1).isVisibleRightToLeft();
-       bool right;
-       if (pos == par.size())
-               right = par.isRTL(bv_->buffer().params());
-       else
-               right = displayFont(pit, pos).isVisibleRightToLeft();
-       return left != right;
+       return isRTLBoundary(pit, pos, left_font);
 }
 
 
@@ -991,8 +985,8 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
        InsetList::const_iterator ii = par.insetList().begin();
        InsetList::const_iterator iend = par.insetList().end();
        for ( ; ii != iend; ++ii) {
-               Dimension const & dim = pm.insetDimension(ii->inset);
                if (ii->pos >= first && ii->pos < end) {
+                       Dimension const & dim = pm.insetDimension(ii->inset);
                        maxasc  = max(maxasc,  dim.ascent());
                        maxdesc = max(maxdesc, dim.descent());
                }
@@ -1347,7 +1341,7 @@ pit_type TextMetrics::getPitNearY(int y)
 
        if (y >= last->second.position() + int(pm_last.descent())) {
                // We are looking for a position that is after the last paragraph in
-               // the cache (which is in priciple off-screen, that is before the
+               // the cache (which is in priciple off-screen), that is before the
                // visible part.
                pit = last->first + 1;
                if (pit == int(text_->paragraphs().size()))
@@ -1376,7 +1370,8 @@ pit_type TextMetrics::getPitNearY(int y)
 }
 
 
-Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
+Row const & TextMetrics::getPitAndRowNearY(int y, pit_type & pit,
+       bool assert_in_view, bool up)
 {
        ParagraphMetrics const & pm = par_metrics_[pit];
 
@@ -1388,13 +1383,37 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
        for (; rit != rlast; yy += rit->height(), ++rit)
                if (yy + rit->height() > y)
                        break;
+
+       if (assert_in_view && yy + rit->height() != y) {
+               if (!up) {
+                       if (rit != pm.rows().begin())
+                               --rit;
+                       else if (pit != 0) {
+                               --pit;
+                               newParMetricsUp();
+                               ParagraphMetrics const & pm2 = par_metrics_[pit];
+                               rit = pm2.rows().end();
+                               --rit;
+                       }
+               } else  {
+                       if (rit != rlast)
+                               ++rit;
+                       else if (pit != int(par_metrics_.size())) {
+                               ++pit;
+                               newParMetricsDown();
+                               ParagraphMetrics const & pm2 = par_metrics_[pit];
+                               rit = pm2.rows().begin();
+                       }
+               }
+       }
        return *rit;
 }
 
 
 // x,y are absolute screen coordinates
 // sets cursor recursively descending into nested editable insets
-Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
+Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
+       bool assert_in_view, bool up)
 {
        if (lyxerr.debugging(Debug::WORKAREA)) {
                LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
@@ -1403,7 +1422,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
        pit_type pit = getPitNearY(y);
        LASSERT(pit != -1, return 0);
 
-       Row const & row = getRowNearY(y, pit);
+       Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up);
        bool bound = false;
 
        int xx = x; // is modified by getColumnNearX
@@ -1427,7 +1446,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
        }
 
        ParagraphList const & pars = text_->paragraphs();
-       Inset const * insetBefore = pos? pars[pit].getInset(pos - 1): 0;
+       Inset const * insetBefore = pos ? pars[pit].getInset(pos - 1) : 0;
        //Inset * insetBehind = pars[pit].getInset(pos);
 
        // This should be just before or just behind the
@@ -1856,11 +1875,11 @@ int TextMetrics::leftMargin(int max_width,
 
        case MARGIN_FIRST_DYNAMIC:
                if (layout.labeltype == LABEL_MANUAL) {
-                       if (pos >= par.beginOfBody()) {
+                       // if we are at position 0, we are never in the body
+                       if (pos > 0 && pos >= par.beginOfBody())
                                l_margin += labelfont_metrics.signedWidth(layout.leftmargin);
-                       } else {
+                       else
                                l_margin += labelfont_metrics.signedWidth(layout.labelindent);
-                       }
                } else if (pos != 0
                           // Special case to fix problems with
                           // theorems (JMarc)