mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 09:15:50 +00:00
2007-07-10 Enrico Forestieri <forenr@tlc.unipr.it>
* qfont_loader.C (initFontPath, ): use AddFontResourceEx to mark our fonts as private (bug 3962) (~FontLoader): ditto with RemoveFontResourceEx. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@19028 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c992173f4c
commit
9fd9d8dcc2
@ -1,3 +1,9 @@
|
||||
2007-07-10 Enrico Forestieri <forenr@tlc.unipr.it>
|
||||
|
||||
* qfont_loader.C (initFontPath, ): use AddFontResourceEx
|
||||
to mark our fonts as private (bug 3962)
|
||||
(~FontLoader): ditto with RemoveFontResourceEx.
|
||||
|
||||
2007-04-10 Enrico Forestieri <forenr@tlc.unipr.it>
|
||||
|
||||
* QDelimiterDialog.C (fix_name): fix handling of names.
|
||||
|
@ -52,7 +52,9 @@ using std::string;
|
||||
#endif
|
||||
|
||||
#ifdef Q_WS_WIN
|
||||
#include "windows.h"
|
||||
// Require Windows API > Win98 (only needed for AddFontResourceEx)
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
#include "support/os.h"
|
||||
#include "support/package.h"
|
||||
#include "support/path.h"
|
||||
@ -100,9 +102,9 @@ void FontLoader::initFontPath()
|
||||
string const fonts_dir = AddPath(package().system_support(), "fonts");
|
||||
|
||||
for (int i = 0 ; i < num_fonts_truetype ; ++i) {
|
||||
string const font_current =
|
||||
AddName(fonts_dir, win_fonts_truetype[i] + ".ttf");
|
||||
AddFontResource(os::external_path(font_current).c_str());
|
||||
string const font_current = os::external_path(
|
||||
AddName(fonts_dir, win_fonts_truetype[i] + ".ttf"));
|
||||
AddFontResourceEx(font_current.c_str(), FR_PRIVATE, 0);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -113,9 +115,9 @@ FontLoader::~FontLoader() {
|
||||
string const fonts_dir = AddPath(package().system_support(), "fonts");
|
||||
|
||||
for(int i = 0 ; i < num_fonts_truetype ; ++i) {
|
||||
string const font_current =
|
||||
AddName(fonts_dir, win_fonts_truetype[i] + ".ttf");
|
||||
RemoveFontResource(os::external_path(font_current).c_str());
|
||||
string const font_current = os::external_path(
|
||||
AddName(fonts_dir, win_fonts_truetype[i] + ".ttf"));
|
||||
RemoveFontResourceEx(font_current.c_str(), FR_PRIVATE, 0);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -60,6 +60,9 @@ What's new
|
||||
|
||||
- Fix display of Theorem-like environments when in appendix (bug 3351)
|
||||
|
||||
- Fix conflict with globally installed math fonts, for ex. from
|
||||
Scientific Workplace (bug 3962, windows only)
|
||||
|
||||
- Properly keep existing previews when pasting formulas (bug 1486).
|
||||
|
||||
- Fix display of math root inset when the exponent contains large
|
||||
|
Loading…
Reference in New Issue
Block a user