X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=f3d2197278b4617562ceea27195ef2acd25a94fd;hb=68fe13dfa1ed24891d930b0d9b8b79e217c7f1e4;hp=c38f62951ea5a932d6fc1b7c21fb65d7eeff7bfc;hpb=36ddfbcdf2169dfc53b950a78e0d61066f197860;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index c38f62951e..f3d2197278 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -25,10 +25,11 @@
 
 #include <boost/noncopyable.hpp>
 
+#include <list>
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
-#include <list>
 
 namespace lyx {
 
@@ -81,22 +82,20 @@ public:
 	///////////////////////////////////////////////////////////////////
 	// typedefs
 	///////////////////////////////////////////////////////////////////
-	/// The individual paragraph layouts comprising the document class
 	// NOTE Do NOT try to make this a container of Layout pointers, e.g.,
-	// std::vector<Layout *>. This will lead to problems. The reason is
+	// std::list<Layout *>. This will lead to problems. The reason is
 	// that DocumentClass objects are generally created by copying a 
 	// LayoutFile, which serves as a base for the DocumentClass. If the
 	// LayoutList is a container of pointers, then every DocumentClass
 	// that derives from a given LayoutFile (e.g., article) will SHARE
 	// a basic set of layouts. So if one Buffer were to modify a layout
 	// (say, Standard), that would modify that layout for EVERY Buffer
-	// that was based upon the same DocumentClass. (Of course, if you 
-	// really, REALLY want to make LayoutList a vector<Layout *>, then
-	// you can implement custom assignment and copy constructors.)
+	// that was based upon the same DocumentClass.
 	//
 	// NOTE: Layout pointers are directly assigned to paragraphs so a
 	// container that does not invalidate these pointers after insertion
 	// is needed.
+	/// The individual paragraph layouts comprising the document class
 	typedef std::list<Layout> LayoutList;
 	/// The inset layouts available to this class
 	typedef std::map<docstring, InsetLayout> InsetLayouts;
@@ -190,7 +189,7 @@ public:
 	///
 	std::string const & latexname() const { return latexname_; }
 	///
-	std::string const & prerequisites() const { return prerequisites_; }
+	std::string const & prerequisites() const;
 	/// Can be LaTeX, DocBook, etc.
 	OutputType outputType() const { return outputType_; }
 	/// Can be latex, docbook ... (the name of a format)
@@ -241,7 +240,7 @@ protected:
 	/// Is the TeX class available?
 	bool tex_class_avail_;
 	/// document class prerequisites
-	std::string prerequisites_;
+	mutable std::string prerequisites_;
 	///
 	std::string opt_fontsize_;
 	///
@@ -305,6 +304,10 @@ protected:
 	int min_toclevel_;
 	/// The maximal TocLevel of sectioning layouts
 	int max_toclevel_;
+	/// Citation formatting information
+	std::map<std::string, std::string> cite_formats_;
+	/// Citation macros
+	std::map<std::string, std::string> cite_macros_;
 private:
 	///////////////////////////////////////////////////////////////////
 	// helper routines for reading layout files
@@ -328,7 +331,9 @@ private:
 	///
 	void readCharStyle(Lexer &, std::string const &);
 	///
-	void readFloat(Lexer &);
+	bool readFloat(Lexer &);
+	///
+	void readCiteFormat(Lexer &);
 };
 
 
@@ -424,6 +429,10 @@ public:
 	int max_toclevel() const { return max_toclevel_; }
 	/// returns true if the class has a ToC structure
 	bool hasTocLevels() const;
+	///
+	std::string const & getCiteFormat(std::string const & entry_type) const;
+	///
+	std::string const & getCiteMacro(std::string const & macro) const;
 protected:
 	/// Constructs a DocumentClass based upon a LayoutFile.
 	DocumentClass(LayoutFile const & tc);
@@ -471,6 +480,9 @@ private:
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, PageSides p);
 
+/// current format of layout files
+extern int const LAYOUT_FORMAT;
+
 
 } // namespace lyx