simplification

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index c56454ba9302d0be367680a1aa76ee06408261cc..9a63d53b8ea7161b0498df60a04851bca67ab448 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -124,14 +124,14 @@ void RowPainter::paintHfill(pos_type const pos, pos_type const body_pos)
 
 void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 {
-       FontInfo font = text_metrics_.getDisplayFont(pit_, pos).fontInfo();
+       Font const font = text_metrics_.getDisplayFont(pit_, pos);
 
        BOOST_ASSERT(inset);
        // FIXME: We should always use font, see documentation of
        // noFontChange() in Inset.h.
        pi_.base.font = inset->noFontChange() ?
                pi_.base.bv->buffer().params().getFont().fontInfo() :
-               font;
+               font.fontInfo();
        pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
        pi_.erased_ = erased_ || par_.isDeleted(pos);
        pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
@@ -141,7 +141,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
 
        Dimension const & dim = pm_.insetDimension(inset);
 
-       paintForeignMark(x_, font, dim.descent());
+       paintForeignMark(x_, font.language(), dim.descent());
 
        x_ += dim.width();
 
@@ -151,7 +151,7 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
        BOOST_ASSERT(max_witdh_ > 0);
        int right_margin = text_metrics_.rightMargin(pm_);
        int const w = max_witdh_ - leftMargin() - right_margin;
-       MetricsInfo mi(pi_.base.bv, font, w);
+       MetricsInfo mi(pi_.base.bv, font.fontInfo(), w);
        inset->metrics(mi, dim2);
        if (dim.wid != dim2.wid)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
@@ -198,7 +198,7 @@ void RowPainter::paintHebrewComposeChar(pos_type & vpos, FontInfo const & font)
                if (!Encodings::isComposeChar_hebrew(c)) {
                        if (isPrintableNonspace(c)) {
                                int const width2 = pm_.singleWidth(i,
-                                       text_metrics_.getDisplayFont(pit_, i).fontInfo());
+                                       text_metrics_.getDisplayFont(pit_, i));
                                dx = (c == 0x05e8 || // resh
                                      c == 0x05d3)   // dalet
                                        ? width2 - width
@@ -232,7 +232,7 @@ void RowPainter::paintArabicComposeChar(pos_type & vpos, FontInfo const & font)
                if (!Encodings::isComposeChar_arabic(c)) {
                        if (isPrintableNonspace(c)) {
                                int const width2 = pm_.singleWidth(i,
-                                               text_metrics_.getDisplayFont(pit_, i).fontInfo());
+                                               text_metrics_.getDisplayFont(pit_, i));
                                dx = (width2 - width) / 2;
                        }
                        break;
@@ -322,7 +322,7 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
        docstring s(&str[0], str.size());
 
        if (prev_change != Change::UNCHANGED) {
-               FontInfo copy(font);
+               FontInfo copy = font;
                if (prev_change == Change::DELETED) {
                        copy.setColor(Color_deletedtext);
                } else if (prev_change == Change::INSERTED) {
@@ -335,13 +335,14 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 }
 
 
-void RowPainter::paintForeignMark(double orig_x, Font const & font, int desc)
+void RowPainter::paintForeignMark(double orig_x, Language const * lang,
+               int desc)
 {
        if (!lyxrc.mark_foreign_language)
                return;
-       if (font.language() == latex_language)
+       if (lang == latex_language)
                return;
-       if (font.language() == pi_.base.bv->buffer().params().language)
+       if (lang == pi_.base.bv->buffer().params().language)
                return;
 
        int const y = yo_ + 1 + desc;
@@ -352,7 +353,7 @@ void RowPainter::paintForeignMark(double orig_x, Font const & font, int desc)
 void RowPainter::paintFromPos(pos_type & vpos)
 {
        pos_type const pos = bidi_.vis2log(vpos);
-       Font orig_font = text_metrics_.getDisplayFont(pit_, pos).fontInfo();
+       Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
        double const orig_x = x_;
 
        // usual characters, no insets
@@ -375,7 +376,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
                paintArabicComposeChar(vpos, orig_font.fontInfo());
        }
 
-       paintForeignMark(orig_x, orig_font);
+       paintForeignMark(orig_x, orig_font.language());
 }
 
 
@@ -462,7 +463,7 @@ void RowPainter::paintDepthBar()
 
 int RowPainter::paintAppendixStart(int y)
 {
-       FontInfo pb_font;
+       FontInfo pb_font = sane_font;
        pb_font.setColor(Color_appendix);
        pb_font.decSize();
 
@@ -573,7 +574,7 @@ void RowPainter::paintFirst()
                (layout->labeltype == LABEL_TOP_ENVIRONMENT ||
                layout->labeltype == LABEL_BIBLIO ||
                layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
-               FontInfo font = getLabelFont();
+               FontInfo const font = getLabelFont();
                if (!par_.getLabelstring().empty()) {
                        docstring const str = par_.getLabelstring();
                        double spacing_val = 1.0;
@@ -646,7 +647,7 @@ void RowPainter::paintLast()
        }
 
        case END_LABEL_STATIC: {
-               FontInfo font = getLabelFont();
+               FontInfo const font = getLabelFont();
                FontMetrics const & fm = theFontMetrics(font);
                docstring const & str = par_.layout()->endlabelstring();
                double const x = is_rtl ?
@@ -704,7 +705,7 @@ void RowPainter::paintText()
 
        // Use font span to speed things up, see below
        FontSpan font_span;
-       FontInfo font;
+       Font font;
 
        // If the last logical character is a separator, don't paint it, unless
        // it's in the last row of a paragraph; see skipped_sep_vpos declaration
@@ -731,7 +732,7 @@ 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_metrics_.getDisplayFont(pit_, vpos).fontInfo();
+                       font = text_metrics_.getDisplayFont(pit_, vpos);
                }
 
                const int width_pos = pm_.singleWidth(pos, font);
@@ -776,12 +777,12 @@ void RowPainter::paintText()
                        ++vpos;
 
                } else if (par_.isSeparator(pos)) {
-                       FontInfo orig_font = text_metrics_.getDisplayFont(pit_, pos).fontInfo();
+                       Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
                        double const orig_x = x_;
                        x_ += width_pos;
                        if (pos >= body_pos)
                                x_ += row_.separator;
-                       paintForeignMark(orig_x, orig_font);
+                       paintForeignMark(orig_x, orig_font.language());
                        ++vpos;
 
                } else if (par_.isInset(pos)) {