X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=64fa9aa127a7ef2b8b7773ac1ee63221e09a12b8;hb=4d3a08bf860baca24211e91a6b8569f01bc94a4f;hp=570e67f8d4e3edaef3717ae7d0aa98cc2ff0fea0;hpb=3d590d3bd71a3522d525ce71220e99bd25b6a648;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index 570e67f8d4..64fa9aa127 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -271,12 +271,22 @@ 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_;
 	///
+	std::string tablestyle_;
+	///
 	std::string class_header_;
 	///
 	docstring defaultlayout_;
@@ -351,8 +361,12 @@ protected:
 	bool cite_full_author_list_;
 	/// The possible citation styles
 	std::map<CiteEngineType, std::vector<CitationStyle> > cite_styles_;
+	/// Class-added citation styles
+	std::map<CiteEngineType, std::vector<CitationStyle> > class_cite_styles_;
 	///
 	std::map<std::string, docstring> outliner_names_;
+	/// Does this class put the bibliography to toc by itself?
+	bool bibintoc_;
 private:
 	///////////////////////////////////////////////////////////////////
 	// helper routines for reading layout files
@@ -380,11 +394,13 @@ private:
 	///
 	bool readFloat(Lexer &);
 	///
-	bool readCiteEngine(Lexer &);
+	std::vector<CitationStyle> const & getCiteStyles(CiteEngineType const &) const;
+	///
+	bool readCiteEngine(Lexer &, ReadType, bool const add = false);
 	///
 	int readCiteEngineType(Lexer &) const;
 	///
-	bool readCiteFormat(Lexer &);
+	bool readCiteFormat(Lexer &, ReadType);
 	///
 	bool readOutlinerName(Lexer &);
 };
@@ -441,14 +457,24 @@ 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_; }
+	///
 	docstring const & preamble() const { return preamble_; }
 	///
 	docstring const & htmlpreamble() const { return htmlpreamble_; }
@@ -464,7 +490,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 requires_; }
 	/// package options to write to LaTeX file
 	std::map<std::string, std::string> const & packageOptions() const
 		{ return package_options_; }
@@ -515,6 +541,8 @@ public:
 	size_t max_citenames() const { return maxcitenames_; }
 	///
 	bool const & fullAuthorList() const { return cite_full_author_list_; }
+	///
+	bool const & bibInToc() const { return bibintoc_; }
 protected:
 	/// Constructs a DocumentClass based upon a LayoutFile.
 	DocumentClass(LayoutFile const & tc);
@@ -524,7 +552,7 @@ private:
 	/// The only way to make a DocumentClass is to call this function.
 	friend DocumentClassPtr
 		getDocumentClass(LayoutFile const &, LayoutModuleList const &,
-				 LayoutModuleList const &,
+				 std::string const &,
 				 bool const clone);
 };
 
@@ -535,7 +563,7 @@ private:
 /// on the CutStack.
 DocumentClassPtr getDocumentClass(LayoutFile const & baseClass,
 			LayoutModuleList const & modlist,
-			LayoutModuleList const & celist,
+			std::string const & cengine = std::string(),
 			bool const clone = false);
 
 /// convert page sides option to text 1 or 2