The branch, str-metrics, has been updated.

- Log -----------------------------------------------------------------

commit e40d4783b2d4b88e46a59f45459d45e3467304e0
Author: Jean-Marc Lasgouttes <[email protected]>
Date:   Sun Jul 21 12:30:19 2013 +0200

    Doh! Compilation fix

diff --git a/src/frontends/qt4/GuiFontLoader.cpp 
b/src/frontends/qt4/GuiFontLoader.cpp
index 4520c57..25993d7 100644
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -165,7 +165,7 @@ QFont symbolFont(QString const & family, bool * ok)
        upper[0] = family[0].toUpper();
 
        QFont font;
-       if (force_paint_single_char)
+       if (lyxrc.force_paint_single_char)
                font.setKerning(false);
        font.setFamily(family);
 
@@ -257,7 +257,7 @@ static QString makeFontName(QString const & family, QString 
const & foundry)
 GuiFontInfo::GuiFontInfo(FontInfo const & f)
        : metrics(QFont())
 {
-       if (force_paint_single_char)
+       if (lyxrc.force_paint_single_char)
                font.setKerning(false);
        QString const pat = symbolFamily(f.family());
        if (!pat.isEmpty()) {
@@ -336,7 +336,7 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
                FontInfo smallfont = f;
                smallfont.decSize().decSize().setShape(UP_SHAPE);
                QFont font2(font);
-               if (force_paint_single_char)
+               if (lyxrc.force_paint_single_char)
                        font2.setKerning(false);
                
font2.setPointSizeF(convert<double>(lyxrc.font_sizes[smallfont.size()])
                               * lyxrc.zoom / 100.0);

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiFontLoader.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Repository for new features

Reply via email to