Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 2d640031f0d1178b350d0fce69fa60dca2ae53f1..5090a9ecfa17c2b21289d4228f1f340f54409133 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -96,11 +96,6 @@ public:
        // NOTE: Layout pointers are directly assigned to paragraphs so a
        // container that does not invalidate these pointers after insertion
        // is needed.
-       //
-       // NOTE: It makes sense to add unknown layouts to DocumentClass
-       // and make them buffer-dependent. However, this requires
-       // reimplementation of a lot of functions such as hasLayout
-       // and operator[], with little benefit.
        typedef std::list<Layout> LayoutList;
        /// The inset layouts available to this class
        typedef std::map<docstring, InsetLayout> InsetLayouts;
@@ -127,26 +122,21 @@ public:
        bool isDefaultLayout(Layout const &) const;
        /// 
        bool isPlainLayout(Layout const &) const;
-       /// Create a default layout for this textclass.
-       /** \param unknown Set to true if this layout is a default layout used to
-        * represent an unknown layout
-        */
-       Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
        /// returns a special layout for use when we don't really want one,
        /// e.g., in table cells
-       Layout const & emptyLayout() const 
+       Layout const & plainLayout() const 
                        { return operator[](emptylayout_); };
-       /// the name of the empty layout
-       docstring const & emptyLayoutName() const 
+       /// the name of the plain layout
+       docstring const & plainLayoutName() const 
                        { return emptylayout_; }
        /// Enumerate the paragraph styles.
        size_t layoutCount() const { return layoutlist_.size(); }
        ///
        bool hasLayout(docstring const & name) const;
-       /// add a default layout \c name if it does not exist in layoutlist_
-       void addLayoutIfNeeded(docstring const & name) const;
        ///
        Layout const & operator[](docstring const & vname) const;
+       /// Inset layouts of this doc class
+       InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
 
        ///////////////////////////////////////////////////////////////////
        // reading routines
@@ -201,7 +191,12 @@ protected:
        TextClass();
        ///
        Layout & operator[](docstring const & vname);
-
+       /// Create an new, empty layout for this textclass.
+       /** \param unknown Set to true if this layout is an empty layout used to
+        * represent an unknown layout
+        */
+       Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
+       
        ///////////////////////////////////////////////////////////////////
        // non-const iterators
        ///////////////////////////////////////////////////////////////////
@@ -245,7 +240,7 @@ protected:
        std::string class_header_;
        ///
        docstring defaultlayout_;
-       /// name of empty layout
+       /// name of plain layout
        static const docstring emptylayout_;
        /// preamble text to support layout styles
        docstring preamble_;
@@ -253,6 +248,8 @@ protected:
        std::set<std::string> provides_;
        /// latex packages requested by document class.
        std::set<std::string> requires_;
+       /// modules wanted by document class
+       std::set<std::string> usemod_;
        ///
        unsigned int columns_;
        ///
@@ -335,8 +332,6 @@ public:
        bool hasLaTeXLayout(std::string const & lay) const;
        /// A DocumentClass nevers count as loaded, since it is dynamic
        virtual bool loaded() { return false; }
-       /// Inset layouts of this doc class
-       InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
        /// \return the layout object of an inset given by name. If the name
        /// is not found as such, the part after the ':' is stripped off, and
        /// searched again. In this way, an error fallback can be provided:
@@ -345,8 +340,10 @@ public:
        /// If that doesn't work either, an empty object returns (shouldn't
        /// happen).  -- Idea JMarc, comment MV
        InsetLayout const & insetLayout(docstring const & name) const;
-       /// an empty inset layout for use as a default
-       static InsetLayout const & emptyInsetLayout() { return empty_insetlayout_; }
+       /// a plain inset layout for use as a default
+       static InsetLayout const & plainInsetLayout() { return empty_insetlayout_; }
+       /// add a new, empty layout \c name if it does not exist in layoutlist_
+       void addLayoutIfNeeded(docstring const & name) const;
 
        ///////////////////////////////////////////////////////////////////
        // accessors