Clean includes in TextMetrics.cpp

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 222384ff3419f06811c7764cdc52c0a2b9be5df7..fa9ac20e1d21a65a65591890c8d31ee70dfc6b17 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -211,7 +211,11 @@ public:
        bool hasOutputFormat() const { return has_output_format_; }
        /// Return the non-localised names for the toc types.
        std::map<std::string, docstring> const &
-       outlinerNames() const { return outliner_names_; }
+               outlinerNames() const { return outliner_names_; }
+       /// \returns Layout named \p name if it exists, otherwise 0
+       Layout const * getLayout(docstring const & name) const;
+       /// \returns Layout named \p name if it exists, otherwise 0
+       Layout * getLayout(docstring const & name);
 
 protected:
        /// Protect construction
@@ -271,9 +275,17 @@ protected:
        ///
        std::string opt_fontsize_;
        ///
+       std::string opt_pagesize_;
+       ///
        std::string opt_pagestyle_;
        /// Specific class options
        std::string options_;
+       /// Format of the fontsize option
+       std::string fontsize_format_;
+       /// Default page size
+       std::string pagesize_;
+       /// Format of the papersize option
+       std::string pagesize_format_;
        ///
        std::string pagestyle_;
        ///
@@ -291,12 +303,17 @@ protected:
        docstring htmlpreamble_;
        /// same, but specifically for CSS information
        docstring htmlstyles_;
-       /// the paragraph style to use for TOCs, Bibliography, etc
+       /// the paragraph style to use for TOCs, bibliography, etc.
        mutable docstring html_toc_section_;
+       /// root element when exporting as DocBook
+       std::string docbookroot_;
+       /// whether this root element does not accept text without a section (i.e. the first text that is met in LyX must
+       /// be considered as the abstract if this is true); this text must be output within <info> and <abstract>
+       bool docbookforceabstract_;
        /// latex packages loaded by document class.
        std::set<std::string> provides_;
        /// latex packages requested by document class.
-       std::set<std::string> requires_;
+       std::set<std::string> required_;
        ///
        std::map<std::string, std::string> package_options_;
        /// default modules wanted by document class
@@ -372,7 +389,7 @@ private:
        /// Reads the layout file without running layout2layout.
        ReturnValues readWithoutConv(support::FileName const & filename, ReadType rt);
        /// \return true for success.
-       bool readStyle(Lexer &, Layout &) const;
+       bool readStyle(Lexer &, Layout &, ReadType) const;
        ///
        void readOutputType(Lexer &);
        ///
@@ -418,7 +435,7 @@ public:
        /// \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() const { return false; }
+       bool loaded() const override { 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:
@@ -449,12 +466,20 @@ public:
        ///
        std::string const & opt_fontsize() const { return opt_fontsize_; }
        ///
+       std::string const & opt_pagesize() const { return opt_pagesize_; }
+       ///
        std::string const & opt_pagestyle() const { return opt_pagestyle_; }
        ///
        std::string const & options() const { return options_; }
        ///
        std::string const & class_header() const { return class_header_; }
        ///
+       std::string const & fontsizeformat() const { return fontsize_format_; }
+       ///
+       std::string const & pagesize() const { return pagesize_; }
+       ///
+       std::string const & pagesizeformat() const { return pagesize_format_; }
+       ///
        std::string const & pagestyle() const { return pagestyle_; }
        ///
        std::string const & tablestyle() const { return tablestyle_; }
@@ -464,6 +489,10 @@ public:
        docstring const & htmlpreamble() const { return htmlpreamble_; }
        ///
        docstring const & htmlstyles() const { return htmlstyles_; }
+       ///
+       bool const & docbookforceabstract() const { return docbookforceabstract_; }
+       ///
+       std::string const & docbookroot() const { return docbookroot_; }
        /// Looks for the layout of "highest level", other than Part (or other
        /// layouts with a negative toc number), for use in constructing TOCs and
        /// similar information.
@@ -474,7 +503,7 @@ public:
        /// is this feature already provided by the class?
        bool provides(std::string const & p) const;
        /// features required by the class?
-       std::set<std::string> const & requires() const { return requires_; }
+       std::set<std::string> const & required() const { return required_; }
        /// package options to write to LaTeX file
        std::map<std::string, std::string> const & packageOptions() const
                { return package_options_; }