Revert part of 21965 which was debugging code.

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 6754df98b8c0d553c739abac9112a553cc063ebf..0e4943dab1b5efbddc5789f11eb6457191f69fcc 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -14,7 +14,7 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
-#include "Font.h"
+#include "FontInfo.h"
 #include "LayoutEnums.h"
 #include "Spacing.h"
 #include "support/docstring.h"
@@ -94,30 +94,30 @@ public:
        }
        /** Default font for this layout/environment.
            The main font for this kind of environment. If an attribute has
-           Font::INHERITED_*, it means that the value is specified by
+           INHERITED_*, it means that the value is specified by
            the defaultfont for the entire layout. If we are nested, the
            font is inherited from the font in the environment one level
-           up until the font is resolved. The values Font::IGNORE_*
-           and Font::TOGGLE are illegal here.
+           up until the font is resolved. The values :IGNORE_*
+           and FONT_TOGGLE are illegal here.
        */
-       Font font;
+       FontInfo font;
 
        /** Default font for labels.
            Interpretation the same as for font above
        */
-       Font labelfont;
+       FontInfo labelfont;
 
        /** Resolved version of the font for this layout/environment.
            This is a resolved version the default font. The font is resolved
            against the defaultfont of the entire layout.
        */
-       Font resfont;
+       FontInfo resfont;
 
        /** Resolved version of the font used for labels.
            This is a resolved version the label font. The font is resolved
            against the defaultfont of the entire layout.
        */
-       Font reslabelfont;
+       FontInfo reslabelfont;
 
        /// Text that dictates how wide the left margin is on the screen
        docstring leftmargin;
@@ -252,7 +252,6 @@ private:
        docstring preamble_;
 };
 
-
 } // namespace lyx
 
 #endif