Fix handling of the add branch textfield in GuiBranches

[lyx.git] / src / frontends / qt4 / GuiFontLoader.cpp

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index 9e4a9ca36fd4e791efedc75c1adf0b659389ace1..955303bb91e5ead087ed6afc8e71809882b2e018 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -30,13 +30,13 @@
 #include <QFontInfo>
 #include <QFontDatabase>
 
-#include "support/assert.h"
+#include "support/lassert.h"
 
 using namespace std;
 using namespace lyx::support;
 
 QString const math_fonts[] = {"cmex10", "cmmi10", "cmr10", "cmsy10",
-       "eufm10", "msam10", "msbm10", "wasy10", "esint10"};
+       "esint10", "eufm10", "msam10", "msbm10", "rsfs10", "wasy10"};
 int const num_math_fonts = sizeof(math_fonts) / sizeof(*math_fonts);
 
 namespace lyx {
@@ -77,6 +77,7 @@ SymbolFont symbol_fonts[] = {
        { MSA_FAMILY,   "msam10", "-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*" },
        { MSB_FAMILY,   "msbm10", "-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*" },
        { EUFRAK_FAMILY,"eufm10", "-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*" },
+       { RSFS_FAMILY,  "rsfs10", "-*-rsfs10-medium-*-*-*-*-*-*-*-*-*-*-*" },
        { WASY_FAMILY,  "wasy10", "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*" },
        { ESINT_FAMILY, "esint10","-*-esint10-medium-*-*-*-*-*-*-*-*-*-*-*" }
 };
@@ -140,7 +141,7 @@ static bool isChosenFont(QFont & font, QString const & family)
        // positions.
        QFontInfo fi(font);
 
-       LYXERR(Debug::FONT, "got: " << fromqstr(fi.family()));
+       LYXERR(Debug::FONT, "got: " << fi.family());
 
        if (fi.family().contains(family)) {
                LYXERR(Debug::FONT, " got it ");
@@ -153,8 +154,7 @@ static bool isChosenFont(QFont & font, QString const & family)
 
 QFont symbolFont(QString const & family, bool * ok)
 {
-       LYXERR(Debug::FONT, "Looking for font family "
-               << fromqstr(family) << " ... ");
+       LYXERR(Debug::FONT, "Looking for font family " << family << " ... ");
        QString upper = family;
        upper[0] = family[0].toUpper();
 
@@ -168,7 +168,7 @@ QFont symbolFont(QString const & family, bool * ok)
                return font;
        }
 
-       LYXERR(Debug::FONT, "Trying " << fromqstr(upper) << " ... ");
+       LYXERR(Debug::FONT, "Trying " << upper << " ... ");
        font.setFamily(upper);
 
        if (isChosenFont(font, upper)) {
@@ -180,7 +180,7 @@ QFont symbolFont(QString const & family, bool * ok)
        // A simple setFamily() fails on Qt 2
 
        QString const raw = rawName(family);
-       LYXERR(Debug::FONT, "Trying " << fromqstr(raw) << " ... ");
+       LYXERR(Debug::FONT, "Trying " << raw << " ... ");
        font.setRawName(raw);
 
        if (isChosenFont(font, family)) {
@@ -200,15 +200,14 @@ QFont symbolFont(QString const & family, bool * ok)
 FontLoader::FontLoader()
 {
        QString const fonts_dir =
-               toqstr(addPath(package().system_support().absFilename(), "fonts"));
+               toqstr(addPath(package().system_support().absFileName(), "fonts"));
 
        for (int i = 0 ; i < num_math_fonts; ++i) {
                QString const font_file = fonts_dir + '/' + math_fonts[i] + ".ttf";
                int fontID = QFontDatabase::addApplicationFont(font_file);
 
-               LYXERR(Debug::FONT, "Adding font " << fromqstr(font_file)
-                                   << static_cast<const char *>
-                                       (fontID < 0 ? " FAIL" : " OK"));
+               LYXERR(Debug::FONT, "Adding font " << font_file
+                                   << (fontID < 0 ? " FAIL" : " OK"));
        }
 
        for (int i1 = 0; i1 < NUM_FAMILIES; ++i1)
@@ -260,13 +259,13 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
                switch (f.family()) {
                case ROMAN_FAMILY: {
                        QString family = makeFontName(toqstr(lyxrc.roman_font_name),
-                                                                                                                                               toqstr(lyxrc.roman_font_foundry)); 
+                               toqstr(lyxrc.roman_font_foundry)); 
                        font.setFamily(family);
 #ifdef Q_WS_MACX
-#if QT_VERSION >= 0x040300
-                       // Workaround for a Qt bug, see http://bugzilla.lyx.org/show_bug.cgi?id=3684
-                       // It is reported to Trolltech at 02/06/07 against 4.3 final.
-                       // FIXME: Add an upper version limit as soon as the bug is fixed in Qt.
+#if QT_VERSION >= 0x040300 //&& QT_VERSION < 0x040800
+                       // Workaround for a Qt bug, see http://www.lyx.org/trac/ticket/3684
+                       // and http://bugreports.qt.nokia.com/browse/QTBUG-11145.
+                       // FIXME: Check whether this is really fixed in Qt 4.8
                        if (family == "Times" && !font.exactMatch())
                                font.setFamily("Times New Roman");
 #endif
@@ -306,8 +305,8 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
                        break;
        }
 
-       LYXERR(Debug::FONT, "Font '" << to_utf8(stateText(f))
-               << "' matched by\n" << fromqstr(font.family()));
+       LYXERR(Debug::FONT, "Font '" << stateText(f)
+               << "' matched by\n" << font.family());
 
        // Is this an exact match?
        if (font.exactMatch())
@@ -315,7 +314,7 @@ GuiFontInfo::GuiFontInfo(FontInfo const & f)
        else
                LYXERR(Debug::FONT, "This font is NOT an exact match");
 
-       LYXERR(Debug::FONT, "XFLD: " << fromqstr(font.rawName()));
+       LYXERR(Debug::FONT, "XFLD: " << font.rawName());
 
        font.setPointSizeF(convert<double>(lyxrc.font_sizes[f.size()])
                               * lyxrc.zoom / 100.0);