ws changes only

[lyx.git] / src / rowpainter.C

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 7801f9115b04f2facb8c7038d1384e4a3d5fa212..ac1fadd6a0416ad30f1689104b6f3b6c391d9151 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -11,35 +11,35 @@
 
 #include <config.h>
 
-#include "frontends/Painter.h"
-#include "frontends/screen.h"
-#include "frontends/font_metrics.h"
-#include "support/LAssert.h"
-#include "paragraph.h"
-#include "paragraph_funcs.h"
-#include "support/textutils.h"
+#include "rowpainter.h"
 
-#include "insets/insettext.h"
-#include "ParagraphParameters.h"
-#include "debug.h"
-#include "BufferView.h"
 #include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
+#include "encoding.h"
 #include "gettext.h"
 #include "language.h"
-#include "encoding.h"
-#include "lyxtext.h"
-#include "rowpainter.h"
+#include "LColor.h"
 #include "lyxrc.h"
+#include "lyxrow.h"
 #include "lyxrow_funcs.h"
 #include "metricsinfo.h"
+#include "paragraph.h"
+#include "paragraph_funcs.h"
+#include "ParagraphParameters.h"
+#include "vspace.h"
 
-#include <algorithm>
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
+#include "insets/insettext.h"
+
+#include "support/textutils.h"
 
-using namespace lyx::support;
 
-using std::max;
-using std::endl;
 using lyx::pos_type;
+using std::max;
+using std::string;
 
 extern int PAPER_MARGIN;
 extern int CHANGEBAR_MARGIN;
@@ -179,7 +179,7 @@ void RowPainter::paintInset(pos_type const pos)
 {
        InsetOld * inset = const_cast<InsetOld*>(pit_->getInset(pos));
 
-       Assert(inset);
+       BOOST_ASSERT(inset);
 
        PainterInfo pi(perv(bv_));
        pi.base.font = getFont(pos);
@@ -320,7 +320,7 @@ void RowPainter::paintForeignMark(double orig_x, LyXFont const & orig_font)
                return;
        if (orig_font.language() == latex_language)
                return;
-       if (orig_font.language() == bv_.buffer()->params.language)
+       if (orig_font.language() == bv_.buffer()->params().language)
                return;
 
        int const y = yo_ + row_->baseline() + 1;
@@ -338,7 +338,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
        char const c = pit_->getChar(pos);
 
-       if (IsInsetChar(c)) {
+       if (c == Paragraph::META_INSET) {
                paintInset(pos);
                ++vpos;
                paintForeignMark(orig_x, orig_font);
@@ -382,7 +382,7 @@ void RowPainter::paintBackground()
 
 void RowPainter::paintSelection()
 {
-       bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params);
+       bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
 
        // the current selection
        int const startx = text_.selection.start.x();
@@ -599,12 +599,15 @@ int RowPainter::paintLengthMarker(string const & prefix, VSpace const & vsp, int
        int d = 0;
 
        LyXFont font;
-       font.setColor(LColor::added_space).decSize().decSize();
+       font.setColor(LColor::added_space);
+       font.decSize();
+       font.decSize();
        font_metrics::rectText(str, font, w, a, d);
 
        pain_.rectText(leftx + 2 * arrow_size + 5,
-                        start + ((end - start) / 2) + d,
-                        str, font);
+                      start + ((end - start) / 2) + d,
+                      str, font,
+                      LColor::none, LColor::none);
 
        // top arrow
        pain_.line(leftx, ty1, midx, ty2, LColor::added_space);
@@ -624,7 +627,8 @@ int RowPainter::paintLengthMarker(string const & prefix, VSpace const & vsp, int
 int RowPainter::paintPageBreak(string const & label, int y)
 {
        LyXFont pb_font;
-       pb_font.setColor(LColor::pagebreak).decSize();
+       pb_font.setColor(LColor::pagebreak);
+       pb_font.decSize();
 
        int w = 0;
        int a = 0;
@@ -634,12 +638,12 @@ int RowPainter::paintPageBreak(string const & label, int y)
        int const text_start = int(xo_ + (width_ - w) / 2);
        int const text_end = text_start + w;
 
-       pain_.rectText(text_start, y + d, label, pb_font);
+       pain_.rectText(text_start, y + d, label, pb_font, LColor::none, LColor::none);
 
        pain_.line(int(xo_), y, text_start, y,
-               LColor::pagebreak, Painter::line_onoffdash);
+                  LColor::pagebreak, Painter::line_onoffdash);
        pain_.line(text_end, y, int(xo_ + width_), y,
-               LColor::pagebreak, Painter::line_onoffdash);
+                  LColor::pagebreak, Painter::line_onoffdash);
 
        return 3 * defaultRowHeight();
 }
@@ -648,7 +652,8 @@ int RowPainter::paintPageBreak(string const & label, int y)
 int RowPainter::paintAppendixStart(int y)
 {
        LyXFont pb_font;
-       pb_font.setColor(LColor::appendix).decSize();
+       pb_font.setColor(LColor::appendix);
+       pb_font.decSize();
 
        string const label = _("Appendix");
        int w = 0;
@@ -659,7 +664,7 @@ int RowPainter::paintAppendixStart(int y)
        int const text_start = int(xo_ + (width_ - w) / 2);
        int const text_end = text_start + w;
 
-       pain_.rectText(text_start, y + d, label, pb_font);
+       pain_.rectText(text_start, y + d, label, pb_font, LColor::none, LColor::none);
 
        pain_.line(int(xo_ + 1), y, text_start, y, LColor::appendix);
        pain_.line(text_end, y, int(xo_ + width_ - 2), y, LColor::appendix);
@@ -695,18 +700,18 @@ void RowPainter::paintFirst()
 
        LyXLayout_ptr const & layout = pit_->layout();
 
-       if (buffer.params.paragraph_separation == BufferParams::PARSEP_SKIP) {
+       if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
                if (pit_ != text_.ownerParagraphs().begin()) {
                        if (layout->latextype == LATEX_PARAGRAPH
                                && !pit_->getDepth()) {
-                               y_top += buffer.params.getDefSkip().inPixels(bv_);
+                               y_top += buffer.params().getDefSkip().inPixels(bv_);
                        } else {
                                LyXLayout_ptr const & playout =
                                        boost::prior(pit_)->layout();
                                if (playout->latextype == LATEX_PARAGRAPH
                                        && !boost::prior(pit_)->getDepth()) {
                                        // is it right to use defskip here, too? (AS)
-                                       y_top += buffer.params.getDefSkip().inPixels(bv_);
+                                       y_top += buffer.params().getDefSkip().inPixels(bv_);
                                }
                        }
                }
@@ -729,7 +734,7 @@ void RowPainter::paintFirst()
                y_top += asc;
        }
 
-       bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params);
+       bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
 
        // should we print a label?
        if (layout->labeltype >= LABEL_STATIC
@@ -745,13 +750,13 @@ void RowPainter::paintFirst()
                        // this is special code for the chapter layout. This is
                        // printed in an extra row and has a pagebreak at
                        // the top.
-                       if (layout->labeltype == LABEL_COUNTER_CHAPTER) {
-                               if (buffer.params.secnumdepth >= 0) {
+                       if (layout->counter == "chapter") {
+                               if (buffer.params().secnumdepth >= 0) {
                                        float spacing_val = 1.0;
                                        if (!parparams.spacing().isDefault()) {
                                                spacing_val = parparams.spacing().getValue();
                                        } else {
-                                               spacing_val = buffer.params.spacing.getValue();
+                                               spacing_val = buffer.params().spacing().getValue();
                                        }
 
                                        int const maxdesc =
@@ -794,7 +799,7 @@ void RowPainter::paintFirst()
                        if (!parparams.spacing().isDefault()) {
                                spacing_val = parparams.spacing().getValue();
                        } else {
-                               spacing_val = buffer.params.spacing.getValue();
+                               spacing_val = buffer.params().spacing().getValue();
                        }
 
                        int maxdesc =
@@ -856,7 +861,7 @@ void RowPainter::paintLast()
                y_bottom -= asc;
        }
 
-       bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params);
+       bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
        int const endlabel = getEndLabel(pit_, text_.ownerParagraphs());
 
        // draw an endlabel