X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLayoutFile.h;h=ae2e7cfaaade07b27241e0169244037d6c699451;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=8d17a1c35546607bf3eca58f235fd89d92feb825;hpb=2078e09e67ece00640277eb93b87e378904244f7;p=lyx.git

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index 8d17a1c355..ae2e7cfaaa 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -4,7 +4,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
+ * \author Richard Heck (typedefs and such)
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,13 +13,13 @@
 #ifndef BASECLASSLIST_H
 #define BASECLASSLIST_H
 
+#include "LayoutModuleList.h"
 #include "TextClass.h"
 
 #include "support/strfwd.h"
 
 #include <boost/noncopyable.hpp>
 
-#include <set>
 #include <string>
 #include <vector>
 
@@ -27,10 +28,6 @@ namespace lyx {
 
 class Layout;
 
-/// Reads the style files
-extern bool LyXSetStyle();
-
-
 /// Index into LayoutFileList. Basically a 'strong typedef'.
 class LayoutFileIndex {
 public:
@@ -62,20 +59,29 @@ private:
 class LayoutFile : public TextClass, boost::noncopyable {
 public:
 	/// check whether the TeX class is available
-	bool isTeXClassAvailable() const { return texClassAvail_; }
+	bool isTeXClassAvailable() const { return tex_class_avail_; }
+	///
+	LayoutModuleList const & defaultModules() const 
+			{ return default_modules_; }
 	///
-	std::list<std::string> const & defaultModules() const { return usemod_; }
+ 	LayoutModuleList const & providedModules() const 
+ 			{ return provided_modules_; }
+	///
+ 	LayoutModuleList const & excludedModules() const 
+ 			{ return excluded_modules_; }
 private:
 	/// Construct a layout with default values. Actual values loaded later.
 	explicit LayoutFile(std::string const & filename,
 			std::string const & className = std::string(),
 			std::string const & description = std::string(),
-			bool texClassAvail = false);
+			std::string const & prerequisites = std::string(),
+			std::string const & category = std::string(),
+			bool texclassavail = false);
 	/// The only class that should create a LayoutFile is
 	/// LayoutFileList, which calls the private constructor.
 	friend class LayoutFileList;
 	/// can't create empty LayoutFile
-	LayoutFile() {};
+	LayoutFile() {}
 };
 
 
@@ -86,6 +92,7 @@ class LayoutFileList {
 public:
 	///
 	LayoutFileList() {}
+	///
 	~LayoutFileList();
 	/// \return The sole instance of this class.
 	static LayoutFileList & get();
@@ -93,16 +100,20 @@ public:
 	bool empty() const { return classmap_.empty(); }
 	///
 	bool haveClass(std::string const & classname) const;
-	///
+	/// Note that this will assert if we don't have classname, so
+	/// check via haveClass() first.
 	LayoutFile const & operator[](std::string const & classname) const;
-	///
+	/// Note that this will assert if we don't have classname, so
+	/// check via haveClass() first.
 	LayoutFile & operator[](std::string const & classname);
 	/// Read textclass list. Returns false if this fails.
 	bool read();
 	/// Clears the textclass so as to force it to be reloaded
 	void reset(LayoutFileIndex const & tc);
 
-	/// add a default textclass with all standard layouts.
+	/// Add a default textclass with all standard layouts.
+	/// Note that this will over-write any information we may have
+	/// gotten from textclass.lst about this class.
 	LayoutFileIndex addEmptyClass(std::string const & textclass);
 
 	/// add a textclass from user local directory.
@@ -112,6 +123,10 @@ public:
 		addLocalLayout(std::string const & textclass, std::string const & path);
 	/// a list of the available classes
 	std::vector<LayoutFileIndex> classList() const;
+
+	///
+	bool load(std::string const & name, std::string const & buf_path);
+
 private:
 	///
 	typedef std::map<std::string, LayoutFile *> ClassMap;