anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: 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: r32129 and r32413, and
http://thread.gmane.org/gmane.editors.lyx.devel/122682

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@32437 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-12-09 02:15:51 +00:00
parent 3bfa5d3166
commit 45c3ece046
2 changed files with 3 additions and 26 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
LatexName marginpar
Font
Color foreground
Size Small
Family Roman
Shape Up
Series Medium
Misc No_Emph
Misc No_Noun
Misc No_Bar
EndFont
LabelFont
Color marginlabel
@ -83,14 +76,7 @@ InsetLayout Foot
LatexType command
LatexName footnote
Font
Color foreground
Size Small
Family Roman
Shape Up
Series Medium
Misc No_Emph
Misc No_Noun
Misc No_Bar
EndFont
LabelFont
Color footlabel
@ -192,14 +178,7 @@ InsetLayout Index
LatexName index
Decoration classic
Font
Color foreground
Size Small
Family Roman
Shape Up
Series Medium
Misc No_Emph
Misc No_Noun
Misc No_Bar
EndFont
LabelFont
Color indexlabel

8
src/TextMetrics.cpp
View File

@ -239,11 +239,9 @@ int TextMetrics::rightMargin(pit_type const pit) const
void TextMetrics::applyOuterFont(Font & font) const
{
Font lf(font_);
lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo());
lf.fontInfo().realize(font.fontInfo());
lf.setLanguage(font.language());
font = lf;
FontInfo lf(font_.fontInfo());
lf.reduce(bv_->buffer().params().getFont().fontInfo());
font.fontInfo().realize(lf);
}