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 3759fbf3cdebcdb5f6576ff160140cc44f7d7a6b..9e4a9ca36fd4e791efedc75c1adf0b659389ace1 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -30,7 +30,7 @@
 #include <QFontInfo>
 #include <QFontDatabase>
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -69,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]);
@@ -120,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 =
@@ -250,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;
                                }
-       }
 }