simplification

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 26740fc2b62f41d5fec4dfe6e853a7c9db75a94f..13edbf46dd6ad01fbbe23205b466fa5f66a951cc 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -27,7 +27,7 @@ namespace lyx {
 using support::subst;
 using support::trim;
 
-extern FontInfo lyxRead(Lexer &);
+extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
 
 /// Special value of toclevel for layouts that to not belong in a TOC
 const int Layout::NOT_IN_TOC = -1000;
@@ -311,16 +311,16 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
                        break;
 
                case LT_FONT:
-                       font = lyxRead(lexrc);
+                       font = lyxRead(lexrc, font);
                        labelfont = font;
                        break;
 
                case LT_TEXTFONT:
-                       font = lyxRead(lexrc);
+                       font = lyxRead(lexrc, font);
                        break;
 
                case LT_LABELFONT:
-                       labelfont = lyxRead(lexrc);
+                       labelfont = lyxRead(lexrc, labelfont);
                        break;
 
                case LT_NEXTNOINDENT:   // Indent next paragraph?