* sk.po

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 21c1d9d3fccb6657b1d59af1c06aa36dfed64a25..7625909e505967e9b5814329a2c4c9af1a6d4f10 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -125,11 +125,8 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
        // requires a full repaint
        bool pi_full_repaint = pi_.full_repaint;
 
-       // 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.fontInfo();
+       pi_.base.font = inset->inheritFont() ? font.fontInfo() :
+               pi_.base.bv->buffer().params().getFont().fontInfo();
        pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
        pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos);
 
@@ -270,9 +267,9 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
                // Maybe a more general fix would be draw character by character
                // for some predefined fonts on some platform. In arabic and
                // Hebrew we already do paint this way.
-               if (prev_char == 'f')
+               if (prev_char == 'f' || lyxrc.force_paint_single_char)
                        break;
-               
+
                pos = bidi_.vis2log(vpos);
                if (pos < font_span.first || pos > font_span.last)
                        break;