#include "debug.h"
#include "lyxrc.h"
#include "BufferView.h"
+#include "qt_helpers.h"
#include <qglobal.h>
-#if QT_VERSION < 0x030000
+#if QT_VERSION < 300
#include "support/lstrings.h"
#endif
+#ifdef Q_WS_X11
+#include <qwidget.h>
+#include <X11/Xlib.h>
+#include "support/systemcall.h"
+#include "support/filetools.h"
+#endif
+
using std::endl;
qfont_loader::qfont_loader()
{
+ for (int i1 = 0; i1 < LyXFont::NUM_FAMILIES; ++i1) {
+ for (int i2 = 0; i2 < 2; ++i2) {
+ for (int i3 = 0; i3 < 4; ++i3) {
+ for (int i4 = 0; i4 < 10; ++i4) {
+ fontinfo_[i1][i2][i3][i4] = 0;
+ }
+ }
+ }
+ }
}
void qfont_loader::update()
{
for (int i1 = 0; i1 < LyXFont::NUM_FAMILIES; ++i1) {
- for (int i2 = 0; i1 < 2; ++i2) {
- for (int i3 = 0; i1 < 4; ++i3) {
- for (int i4 = 0; i1 < 10; ++i4) {
- fontinfo_[i1][i2][i3][i4].reset(0);
+ 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;
}
}
}
return ret;
}
+namespace {
+
+string const symbolPattern(LyXFont::FONT_FAMILY family)
+{
+ switch (family) {
+ case LyXFont::SYMBOL_FAMILY:
+ return "-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific";
+
+ case LyXFont::CMR_FAMILY:
+ return "-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+ case LyXFont::CMSY_FAMILY:
+ return "-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+ case LyXFont::CMM_FAMILY:
+ return "-*-cmmi10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+ case LyXFont::CMEX_FAMILY:
+ return "-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+ case LyXFont::MSA_FAMILY:
+ return "-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+ case LyXFont::MSB_FAMILY:
+ return "-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+ case LyXFont::EUFRAK_FAMILY:
+ return "-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+ case LyXFont::WASY_FAMILY:
+ return "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+ default:
+ return string();
+ }
+}
+
+bool addFontPath()
+{
+#ifdef Q_WS_X11
+ string const dir = OnlyPath(LibFileSearch("xfonts", "fonts.dir"));
+ if (!dir.empty()) {
+ QWidget w;
+ int n;
+ char ** p = XGetFontPath(w.x11Display(), &n);
+ if (std::find(p, p + n, dir) != p + n)
+ return false;
+ lyxerr << "Adding " << dir << " to the font path.\n";
+ string const command = "xset fp+ " + dir;
+ Systemcall s;
+ if (!s.startscript(Systemcall::Wait, command))
+ return true;
+ lyxerr << "Unable to add font path.\n";
+ }
+#endif
+ return false;
+}
+
+bool isAvailable(QFont const & font, LyXFont const & f) {
+#if QT_VERSION >= 300
+ return font.exactMatch();
+#else
+ string tmp = symbolPattern(f.family());
+ if (tmp.empty())
+ return false;
+ else
+ return token(tmp, '-', 2) ==
+ token(font.rawName().latin1(), '-', 2);
+#endif
+}
+
+} // namespace anon
qfont_loader::font_info::font_info(LyXFont const & f)
: metrics(font)
{
- switch (f.family()) {
- case LyXFont::SYMBOL_FAMILY:
- font.setRawName("-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific");
- break;
- case LyXFont::CMR_FAMILY:
- font.setRawName("-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*");
- break;
- case LyXFont::CMSY_FAMILY:
- font.setRawName("-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*");
- break;
- case LyXFont::CMM_FAMILY:
- font.setRawName("-*-cmmi10-medium-*-*-*-*-*-*-*-*-*-*-*");
- break;
- case LyXFont::CMEX_FAMILY:
- font.setRawName("-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*");
- break;
- case LyXFont::MSA_FAMILY:
- font.setRawName("-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*");
- break;
- case LyXFont::MSB_FAMILY:
- font.setRawName("-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*");
- break;
- case LyXFont::EUFRAK_FAMILY:
- font.setRawName("-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*");
- break;
+
+ string pat = symbolPattern(f.family());
+ if (!pat.empty()) {
+ static bool first_time = true;
+ font.setRawName(pat.c_str());
+ if (f.family() != LyXFont::SYMBOL_FAMILY &&
+ !isAvailable(font, f) && first_time) {
+ first_time = false;
+ if (addFontPath()) {
+ font.setRawName(pat.c_str());
+ }
+ }
+ } else
+ switch (f.family()) {
case LyXFont::ROMAN_FAMILY:
- font.setFamily("times");
+ font.setFamily(makeFontName(lyxrc.roman_font_name,
+ lyxrc.roman_font_foundry).c_str());
break;
case LyXFont::SANS_FAMILY:
- font.setFamily("helvetica");
+ font.setFamily(makeFontName(lyxrc.sans_font_name,
+ lyxrc.sans_font_foundry).c_str());
break;
case LyXFont::TYPEWRITER_FAMILY:
- font.setFamily("courier");
+ font.setFamily(makeFontName(lyxrc.typewriter_font_name,
+ lyxrc.typewriter_font_foundry).c_str());
+ break;
+ default:
break;
}
font.setPointSizeFloat(lyxrc.font_sizes[f.size()]
* lyxrc.zoom / 100.0);
- // FIXME: lyxrc, check for failure etc.
-
switch (f.series()) {
case LyXFont::MEDIUM_SERIES:
font.setWeight(QFont::Normal);
// FIXME
}
- font_info * fi = fontinfo_[f.family()][f.series()][f.realShape()][f.size()].get();
+ font_info const * fi = fontinfo_[f.family()][f.series()][f.realShape()][f.size()];
if (!fi) {
fi = new font_info(f);
- fontinfo_[f.family()][f.series()][f.realShape()][f.size()].reset(fi);
+ fontinfo_[f.family()][f.series()][f.realShape()][f.size()] = fi;
}
return fi;
if (!lyxrc.use_gui)
return false;
-#if QT_VERSION >= 0x030000
- return getfontinfo(f)->font.exactMatch();
-#else
- string tmp;
- switch (f.family()) {
- case LyXFont::SYMBOL_FAMILY: tmp = "symbol"; break;
- case LyXFont::CMR_FAMILY: tmp = "cmr10"; break;
- case LyXFont::CMSY_FAMILY: tmp = "cmsy10"; break;
- case LyXFont::CMM_FAMILY: tmp = "cmmi10"; break;
- case LyXFont::CMEX_FAMILY: tmp = "cmex10"; break;
- case LyXFont::MSA_FAMILY: tmp = "msam10"; break;
- case LyXFont::MSB_FAMILY: tmp = "msbm10"; break;
- default: break;
- }
- if (tmp.empty())
- return false;
- else
- return token(getfontinfo(f)->font.rawName().latin1(), '-', 2)
- == tmp;
-#endif
+ return isAvailable(getfontinfo(f)->font, f);
}
projects / lyx.git / blobdiff