Fix the tab ordering of GuiDocument components.

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

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index 046f7df7d122686ae835b78d83ac0c0fcbda0aab..955303bb91e5ead087ed6afc8e71809882b2e018 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -36,7 +36,7 @@ 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-*-*-*-*-*-*-*-*-*-*-*" }
 };
@@ -258,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
+#if QT_VERSION >= 0x040300 //&& QT_VERSION < 0x040800
                        // Workaround for a Qt bug, see http://www.lyx.org/trac/ticket/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.
+                       // 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