This should clean up the language stuff a bit and a small new check for

[features.git] / src / layout.C

diff --git a/src/layout.C b/src/layout.C
index 27efc567d46a80a833a3523a67c4f1122cc99b45..c36558ab04b9d8497ad34061c52e60fbafe913ed 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -775,9 +775,9 @@ bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
        if (!lay.Read(lexrc, *this)) {
                // Reslove fonts
                lay.resfont = lay.font;
-               lay.resfont.realize(defaultfont());
+               lay.resfont.realize(defaultfont(), default_language);
                lay.reslabelfont = lay.labelfont;
-               lay.reslabelfont.realize(defaultfont());
+               lay.reslabelfont.realize(defaultfont(), default_language);
                return false; // no errors
        } 
        lyxerr << "Error parsing style `" << lay.name() << "'" << endl;
@@ -938,7 +938,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        if (!defaultfont_.resolved()) {
                                lexrc.printError("Warning: defaultfont should "
                                                 "be fully instantiated!");
-                               defaultfont_.realize(LyXFont(LyXFont::ALL_SANE));
+                               defaultfont_.realize(LyXFont(LyXFont::ALL_SANE),
+                                                    default_language);
                        }
                        break;