Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 3f5721c9c658cfd078cef0d8b04854508e5b5832..c82b7367cfb1300dcf78a01f8d50701a4c5c43ce 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -366,7 +366,7 @@ bool TextClass::read(FileName const & filename, ReadType rt)
                        break;
 
                case TC_DEFAULTFONT:
-                       defaultfont_ = lyxRead(lexrc, sane_font);
+                       defaultfont_ = lyxRead(lexrc);
                        if (!defaultfont_.resolved()) {
                                lexrc.printError("Warning: defaultfont should "
                                                 "be fully instantiated!");
@@ -707,6 +707,9 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
                        break;
                case IL_LABELFONT:
                        labelfont = lyxRead(lexrc, inherit_font);
+                       // The label font is generally used as-is without
+                       // any realization against a given context.
+                       labelfont.realize(sane_font);
                        break;
                case IL_FORCELTR:
                        lexrc.next();