anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6113: Customized font color in footnote is not rendered in LyX.

Browse Source 
It seems we realized the font in the wrong order. If the layout font specifies "Font Size Small", we should be able to make it large if we want to.

see:
http://thread.gmane.org/gmane.editors.lyx.devel/122682

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32129 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-11-21 15:33:41 +00:00
parent 31df777716
commit 5b7a7cca73
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/layouts/stdinsets.inc
View File

@ -62,14 +62,7 @@ InsetLayout Marginal
LatexType command LatexType command
LatexName marginpar LatexName marginpar
Font Font
Color foreground
Size Small Size Small
Family Roman
Shape Up
Series Medium
Misc No_Emph
Misc No_Noun
Misc No_Bar
EndFont EndFont
LabelFont LabelFont
Color marginlabel Color marginlabel
@ -92,14 +85,7 @@ InsetLayout Foot
LabelString foot LabelString foot
Counter footnote Counter footnote
Font Font
Color foreground
Size Small Size Small
Family Roman
Shape Up
Series Medium
Misc No_Emph
Misc No_Noun
Misc No_Bar
EndFont EndFont
LabelFont LabelFont
Color footlabel Color footlabel
@ -241,14 +227,7 @@ InsetLayout Index
LabelString Idx LabelString Idx
Decoration classic Decoration classic
Font Font
Color foreground
Size Small Size Small
Family Roman
Shape Up
Series Medium
Misc No_Emph
Misc No_Noun
Misc No_Bar
EndFont EndFont
LabelFont LabelFont
Color indexlabel Color indexlabel

6
src/TextMetrics.cpp
View File

@ -246,9 +246,9 @@ void TextMetrics::applyOuterFont(Font & font) const
{ {
Font lf(font_); Font lf(font_);
lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo()); lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo());
lf.fontInfo().realize(font.fontInfo()); Font tmp(font);
lf.setLanguage(font.language()); tmp.fontInfo().realize(lf.fontInfo());
font = lf; font = tmp;
} }