#include "Citation.h"
#include "ColorCode.h"
#include "Counters.h"
+#include "DocumentClassPtr.h"
#include "FloatList.h"
#include "FontInfo.h"
#include "Layout.h"
#include "support/docstring.h"
#include "support/types.h"
-#include <boost/noncopyable.hpp>
-
#include <list>
#include <map>
#include <set>
///
std::string const & name() const { return name_; }
///
+ std::string const & category() const { return category_; }
+ ///
std::string const & description() const { return description_; }
///
std::string const & latexname() const { return latexname_; }
///
- std::string const & prerequisites() const;
+ std::string const & prerequisites(std::string const & sep = "\n\t") const;
/// Can be LaTeX, DocBook, etc.
OutputType outputType() const { return outputType_; }
/// Can be latex, docbook ... (the name of a format)
mutable LayoutList layoutlist_;
/// Layout file name
std::string name_;
+ /// Class category
+ std::string category_;
/// document class name
std::string latexname_;
/// document class description
///
bool deleteLayout(docstring const &);
///
+ bool deleteInsetLayout(docstring const &);
+ ///
bool convertLayoutFormat(support::FileName const &, ReadType);
/// Reads the layout file without running layout2layout.
ReturnValues readWithoutConv(support::FileName const & filename, ReadType rt);
/// In the main LyX code, DocumentClass objects are created only by
/// DocumentClassBundle, for which see below.
///
-class DocumentClass : public TextClass, boost::noncopyable {
+class DocumentClass : public TextClass {
public:
///
virtual ~DocumentClass() {}
/// \return true if there is a Layout with latexname lay
bool hasLaTeXLayout(std::string const & lay) const;
/// A DocumentClass nevers count as loaded, since it is dynamic
- virtual bool loaded() { return false; }
+ virtual bool loaded() const { return false; }
/// \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:
docstring const & htmlpreamble() const { return htmlpreamble_; }
///
docstring const & htmlstyles() const { return htmlstyles_; }
+ ///
+ Layout const & getTOCLayout() const;
/// the paragraph style to use for TOCs, Bibliography, etc
/// we will attempt to calculate this if it was not given
Layout const & htmlTOCLayout() const;
private:
/// The only class that can create a DocumentClass is
/// DocumentClassBundle, which calls the protected constructor.
- friend class DocumentClassBundle;
+ friend DocumentClassPtr
+ getDocumentClass(LayoutFile const &, LayoutModuleList const &);
///
static InsetLayout plain_insetlayout_;
};
-/// DocumentClassBundle is a container for DocumentClass objects, so that
-/// they stay in memory for use by Insets, CutAndPaste, and the like, even
-/// when their associated Buffers are destroyed.
-/// FIXME Some sort of garbage collection or reference counting wouldn't
-/// be a bad idea here. It might be enough to check when a Buffer is closed
-/// (or makeDocumentClass is called) whether the old DocumentClass is in use
-/// anywhere.
-///
-/// This is a singleton class. Its sole instance is accessed via
-/// DocumentClassBundle::get().
-class DocumentClassBundle : boost::noncopyable {
-public:
- /// \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,
+/// The only way to make a DocumentClass is to call this function.
+/// The shared_ptr is needed because DocumentClass objects can be kept
+/// in memory long after their associated Buffer is destroyed, mostly
+/// on the CutStack.
+DocumentClassPtr getDocumentClass(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_;
-};
-
/// convert page sides option to text 1 or 2
std::ostream & operator<<(std::ostream & os, PageSides p);