* reverting previous workarounds. With Martin's commit 21319 there are not needed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21320 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 7572a43f4a35a98905e4724b35dec74d11f5bcf1..9af627186b0d83a3040ca95af4fc1d32517c731e 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -311,16 +311,16 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
                        break;
 
                case LT_FONT:
-                       font = lyxRead(lexrc, sane_font);
+                       font = lyxRead(lexrc);
                        labelfont = font;
                        break;
 
                case LT_TEXTFONT:
-                       font = lyxRead(lexrc, sane_font);
+                       font = lyxRead(lexrc);
                        break;
 
                case LT_LABELFONT:
-                       labelfont = lyxRead(lexrc, sane_font);
+                       labelfont = lyxRead(lexrc);
                        break;
 
                case LT_NEXTNOINDENT:   // Indent next paragraph?

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 3f5721c9c658cfd078cef0d8b04854508e5b5832..16928031332bb1282a10d17074c7e69a618234c5 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!");