/**
* \file FontInfo.C
- * Copyright 1997-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
* \author Asger Alstrup
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "FontInfo.h"
+
#include "debug.h"
#include "lyxrc.h" // lyxrc.use_scalable_fonts
+#include "frontends/lyx_gui.h"
+
#include "support/lstrings.h"
#include "support/lyxlib.h"
+#include "support/tostr.h"
-#include <cmath> // abs()
+#include "lyx_forms.h"
+
+#include <cmath>
+
+using lyx::support::atoi;
+using lyx::support::token;
-using std::endl;
using std::abs;
+using std::endl;
+using std::string;
-#include FORMS_H_LOCATION
/// Load font close to this size
string const FontInfo::getFontname(int size)
}
char ** list = 0;
- if (lyxrc.use_gui)
+ if (lyx_gui::use_gui)
list = XListFonts(fl_get_display(), pattern.c_str(),
100, &matches);
// We have matches. Run them through
for (int i = 0; i < matches; ++i) {
string name(list[i]);
- lyxerr[Debug::FONT] << "match #" << i << " "
+ lyxerr[Debug::FONT] << "match #" << i << ' '
<< name << endl;
- sizes[i] = lyx::atoi(token(name, '-', 7));
+ sizes[i] = atoi(token(name, '-', 7));
strings[i] = name;
if (sizes[i] == 0) {
if (scaleindex == -1) {
scaleindex = i;
}
scalable = true;
- };
+ } else if (atoi(token(name, '-', 12)) == 0)
+ // Ignore bogus matches of scalable fonts.
+ sizes[i] = 0;
};
XFreeFontNames(list);
}