better latin3&4 support

[lyx.git] / src / layout.C

diff --git a/src/layout.C b/src/layout.C
index e1db0bd5bf04b975bcfd451d4fbcb5dc9df50811..b4fb05f7337277dbb499475ae90c16d2ad285fa4 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -776,9 +776,15 @@ bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
        if (!lay.Read(lexrc, *this)) {
                // Reslove fonts
                lay.resfont = lay.font;
+#ifndef INHERIT_LANGUAGE
+               lay.resfont.realize(defaultfont());
+               lay.reslabelfont = lay.labelfont;
+               lay.reslabelfont.realize(defaultfont());
+#else
                lay.resfont.realize(defaultfont(), default_language);
                lay.reslabelfont = lay.labelfont;
                lay.reslabelfont.realize(defaultfont(), default_language);
+#endif
                return false; // no errors
        } 
        lyxerr << "Error parsing style `" << lay.name() << "'" << endl;
@@ -939,8 +945,12 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        if (!defaultfont_.resolved()) {
                                lexrc.printError("Warning: defaultfont should "
                                                 "be fully instantiated!");
+#ifndef INHERIT_LANGUAGE
+                               defaultfont_.realize(LyXFont(LyXFont::ALL_SANE));
+#else
                                defaultfont_.realize(LyXFont(LyXFont::ALL_SANE),
                                                     default_language);
+#endif
                        }
                        break;
 
@@ -1421,7 +1431,7 @@ bool LyXTextClassList::Read ()
                lyxerr << "LyXTextClassList::Read: no textclasses found!"
                       << endl;
                WriteAlert(_("LyX wasn't able to find any layout description!"),
-                          _("Check the contents of  the file \"textclass.lst\""),
+                          _("Check the contents of the file \"textclass.lst\""),
                           _("Sorry, has to exit :-("));
                return false;
        }