Revert cs 28908: wrong fix.

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 559f748f06f872c9b9e81722198d44d748a9c480..dbf767f821f775cdce8192a9e4521822a6fec53f 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());
                }