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

diff --git a/src/TextClass.h b/src/TextClass.h
index b84179fb9a..dc1b296475 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -207,6 +207,8 @@ public:
 	OutputType outputType() const { return outputType_; }
 	/// Can be latex, docbook ... (the name of a format)
 	std::string outputFormat() const { return outputFormat_; }
+	/// Does this class redefine the output format?
+	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_; }
@@ -275,6 +277,8 @@ protected:
 	///
 	std::string pagestyle_;
 	///
+	std::string tablestyle_;
+	///
 	std::string class_header_;
 	///
 	docstring defaultlayout_;
@@ -313,6 +317,8 @@ protected:
 	OutputType outputType_;
 	/// Can be latex, docbook ... (the name of a format)
 	std::string outputFormat_;
+	/// Does this class redefine the output format?
+	bool has_output_format_;
 	/** Base font. The paragraph and layout fonts are resolved against
 	    this font. This has to be fully instantiated. Attributes
 	    FONT_INHERIT, FONT_IGNORE, and FONT_TOGGLE are
@@ -347,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:
@@ -376,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 &);
 };
@@ -445,13 +455,15 @@ 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_; }
 	///
 	docstring const & htmlstyles() const { return htmlstyles_; }
 	/// Looks for the layout of "highest level", other than Part (or other
-	/// layouts with a negative toc number), for use in constructing TOCs and 
+	/// layouts with a negative toc number), for use in constructing TOCs and
 	/// similar information.
 	Layout const & getTOCLayout() const;
 	/// the paragraph style to use for TOCs, Bibliography, etc
@@ -520,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);
 };
 
@@ -531,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