revert changes from last commit due to a bad tree state.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15614 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/rowpainter.C b/src/rowpainter.C
index f29b51e1d592023d038c0cfeefdc95d62cc2c006..d69bbf3267d6c3b25fbb08ed9d9b4081a24a77e5 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -129,7 +129,7 @@ RowPainter::RowPainter(PainterInfo & pi,
          erased_(pi.erased_),
          xo_(x), yo_(y), width_(text_.width())
 {
-       RowMetrics m = text_.computeRowMetrics(*bv_.buffer(), pit, row_);
+       RowMetrics m = text_.computeRowMetrics(pit, row_);
        x_ = m.x + xo_;
 
        //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
@@ -146,13 +146,13 @@ RowPainter::RowPainter(PainterInfo & pi,
 
 LyXFont const RowPainter::getLabelFont() const
 {
-       return text_.getLabelFont(*bv_.buffer(), par_);
+       return text_.getLabelFont(par_);
 }
 
 
 int RowPainter::leftMargin() const
 {
-       return text_.leftMargin(*bv_.buffer(), pit_, row_.pos());
+       return text_.leftMargin(pit_, row_.pos());
 }
 
 
@@ -203,8 +203,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, LyXFont const & font)
                if (!Encodings::isComposeChar_hebrew(c)) {
                        if (isPrintableNonspace(c)) {
                                int const width2 =
-                                       text_.singleWidth(*bv_.buffer(), par_, i, c,
-                                               text_.getFont(*bv_.buffer(), par_, i));
+                                       text_.singleWidth(par_, i, c, text_.getFont(par_, i));
                                // FIXME UNICODE
                                // This does not work anymore, and non-ascii
                                // characters in source files are forbidden
@@ -243,8 +242,7 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
                if (!Encodings::isComposeChar_arabic(c)) {
                        if (isPrintableNonspace(c)) {
                                int const width2 =
-                                       text_.singleWidth(*bv_.buffer(), par_, i, c,
-                                               text_.getFont(*bv_.buffer(), par_, i));
+                                       text_.singleWidth(par_, i, c, text_.getFont(par_, i));
                                dx = (width2 - width) / 2;
                        }
                        break;
@@ -330,7 +328,7 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & font, int desc)
 void RowPainter::paintFromPos(pos_type & vpos)
 {
        pos_type const pos = text_.bidi.vis2log(vpos);
-       LyXFont orig_font = text_.getFont(*bv_.buffer(), par_, pos);
+       LyXFont orig_font = text_.getFont(par_, pos);
 
        double const orig_x = x_;
 
@@ -425,7 +423,7 @@ void RowPainter::paintDepthBar()
                int const w = nestMargin() / 5;
                int x = int(xo_) + w * i;
                // only consider the changebar space if we're drawing outermost text
-               if (text_.isMainText(*bv_.buffer()))
+               if (text_.isMainText())
                        x += changebarMargin();
 
                int const starty = yo_ - row_.ascent();
@@ -496,7 +494,7 @@ void RowPainter::paintFirst()
                }
        }
 
-       bool const is_rtl = text_.isRTL(buffer, par_);
+       bool const is_rtl = text_.isRTL(par_);
        bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
        //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
 
@@ -578,7 +576,7 @@ void RowPainter::paintFirst()
                        if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
                                if (is_rtl)
                                        x = leftMargin();
-                               x += (width_ - text_.rightMargin(buffer, par_) - leftMargin()) / 2;
+                               x += (width_ - text_.rightMargin(par_) - leftMargin()) / 2;
                                x -= fm.width(str) / 2;
                        } else if (is_rtl) {
                                x = width_ - leftMargin() -     fm.width(str);
@@ -591,7 +589,7 @@ void RowPainter::paintFirst()
 
 void RowPainter::paintLast()
 {
-       bool const is_rtl = text_.isRTL(*bv_.buffer(), par_);
+       bool const is_rtl = text_.isRTL(par_);
        int const endlabel = getEndLabel(pit_, text_.paragraphs());
 
        // draw an endlabel
@@ -620,7 +618,7 @@ void RowPainter::paintLast()
                docstring const & str = par_.layout()->endlabelstring();
                double const x = is_rtl ?
                        x_ - fm.width(str)
-                       : - text_.rightMargin(*bv_.buffer(), par_) - row_.width();
+                       : - text_.rightMargin(par_) - row_.width();
                pain_.text(int(x), yo_, str, font);
                break;
        }
@@ -649,7 +647,6 @@ void RowPainter::paintText()
        // Use font span to speed things up, see below
        FontSpan font_span;
        LyXFont font;
-       Buffer const & buffer = *bv_.buffer();
 
        for (pos_type vpos = row_.pos(); vpos < end; ) {
                if (x_ > bv_.workWidth())
@@ -665,11 +662,11 @@ void RowPainter::paintText()
                // Use font span to speed things up, see above
                if (vpos < font_span.first || vpos > font_span.last) {
                        font_span = par_.fontSpan(vpos);
-                       font = text_.getFont(buffer, par_, vpos);
+                       font = text_.getFont(par_, vpos);
                }
 
-               const int width_pos = text_.singleWidth(buffer, par_, pos,
-                       par_.getChar(pos), font);
+               const int width_pos =
+                       text_.singleWidth(par_, pos, par_.getChar(pos), font);
 
                if (x_ + width_pos < 0) {
                        x_ += width_pos;
@@ -875,7 +872,7 @@ void paintPar
 
                        // Instrumentation for testing row cache (see also
                        // 12 lines lower):
-                       if (text.isMainText(*pi.base.bv->buffer()))
+                       if (text.isMainText())
                                lyxerr[Debug::PAINTING] << "#";
                        else
                                lyxerr[Debug::PAINTING] << "[" <<
@@ -907,8 +904,7 @@ void paintText(BufferView & bv,
               Painter & pain)
 {
        BOOST_ASSERT(bv.buffer());
-       Buffer const & buffer = *bv.buffer();
-       LyXText & text = buffer.text();
+       LyXText & text = bv.buffer()->text();
        bool const select = bv.cursor().selection();
        ViewMetricsInfo const & vi = bv.viewMetricsInfo();
        
@@ -940,13 +936,13 @@ void paintText(BufferView & bv,
        // Try viewing the User Guide Mobius figure
 
        if (vi.p1 > 0) {
-               text.redoParagraph(bv, vi.p1 - 1);
+               text.redoParagraph(vi.p1 - 1);
                bv.coordCache().parPos()[&text][vi.p1 - 1] =
                        Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent());
        }
 
        if (vi.p2 < pit_type(text.paragraphs().size()) - 1) {
-               text.redoParagraph(bv, vi.p2 + 1);
+               text.redoParagraph(vi.p2 + 1);
                bv.coordCache().parPos()[&text][vi.p2 + 1] =
                        Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent());
        }