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 d277bdcc1fcdc94f56ede208f3ee994bf420b384..fa7ef71e033d10943d92ca979fb7041667a73aed 100644 (file)
--- 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 336d75f5363ede124ed391146b1bc43aad5b6f93..cd8fbeb2edde48bc4d54687168dfc444ccaa20d9 100644 (file)
--- 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;
 }