mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-16 07:55:41 +00:00
e30f3d76d2
This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.
451 lines
10 KiB
C++
451 lines
10 KiB
C++
/**
|
|
* \file FontLoader.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Asger Alstrup
|
|
* \author John Levon
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "FontLoader.h"
|
|
|
|
#include "FontInfo.h"
|
|
#include "GuiFontMetrics.h"
|
|
#include "qt_helpers.h"
|
|
|
|
#include "LyXRC.h"
|
|
|
|
#include "support/debug.h"
|
|
#include "support/filetools.h"
|
|
#include "support/gettext.h"
|
|
#include "support/lstrings.h"
|
|
#include "support/Systemcall.h"
|
|
#include "support/Package.h"
|
|
#include "support/os.h"
|
|
|
|
#include <QFontInfo>
|
|
#include <QFontDatabase>
|
|
|
|
#include "support/lassert.h"
|
|
|
|
using namespace std;
|
|
using namespace lyx::support;
|
|
|
|
QString const math_fonts[] = {"cmex10", "cmmi10", "cmr10", "cmsy10",
|
|
"esint10", "eufm10", "msam10", "msbm10", "rsfs10", "stmary10",
|
|
"wasy10"};
|
|
int const num_math_fonts = sizeof(math_fonts) / sizeof(*math_fonts);
|
|
|
|
namespace lyx {
|
|
|
|
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 {
|
|
FontFamily lyx_family;
|
|
QString family;
|
|
QString xlfd;
|
|
};
|
|
|
|
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-*-*-*-*-*-*-*-*-*-*-*" },
|
|
{ RSFS_FAMILY, "rsfs10", "-*-rsfs10-medium-*-*-*-*-*-*-*-*-*-*-*" },
|
|
{ STMARY_FAMILY,"stmary10","-*-stmary10-medium-*-*-*-*-*-*-*-*-*-*-*" },
|
|
{ WASY_FAMILY, "wasy10", "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*" },
|
|
{ ESINT_FAMILY, "esint10","-*-esint10-medium-*-*-*-*-*-*-*-*-*-*-*" }
|
|
};
|
|
|
|
size_t const nr_symbol_fonts = sizeof(symbol_fonts) / sizeof(symbol_fonts[0]);
|
|
|
|
/// BUTT ugly !
|
|
static GuiFontInfo *
|
|
fontinfo_[NUM_FAMILIES][NUM_SERIES][NUM_SHAPE][NUM_SIZE][NUM_STYLE];
|
|
|
|
|
|
// returns a reference to the pointer type (GuiFontInfo *) in the
|
|
// fontinfo_ table.
|
|
GuiFontInfo * & fontinfo_ptr(FontInfo const & f)
|
|
{
|
|
// The display font and the text font are the same
|
|
size_t const style = (f.style() == LM_ST_DISPLAY) ? LM_ST_TEXT : f.style();
|
|
return fontinfo_[f.family()][f.series()][f.realShape()][f.size()][style];
|
|
}
|
|
|
|
|
|
// Get font info (font + metrics) for the given LyX font.
|
|
// if not cached, create it.
|
|
GuiFontInfo & fontinfo(FontInfo const & f)
|
|
{
|
|
bool const fontIsRealized =
|
|
(f.family() < NUM_FAMILIES) &&
|
|
(f.series() < NUM_SERIES) &&
|
|
(f.realShape() < NUM_SHAPE) &&
|
|
(f.size() < NUM_SIZE);
|
|
if (!fontIsRealized) {
|
|
// We can reset the font to something sensible in release mode.
|
|
LATTEST(false);
|
|
LYXERR0("Unrealized font!");
|
|
FontInfo f2 = f;
|
|
f2.realize(sane_font);
|
|
GuiFontInfo * & fi = fontinfo_ptr(f2);
|
|
if (!fi)
|
|
fi = new GuiFontInfo(f2);
|
|
return *fi;
|
|
}
|
|
GuiFontInfo * & fi = fontinfo_ptr(f);
|
|
if (!fi)
|
|
fi = new GuiFontInfo(f);
|
|
return *fi;
|
|
}
|
|
|
|
|
|
QString rawName(QString const & family)
|
|
{
|
|
for (size_t i = 0; i < nr_symbol_fonts; ++i)
|
|
if (family == symbol_fonts[i].family)
|
|
return symbol_fonts[i].xlfd;
|
|
|
|
LYXERR(Debug::FONT, "BUG: family not found !");
|
|
return QString();
|
|
}
|
|
|
|
|
|
QString symbolFamily(FontFamily family)
|
|
{
|
|
for (size_t i = 0; i < nr_symbol_fonts; ++i) {
|
|
if (family == symbol_fonts[i].lyx_family)
|
|
return symbol_fonts[i].family;
|
|
}
|
|
return QString();
|
|
}
|
|
|
|
|
|
#if 0
|
|
bool isSymbolFamily(FontFamily family)
|
|
{
|
|
return family >= SYMBOL_FAMILY && family <= ESINT_FAMILY;
|
|
}
|
|
#endif
|
|
|
|
|
|
static bool isChosenFont(QFont & font, QString const & family,
|
|
QString const & style)
|
|
{
|
|
// QFontInfo won't find a font that has only a few glyphs at unusual
|
|
// positions, e.g. the original esint10 font.
|
|
// The workaround is to add dummy glyphs at least at all ASCII
|
|
// positions.
|
|
QFontInfo fi(font);
|
|
|
|
LYXERR(Debug::FONT, "got: " << fi.family());
|
|
|
|
if (fi.family().contains(family)
|
|
#if QT_VERSION >= 0x040800
|
|
&& (style.isEmpty() || fi.styleName().contains(style))
|
|
#endif
|
|
) {
|
|
LYXERR(Debug::FONT, " got it ");
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
|
|
QFont symbolFont(QString const & family, bool * ok)
|
|
{
|
|
LYXERR(Debug::FONT, "Looking for font family " << family << " ... ");
|
|
QString upper = family;
|
|
upper[0] = family[0].toUpper();
|
|
|
|
QFont font;
|
|
font.setFamily(family);
|
|
#if QT_VERSION >= 0x040800
|
|
font.setStyleName("LyX");
|
|
|
|
if (isChosenFont(font, family, "LyX")) {
|
|
LYXERR(Debug::FONT, "lyx!");
|
|
*ok = true;
|
|
return font;
|
|
}
|
|
|
|
LYXERR(Debug::FONT, "Trying normal " << family << " ... ");
|
|
font.setStyleName(QString());
|
|
#endif
|
|
|
|
if (isChosenFont(font, family, QString())) {
|
|
LYXERR(Debug::FONT, "normal!");
|
|
*ok = true;
|
|
return font;
|
|
}
|
|
|
|
LYXERR(Debug::FONT, "Trying " << upper << " ... ");
|
|
font.setFamily(upper);
|
|
|
|
if (isChosenFont(font, upper, QString())) {
|
|
LYXERR(Debug::FONT, "upper!");
|
|
*ok = true;
|
|
return font;
|
|
}
|
|
|
|
// A simple setFamily() fails on Qt 2
|
|
|
|
QString const raw = rawName(family);
|
|
LYXERR(Debug::FONT, "Trying " << raw << " ... ");
|
|
font.setRawName(raw);
|
|
|
|
if (isChosenFont(font, family, QString())) {
|
|
LYXERR(Debug::FONT, "raw version!");
|
|
*ok = true;
|
|
return font;
|
|
}
|
|
|
|
LYXERR(Debug::FONT, " FAILED :-(");
|
|
*ok = false;
|
|
return font;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
FontLoader::FontLoader()
|
|
{
|
|
QString const fonts_dir =
|
|
toqstr(addPath(package().system_support().absFileName(), "fonts"));
|
|
|
|
for (int i = 0 ; i < num_math_fonts; ++i) {
|
|
QString const font_file = fonts_dir + math_fonts[i] + ".ttf";
|
|
int fontID = QFontDatabase::addApplicationFont(font_file);
|
|
|
|
LYXERR(Debug::FONT, "Adding font " << font_file
|
|
<< (fontID < 0 ? " FAIL" : " OK"));
|
|
}
|
|
|
|
for (int i1 = 0; i1 < NUM_FAMILIES; ++i1)
|
|
for (int i2 = 0; i2 < NUM_SERIES; ++i2)
|
|
for (int i3 = 0; i3 < NUM_SHAPE; ++i3)
|
|
for (int i4 = 0; i4 < NUM_SIZE; ++i4)
|
|
for (int i5 = 0; i5 < NUM_STYLE; ++i5)
|
|
fontinfo_[i1][i2][i3][i4][i5] = 0;
|
|
}
|
|
|
|
|
|
void FontLoader::update()
|
|
{
|
|
for (int i1 = 0; i1 < NUM_FAMILIES; ++i1)
|
|
for (int i2 = 0; i2 < NUM_SERIES; ++i2)
|
|
for (int i3 = 0; i3 < NUM_SHAPE; ++i3)
|
|
for (int i4 = 0; i4 < NUM_SIZE; ++i4)
|
|
for (int i5 = 0; i5 < NUM_STYLE; ++i5) {
|
|
delete fontinfo_[i1][i2][i3][i4][i5];
|
|
fontinfo_[i1][i2][i3][i4][i5] = 0;
|
|
}
|
|
}
|
|
|
|
|
|
FontLoader::~FontLoader()
|
|
{
|
|
update();
|
|
}
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
namespace {
|
|
|
|
QString makeFontName(QString const & family, QString const & foundry)
|
|
{
|
|
QString res = family;
|
|
if (!foundry.isEmpty())
|
|
res += " [" + foundry + ']';
|
|
return res;
|
|
}
|
|
|
|
|
|
QFont makeQFont(FontInfo const & f)
|
|
{
|
|
QFont font;
|
|
QString const pat = symbolFamily(f.family());
|
|
if (!pat.isEmpty()) {
|
|
bool ok;
|
|
font = symbolFont(pat, &ok);
|
|
} else {
|
|
switch (f.family()) {
|
|
case ROMAN_FAMILY: {
|
|
QString family = makeFontName(toqstr(lyxrc.roman_font_name),
|
|
toqstr(lyxrc.roman_font_foundry));
|
|
font.setFamily(family);
|
|
#ifdef Q_OS_MAC
|
|
#if QT_VERSION >= 0x040300 //&& QT_VERSION < 0x040800
|
|
// Workaround for a Qt bug, see http://www.lyx.org/trac/ticket/3684
|
|
// and http://bugreports.qt.nokia.com/browse/QTBUG-11145.
|
|
// FIXME: Check whether this is really fixed in Qt 4.8
|
|
if (family == "Times" && !font.exactMatch())
|
|
font.setFamily("Times New Roman");
|
|
#endif
|
|
#endif
|
|
break;
|
|
}
|
|
case SANS_FAMILY:
|
|
font.setFamily(makeFontName(toqstr(lyxrc.sans_font_name),
|
|
toqstr(lyxrc.sans_font_foundry)));
|
|
break;
|
|
case TYPEWRITER_FAMILY:
|
|
font.setFamily(makeFontName(toqstr(lyxrc.typewriter_font_name),
|
|
toqstr(lyxrc.typewriter_font_foundry)));
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
switch (f.series()) {
|
|
case MEDIUM_SERIES:
|
|
font.setWeight(QFont::Normal);
|
|
break;
|
|
case BOLD_SERIES:
|
|
font.setWeight(QFont::Bold);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
switch (f.realShape()) {
|
|
case ITALIC_SHAPE:
|
|
font.setStyle(QFont::StyleItalic);
|
|
break;
|
|
case SLANTED_SHAPE:
|
|
font.setStyle(QFont::StyleOblique);
|
|
break;
|
|
case SMALLCAPS_SHAPE:
|
|
font.setCapitalization(QFont::SmallCaps);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
LYXERR(Debug::FONT, "Font '" << stateText(f)
|
|
<< "' matched by\n" << font.family());
|
|
|
|
// Is this an exact match?
|
|
if (font.exactMatch())
|
|
LYXERR(Debug::FONT, "This font is an exact match");
|
|
else
|
|
LYXERR(Debug::FONT, "This font is NOT an exact match");
|
|
|
|
LYXERR(Debug::FONT, "XFLD: " << font.rawName());
|
|
|
|
font.setPointSizeF(f.realSize() * lyxrc.currentZoom / 100.0);
|
|
|
|
LYXERR(Debug::FONT, "The font has size: " << font.pointSizeF());
|
|
|
|
return font;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
GuiFontInfo::GuiFontInfo(FontInfo const & f)
|
|
: font(makeQFont(f)), metrics(font)
|
|
{}
|
|
|
|
|
|
bool FontLoader::available(FontInfo const & f)
|
|
{
|
|
// FIXME THREAD
|
|
static vector<int> cache_set(NUM_FAMILIES, false);
|
|
static vector<int> cache(NUM_FAMILIES, false);
|
|
|
|
FontFamily family = f.family();
|
|
#ifdef Q_OS_MAC
|
|
// Apple ships a font name "Symbol", which has more or less the same
|
|
// glyphs as the original PostScript Symbol font, but it uses a different
|
|
// encoding (see https://en.wikipedia.org/wiki/Symbol_(typeface)#cite_note-2).
|
|
// Since we expect the font specific encoding of the original
|
|
// PostScript Symbol font, we can't use the one provided on OS X.
|
|
// See also the discussion in bug 7954.
|
|
if (f.family() == SYMBOL_FAMILY)
|
|
return false;
|
|
#endif
|
|
if (cache_set[family])
|
|
return cache[family];
|
|
cache_set[family] = true;
|
|
|
|
QString const pat = symbolFamily(family);
|
|
if (pat.isEmpty())
|
|
// We don't care about non-symbol fonts
|
|
return false;
|
|
|
|
bool ok;
|
|
symbolFont(pat, &ok);
|
|
if (!ok)
|
|
return false;
|
|
|
|
cache[family] = true;
|
|
return true;
|
|
}
|
|
|
|
|
|
bool FontLoader::canBeDisplayed(char_type c)
|
|
{
|
|
// bug 8493
|
|
if (c == 0x0009)
|
|
// FIXME check whether this is still needed for Qt5
|
|
return false;
|
|
#if QT_VERSION < 0x050000 && defined(QT_MAC_USE_COCOA) && (QT_MAC_USE_COCOA > 0)
|
|
// bug 7954, see also comment in GuiPainter::text()
|
|
if (c == 0x00ad)
|
|
return false;
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
|
|
FontMetrics const & FontLoader::metrics(FontInfo const & f)
|
|
{
|
|
return fontinfo(f).metrics;
|
|
}
|
|
|
|
|
|
GuiFontMetrics const & getFontMetrics(FontInfo const & f)
|
|
{
|
|
return fontinfo(f).metrics;
|
|
}
|
|
|
|
|
|
QFont const & getFont(FontInfo const & f)
|
|
{
|
|
return fontinfo(f).font;
|
|
}
|
|
|
|
} // namespace frontend
|
|
} // namespace lyx
|