Clean includes in TextMetrics.cpp

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 207b868a4b5379a5e2d5dd48eea288dd5b74317f..fa9ac20e1d21a65a65591890c8d31ee70dfc6b17 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -303,8 +303,13 @@ 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.
@@ -384,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 &);
        ///
@@ -430,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:
@@ -484,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.