X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=b9ec227d4071c01f844274ffb48fed0d63753686;hb=05e2621a1782504d995f961f77edc604329ab1ee;hp=dbfb97436e890f55cc6f92d64b099400feb63cfb;hpb=979294d5ecd91f8831db234738f9e769966b391f;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index dbfb97436e..b9ec227d40 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -194,6 +194,8 @@ public:
 	///
 	std::string const & name() const { return name_; }
 	///
+	std::string const & path() const { return path_; }
+	///
 	std::string const & category() const { return category_; }
 	///
 	std::string const & description() const { return description_; }
@@ -205,8 +207,12 @@ public:
 	OutputType outputType() const { return outputType_; }
 	/// Can be latex, docbook ... (the name of a format)
 	std::string outputFormat() const { return outputFormat_; }
-	///
-	docstring outlinerName(std::string const & type) const;
+	/// 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_; }
+
 protected:
 	/// Protect construction
 	TextClass();
@@ -240,6 +246,8 @@ protected:
 	mutable LayoutList layoutlist_;
 	/// Layout file name
 	std::string name_;
+	/// Layout file path (empty for system layout files)
+	std::string path_;
 	/// Class category
 	std::string category_;
 	/// document class name
@@ -307,6 +315,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
@@ -341,6 +351,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:
@@ -370,11 +382,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,7 +459,7 @@ public:
 	///
 	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
@@ -485,8 +499,9 @@ public:
 	/// returns true if the class has a ToC structure
 	bool hasTocLevels() const;
 	///
-	std::string const & getCiteFormat(CiteEngineType const & type,
-		std::string const & entry, std::string const & fallback = "") const;
+	std::string const getCiteFormat(CiteEngineType const & type,
+		std::string const & entry, bool const punct = true,
+		std::string const & fallback = "") const;
 	///
 	std::string const & getCiteMacro(CiteEngineType const & type,
 		std::string const & macro) const;
@@ -513,7 +528,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);
 };
 
@@ -524,7 +539,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