adjust comment.

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 7d6235426a557362f174a8263c392c440800d24c..6e22bf7852cb692a7a28309145b0da6bf0530bc2 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -4,12 +4,12 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  * \author Abdelrazak Younes
  *
  * Full author contact details are available in file CREDITS.
@@ -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);
 }
 
 
@@ -390,7 +384,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                LYXERR(Debug::INFO, "MacroContext not initialised!"
                        << " Going through the buffer again and hope"
                        << " the context is better then.");
-               updateLabels(bv_->buffer());
+               bv_->buffer().updateLabels();
                parPos = text_->macrocontextPosition();
                LASSERT(!parPos.empty(), /**/);
                parPos.pit() = pit;
@@ -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());
                }
@@ -1317,7 +1311,8 @@ void TextMetrics::newParMetricsUp()
 // y is screen coordinate
 pit_type TextMetrics::getPitNearY(int y)
 {
-       LASSERT(!text_->paragraphs().empty(), /**/);
+       LASSERT(!text_->paragraphs().empty(), return -1);
+       LASSERT(!par_metrics_.empty(), return -1);
        LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
 
        // look for highest numbered paragraph with y coordinate less than given y
@@ -1400,7 +1395,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
                cur.bv().coordCache().dump();
        }
        pit_type pit = getPitNearY(y);
-       LASSERT(pit != -1, /**/);
+       LASSERT(pit != -1, return 0);
 
        Row const & row = getRowNearY(y, pit);
        bool bound = false;
@@ -1454,6 +1449,7 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 {
        LASSERT(text_ == cur.text(), /**/);
        pit_type pit = getPitNearY(y);
+       LASSERT(pit != -1, return);
 
        ParagraphMetrics const & pm = par_metrics_[pit];
 
@@ -1490,7 +1486,7 @@ void TextMetrics::setCursorFromCoordinates(Cursor & cur, int const x, int const
 Inset * TextMetrics::checkInsetHit(int x, int y)
 {
        pit_type pit = getPitNearY(y);
-       LASSERT(pit != -1, /**/);
+       LASSERT(pit != -1, return 0);
 
        Paragraph const & par = text_->paragraphs()[pit];
        ParagraphMetrics const & pm = par_metrics_[pit];
@@ -1854,11 +1850,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)