X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=dc1b296475a1c9a8f7f3aeaa645c4a3bd3def913;hb=4da19ef8330fc90e712308d63aa7ddc0abfaef7b;hp=570e67f8d4e3edaef3717ae7d0aa98cc2ff0fea0;hpb=a3eab363646347155748a6a04794aa1f04829c49;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index 570e67f8d4..dc1b296475 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -277,6 +277,8 @@ protected:
 	///
 	std::string pagestyle_;
 	///
+	std::string tablestyle_;
+	///
 	std::string class_header_;
 	///
 	docstring defaultlayout_;
@@ -351,6 +353,8 @@ 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_;
 private:
@@ -380,11 +384,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 &);
 };
@@ -449,6 +455,8 @@ public:
 	///
 	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_; }
@@ -524,7 +532,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 +543,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