Try to use the right width for math symbols

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index a392c027fadc85c72ab8fab6df5fbac412686e68..c8b9157f3c52dcb17389e98e10b861e4d39a78bd 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -60,7 +60,8 @@ RowPainter::RowPainter(PainterInfo & pi,
        //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
        //row_.dump();
 
-       LBUFERR(row.pit() < text.paragraphs().size());
+       LBUFERR(row.pit() >= 0);
+       LBUFERR(row.pit() < int(text.paragraphs().size()));
 }
 
 
@@ -457,8 +458,16 @@ void RowPainter::paintTopLevelLabel() const
 
        double x = x_;
        if (layout.labeltype == LABEL_CENTERED) {
-               x += (tm_.width() - row_.left_margin - row_.right_margin) / 2;
-               x -= fm.width(str) / 2;
+               /* Currently, x points at row_.left_margin (which contains the
+                * indent). First remove that, and then center the title with
+                * respect to the left and right margins.
+                */
+               int const leftm = row_.isRTL() ? tm_.rightMargin(row_.pit())
+                                              : tm_.leftMargin(row_.pit());
+               int const rightm = row_.isRTL() ? tm_.leftMargin(row_.pit())
+                                                   : tm_.rightMargin(row_.pit());
+               x += leftm - row_.left_margin + (tm_.width() - leftm -rightm) / 2
+                       - fm.width(str) / 2;
        } else if (row_.isRTL()) {
                x = xo_ + tm_.width() - row_.right_margin - fm.width(str);
        }