X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=741bf33d8fe371da34f1feca6ad5213bc79b07ff;hb=125ed160d625368520074f2898c0487d30d46b98;hp=1e8582b1f0575c953b00d78145c7609fa4457398;hpb=50abaa0e570e154a3ea885d04bb013422614f021;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index 1e8582b1f0..741bf33d8f 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -15,7 +15,6 @@
 #include "DocumentClassPtr.h"
 #include "FloatList.h"
 #include "FontInfo.h"
-#include "Layout.h"
 #include "LayoutEnums.h"
 #include "LayoutModuleList.h"
 
@@ -38,7 +37,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-class Counters;
 class FloatList;
 class Layout;
 class LayoutFile;
@@ -211,7 +209,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
@@ -280,6 +282,8 @@ protected:
 	std::string fontsize_format_;
 	/// Default page size
 	std::string pagesize_;
+	/// Format of the papersize option
+	std::string pagesize_format_;
 	///
 	std::string pagestyle_;
 	///
@@ -297,12 +301,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
@@ -378,7 +387,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 &);
 	///
@@ -424,7 +433,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:
@@ -467,6 +476,8 @@ public:
 	///
 	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_; }
@@ -476,6 +487,10 @@ public:
 	docstring const & htmlpreamble() const { return htmlpreamble_; }
 	///
 	docstring const & htmlstyles() const { return htmlstyles_; }
+	///
+	bool 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.
@@ -486,7 +501,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_; }
@@ -536,9 +551,9 @@ public:
 	/// The maximum number of citations before "et al."
 	size_t max_citenames() const { return maxcitenames_; }
 	///
-	bool const & fullAuthorList() const { return cite_full_author_list_; }
+	bool fullAuthorList() const { return cite_full_author_list_; }
 	///
-	bool const & bibInToc() const { return bibintoc_; }
+	bool bibInToc() const { return bibintoc_; }
 protected:
 	/// Constructs a DocumentClass based upon a LayoutFile.
 	DocumentClass(LayoutFile const & tc);