anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert earlier undocumented change (useful comment, isn't it?)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10322 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-07-18 12:15:33 +00:00
parent f5e68ec257
commit 75c0ec1c42
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2005-07-18 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* FontInfo.C (query): revert earlier undocumented change.
2005-07-17 Michael Schmitt <michael.schmitt@teststep.org>
* ColorHandler.C: fix bformat message

24
src/frontends/xforms/xfont_loader.C
View File

@ -301,20 +301,6 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
getFontinfo(family, series, shape);
LyXFont f;
f.setFamily(family);
f.setSeries(series);
f.setShape(shape);
f.setSize(size);
// The rest of the attributes are not interesting
f.setEmph(LyXFont::INHERIT);
f.setUnderbar(LyXFont::INHERIT);
f.setNoun(LyXFont::INHERIT);
f.setColor(LColor::inherit);
if (f.isSymbolFont() && !fontinfo[family][series][shape]->exist())
return 0;
// FIXME! CHECK! Should we use 72.0 or 72.27? (Lgb)
int fsize = int((convert<double>(lyxrc.font_sizes[size]) * lyxrc.dpi *
(lyxrc.zoom/100.0)) / 72.27 + 0.5);
@ -341,6 +327,16 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
}
} else if (lyxerr.debugging(Debug::FONT)) {
// Tell user the font matching
LyXFont f;
f.setFamily(family);
f.setSeries(series);
f.setShape(shape);
f.setSize(size);
// The rest of the attributes are not interesting
f.setEmph(LyXFont::INHERIT);
f.setUnderbar(LyXFont::INHERIT);
f.setNoun(LyXFont::INHERIT);
f.setColor(LColor::inherit);
lyxerr << "Font '" << f.stateText(0)
<< "' matched by\n" << font << endl;
}