#include "FontLoader.h"
#include "FontInfo.h"
-#include "GuiFontLoader.h"
+#include "GuiFontMetrics.h"
#include "qt_helpers.h"
#include "LyXRC.h"
#include <QFontInfo>
#include <QFontDatabase>
-#include <boost/assert.hpp>
+#include "support/lassert.h"
using namespace std;
using namespace lyx::support;
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 {
};
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]);
// 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 =
// 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 ");
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();
return font;
}
- LYXERR(Debug::FONT, "Trying " << fromqstr(upper) << " ... ");
+ LYXERR(Debug::FONT, "Trying " << upper << " ... ");
font.setFamily(upper);
if (isChosenFont(font, upper)) {
// 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 " << raw << " ... ");
+ font.setRawName(raw);
if (isChosenFont(font, family)) {
LYXERR(Debug::FONT, "raw version!");
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)
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;
}
- }
}
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
+ // 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.
if (family == "Times" && !font.exactMatch())
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())
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);
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
projects / lyx.git / blobdiff