From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 21 Nov 2009 15:33:41 +0000 (+0000)
Subject: Fix bug #6113: Customized font color in footnote is not rendered in LyX.
X-Git-Tag: 2.0.0~5064
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5b7a7cca73fc324922f32542af5e64e8ac3bbec1;p=features.git

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

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
---

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index d277bdcc1f..fa7ef71e03 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -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
@@ -92,14 +85,7 @@ InsetLayout Foot
 	LabelString           foot
 	Counter               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
@@ -241,14 +227,7 @@ InsetLayout Index
 	LabelString           Idx
 	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
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 336d75f536..cd8fbeb2ed 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -246,9 +246,9 @@ 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;
+	Font tmp(font); 
+	tmp.fontInfo().realize(lf.fontInfo()); 
+	font = tmp;
 }