* Doxy: polish html output.

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 6754df98b8c0d553c739abac9112a553cc063ebf..fa4bdc2da23f3f8da951ee5bf071e82ad0101689 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -14,11 +14,14 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
-#include "Font.h"
+#include "FontInfo.h"
 #include "LayoutEnums.h"
 #include "Spacing.h"
 #include "support/docstring.h"
 
+#include <set>
+#include <string>
+
 namespace lyx {
 
 class Lexer;
@@ -81,6 +84,8 @@ public:
        ///
        docstring const & preamble() const { return preamble_; }
        ///
+       std::set<std::string> const & requires() const { return requires_; }
+       ///
        std::string const & latexparam() const { return latexparam_; }
        ///
        std::string const & innertag() const { return innertag_; }
@@ -94,30 +99,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;
@@ -250,9 +255,10 @@ private:
        std::string itemtag_;
        /// Macro definitions needed for this layout
        docstring preamble_;
+       /// Packages needed for this layout
+       std::set<std::string> requires_;
 };
 
-
 } // namespace lyx
 
 #endif