Some more cleanup of LyXView:

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 79694fe0be2ca0f28d42f44f8829db79aca494df..13edbf46dd6ad01fbbe23205b466fa5f66a951cc 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -19,14 +19,15 @@
 
 #include "support/lstrings.h"
 
+using std::endl;
+using std::string;
 
 namespace lyx {
 
 using support::subst;
 using support::trim;
 
-using std::endl;
-using std::string;
+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;
@@ -94,8 +95,7 @@ enum LayoutTags {
 
 /////////////////////
 
-// Constructor for layout
-Layout::Layout ()
+Layout::Layout()
 {
        margintype = MARGIN_STATIC;
        latextype = LATEX_PARAGRAPH;
@@ -103,10 +103,10 @@ Layout::Layout ()
        optionalargs = 0;
        needprotect = false;
        keepempty = false;
-       font = Font(Font::ALL_INHERIT);
-       labelfont = Font(Font::ALL_INHERIT);
-       resfont = Font(Font::ALL_SANE);
-       reslabelfont = Font(Font::ALL_SANE);
+       font = inherit_font;
+       labelfont = inherit_font;
+       resfont = sane_font;
+       reslabelfont = sane_font;
        nextnoindent = false;
        parskip = 0.0;
        itemsep = 0;
@@ -131,7 +131,6 @@ Layout::Layout ()
 }
 
 
-// Reads a layout definition from file
 bool Layout::read(Lexer & lexrc, TextClass const & tclass)
 {
        // This table is sorted alphabetically [asierra 30March96]
@@ -312,16 +311,16 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
                        break;
 
                case LT_FONT:
-                       font.lyxRead(lexrc);
-                       labelfont= font;
+                       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?
@@ -656,17 +655,14 @@ void Layout::readLabelType(Lexer & lexrc)
 }
 
 
-namespace {
-
-keyword_item endlabelTypeTags[] = {
+static keyword_item endlabelTypeTags[] =
+{
        { "box",        END_LABEL_BOX },
        { "filled_box", END_LABEL_FILLED_BOX },
        { "no_label",   END_LABEL_NO_LABEL },
        { "static",     END_LABEL_STATIC }
 };
 
-} // namespace anon
-
 
 void Layout::readEndLabelType(Lexer & lexrc)
 {
@@ -681,7 +677,7 @@ void Layout::readEndLabelType(Lexer & lexrc)
        case END_LABEL_BOX:
        case END_LABEL_FILLED_BOX:
        case END_LABEL_NO_LABEL:
-               endlabeltype = static_cast<LYX_END_LABEL_TYPES>(le);
+               endlabeltype = static_cast<EndLabelType>(le);
                break;
        default:
                lyxerr << "Unhandled value " << le
@@ -713,7 +709,7 @@ void Layout::readMargin(Lexer & lexrc)
        case MARGIN_DYNAMIC:
        case MARGIN_FIRST_DYNAMIC:
        case MARGIN_RIGHT_ADDRESS_BOX:
-               margintype = static_cast<LYX_MARGIN_TYPE>(le);
+               margintype = static_cast<MarginType>(le);
                break;
        default:
                lyxerr << "Unhandled value " << le
@@ -746,7 +742,7 @@ void Layout::readLatexType(Lexer & lexrc)
        case LATEX_ITEM_ENVIRONMENT:
        case LATEX_BIB_ENVIRONMENT:
        case LATEX_LIST_ENVIRONMENT:
-               latextype = static_cast<LYX_LATEX_TYPES>(le);
+               latextype = static_cast<LatexType>(le);
                break;
        default:
                lyxerr << "Unhandled value " << le
@@ -805,9 +801,9 @@ docstring const & Layout::name() const
 }
 
 
-void Layout::setName(docstring const & n)
+void Layout::setName(docstring const & name)
 {
-       name_ = n;
+       name_ = name;
 }
 
 
@@ -833,6 +829,4 @@ Layout * Layout::forCaption()
        return lay;
 }
 
-
-
 } // namespace lyx