Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index 3fde5a096836836fa1e6c82a94b76076fe417686..9e4a9ca36fd4e791efedc75c1adf0b659389ace1 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -14,7 +14,7 @@
 #include "FontLoader.h"
 
 #include "FontInfo.h"
-#include "GuiFontLoader.h"
+#include "GuiFontMetrics.h"
 #include "qt_helpers.h"
 
 #include "LyXRC.h"
@@ -30,7 +30,7 @@
 #include <QFontInfo>
 #include <QFontDatabase>
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -45,6 +45,21 @@ extern docstring const stateText(FontInfo const & f);
 
 namespace frontend {
 
+/**
+ * Matches Fonts against
+ * actual QFont instances, and also caches metrics.
+ */
+class GuiFontInfo
+{
+public:
+       GuiFontInfo(FontInfo const & f);
+
+       /// The font instance
+       QFont font;
+       /// Metrics on the font
+       GuiFontMetrics metrics;
+};
+
 namespace {
 
 struct SymbolFont {
@@ -54,45 +69,16 @@ struct SymbolFont {
 };
 
 SymbolFont symbol_fonts[] = {
-       { SYMBOL_FAMILY,
-               "symbol",
-               "-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific" },
-
-       { CMR_FAMILY,
-               "cmr10",
-               "-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { CMSY_FAMILY,
-               "cmsy10",
-               "-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { CMM_FAMILY,
-               "cmmi10",
-               "-*-cmmi10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { CMEX_FAMILY,
-               "cmex10",
-               "-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { MSA_FAMILY,
-               "msam10",
-               "-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { MSB_FAMILY,
-               "msbm10",
-               "-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { EUFRAK_FAMILY,
-               "eufm10",
-               "-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { WASY_FAMILY,
-               "wasy10",
-               "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-
-       { ESINT_FAMILY,
-               "esint10",
-               "-*-esint10-medium-*-*-*-*-*-*-*-*-*-*-*" }
+       { SYMBOL_FAMILY,"symbol", "-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific"},
+       { CMR_FAMILY,   "cmr10",  "-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*" },
+       { CMSY_FAMILY,  "cmsy10", "-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*" },
+       { CMM_FAMILY,   "cmmi10", "-*-cmmi10-medium-*-*-*-*-*-*-*-*-*-*-*" },
+       { CMEX_FAMILY,  "cmex10", "-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*" },
+       { MSA_FAMILY,   "msam10", "-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*" },
+       { MSB_FAMILY,   "msbm10", "-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*" },
+       { EUFRAK_FAMILY,"eufm10", "-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*" },
+       { WASY_FAMILY,  "wasy10", "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*" },
+       { ESINT_FAMILY, "esint10","-*-esint10-medium-*-*-*-*-*-*-*-*-*-*-*" }
 };
 
 size_t const nr_symbol_fonts = sizeof(symbol_fonts) / sizeof(symbol_fonts[0]);
@@ -105,10 +91,10 @@ static GuiFontInfo * fontinfo_[NUM_FAMILIES][2][4][10];
 // if not cached, create it.
 GuiFontInfo & fontinfo(FontInfo const & f)
 {
-       BOOST_ASSERT(f.family() < NUM_FAMILIES);
-       BOOST_ASSERT(f.series() < 2);
-       BOOST_ASSERT(f.realShape() < 4);
-       BOOST_ASSERT(f.size() < 10);
+       LASSERT(f.family() < NUM_FAMILIES, /**/);
+       LASSERT(f.series() < 2, /**/);
+       LASSERT(f.realShape() < 4, /**/);
+       LASSERT(f.size() < 10, /**/);
        // fi is a reference to the pointer type (GuiFontInfo *) in the
        // fontinfo_ table.
        GuiFontInfo * & fi =
@@ -193,9 +179,9 @@ QFont symbolFont(QString const & family, bool * ok)
 
        // A simple setFamily() fails on Qt 2
 
-       QString const rawName = rawName(family);
-       LYXERR(Debug::FONT, "Trying " << fromqstr(rawName) << " ... ");
-       font.setRawName(rawName);
+       QString const raw = rawName(family);
+       LYXERR(Debug::FONT, "Trying " << fromqstr(raw) << " ... ");
+       font.setRawName(raw);
 
        if (isChosenFont(font, family)) {
                LYXERR(Debug::FONT, "raw version!");
@@ -235,14 +221,13 @@ FontLoader::FontLoader()
 
 void FontLoader::update()
 {
-       for (int i1 = 0; i1 < NUM_FAMILIES; ++i1) {
+       for (int i1 = 0; i1 < NUM_FAMILIES; ++i1)
                for (int i2 = 0; i2 < 2; ++i2)
                        for (int i3 = 0; i3 < 4; ++i3)
                                for (int i4 = 0; i4 < 10; ++i4) {
                                        delete fontinfo_[i1][i2][i3][i4];
                                        fontinfo_[i1][i2][i3][i4] = 0;
                                }
-       }
 }
 
 
@@ -377,21 +362,22 @@ bool FontLoader::available(FontInfo const & f)
        return true;
 }
 
+
 FontMetrics const & FontLoader::metrics(FontInfo const & f)
 {
        return fontinfo(f).metrics;
 }
 
-/// Get the QFont for this FontInfo
-QFont const & getFont(FontInfo const & f)
+
+GuiFontMetrics const & getFontMetrics(FontInfo const & f)
 {
-       return fontinfo(f).font;
+       return fontinfo(f).metrics;
 }
 
-/// Get the QFont for this FontInfo
-GuiFontInfo const & getFontInfo(FontInfo const & f)
+
+QFont const & getFont(FontInfo const & f)
 {
-       return fontinfo(f);
+       return fontinfo(f).font;
 }
 
 } // namespace frontend