#include "FontInfo.h"
#include "Layout.h"
#include "LayoutEnums.h"
+#include "LayoutModuleList.h"
#include "insets/InsetLayout.h"
typedef std::map<docstring, InsetLayout> InsetLayouts;
///
typedef LayoutList::const_iterator const_iterator;
-
+
///////////////////////////////////////////////////////////////////
// Iterators
///////////////////////////////////////////////////////////////////
bool isPlainLayout(Layout const &) const;
/// returns a special layout for use when we don't really want one,
/// e.g., in table cells
- Layout const & emptyLayout() const
- { return operator[](emptylayout_); };
- /// the name of the empty layout
- docstring const & emptyLayoutName() const
- { return emptylayout_; }
+ Layout const & plainLayout() const
+ { return operator[](plain_layout_); };
+ /// the name of the plain layout
+ docstring const & plainLayoutName() const
+ { return plain_layout_; }
/// Enumerate the paragraph styles.
size_t layoutCount() const { return layoutlist_.size(); }
///
bool hasLayout(docstring const & name) const;
///
+ bool hasInsetLayout(docstring const & name) const;
+ ///
Layout const & operator[](docstring const & vname) const;
/// Inset layouts of this doc class
InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
/// Protect construction
TextClass();
///
- Layout & operator[](docstring const & vname);
- /// Create an empty layout for this textclass.
- /** \param unknown Set to true if this layout is a default layout used to
- * represent an unknown layout
+ Layout & operator[](docstring const & name);
+ /** Create an new, very basic layout for this textclass. This is used for
+ the Plain Layout common to all TextClass objects and also, in
+ DocumentClass, for the creation of new layouts `on the fly' when
+ previously unknown layouts are encountered.
+ \param unknown Set to true if this layout is used to represent an
+ unknown layout
*/
- Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
+ Layout createBasicLayout(docstring const & name, bool unknown = false) const;
///////////////////////////////////////////////////////////////////
// non-const iterators
std::string class_header_;
///
docstring defaultlayout_;
- /// name of empty layout
- static const docstring emptylayout_;
+ /// name of plain layout
+ static const docstring plain_layout_;
/// preamble text to support layout styles
docstring preamble_;
/// latex packages loaded by document class.
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_;
+ /// default modules wanted by document class
+ LayoutModuleList default_modules_;
+ /// modules provided by document class
+ LayoutModuleList provided_modules_;
+ /// modules excluded by document class
+ LayoutModuleList excluded_modules_;
///
unsigned int columns_;
///
bool deleteLayout(docstring const &);
///
bool convertLayoutFormat(support::FileName const &, ReadType);
+ /// Reads the layout file without running layout2layout.
+ ReturnValues readWithoutConv(support::FileName const & filename, ReadType rt);
/// \return true for success.
bool readStyle(Lexer &, Layout &) const;
///
void readCharStyle(Lexer &, std::string const &);
///
void readFloat(Lexer &);
- ///
- void readCounter(Lexer &);
};
/// 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_; }
- /// add an empty layout \c name if it does not exist in layoutlist_
+ /// a plain inset layout for use as a default
+ static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
+ /// add a new layout \c name if it does not exist in layoutlist_
void addLayoutIfNeeded(docstring const & name) const;
///////////////////////////////////////////////////////////////////
/// DocumentClassBundle, which calls the protected constructor.
friend class DocumentClassBundle;
///
- static InsetLayout empty_insetlayout_;
+ static InsetLayout plain_insetlayout_;
};
/// DocumentClassBundle::get().
class DocumentClassBundle : boost::noncopyable {
public:
- /// \return Pointer to a new class equal to baseClass
- DocumentClass & newClass(LayoutFile const & baseClass);
/// \return The sole instance of this class.
static DocumentClassBundle & get();
+ /// \return A new DocumentClass based on baseClass, with info added
+ /// from the modules in modlist.
+ DocumentClass & makeDocumentClass(LayoutFile const & baseClass,
+ LayoutModuleList const & modlist);
private:
/// control instantiation
DocumentClassBundle() {}
/// clean up
~DocumentClassBundle();
+ /// \return Reference to a new DocumentClass equal to baseClass
+ DocumentClass & newClass(LayoutFile const & baseClass);
///
std::vector<DocumentClass *> documentClasses_;
};