X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.h;h=1632cda117320df5d86ac904778e1caad686a6d4;hb=f7be88ce4c2bbc10c4691e614a54fca427a2e8fb;hp=0d4a0d7aa6b1d3c4a4707be22b6069b05700436c;hpb=763ef015ce995b7b46eb029af12ffab3f8810152;p=lyx.git

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index 0d4a0d7aa6..1632cda117 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,12 +13,12 @@
 #ifndef BASECLASSLIST_H
 #define BASECLASSLIST_H
 
+#include "LayoutModuleList.h"
 #include "TextClass.h"
 
 #include "support/strfwd.h"
 
-#include <boost/noncopyable.hpp>
-
+#include <string>
 #include <vector>
 
 
@@ -25,17 +26,13 @@ namespace lyx {
 
 class Layout;
 
-/// Reads the style files
-extern bool LyXSetStyle();
-
-
 /// Index into LayoutFileList. Basically a 'strong typedef'.
 class LayoutFileIndex {
 public:
 	///
 	typedef std::string base_type;
 	///
-	LayoutFileIndex(base_type t) { data_ = t; }
+	LayoutFileIndex(base_type const & t) : data_(t) { }
 	///
 	operator base_type() const { return data_; }
 	///
@@ -57,21 +54,35 @@ private:
 /// Buffer-specific information should therefore be placed in a
 /// DocumentClass object.
 /// 
-class LayoutFile : public TextClass, boost::noncopyable {
+class LayoutFile : public TextClass {
 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_; }
+	///
+ 	LayoutModuleList const & providedModules() const 
+ 			{ return provided_modules_; }
+	///
+ 	LayoutModuleList const & excludedModules() const 
+ 			{ return excluded_modules_; }
 private:
+	/// noncopyable
+	LayoutFile(LayoutFile const &);
+	void operator=(LayoutFile const &);
 	/// 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() {}
 };
 
 
@@ -81,7 +92,6 @@ private:
 class LayoutFileList {
 public:
 	///
-	LayoutFileList() {}
 	~LayoutFileList();
 	/// \return The sole instance of this class.
 	static LayoutFileList & get();
@@ -89,17 +99,21 @@ 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.
-	LayoutFileIndex addDefaultClass(std::string const & textclass);
+	/// 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.
 	/// \return the identifier for the loaded file, or else an
@@ -108,7 +122,13 @@ 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:
+	///
+	LayoutFileList() {}
 	///
 	typedef std::map<std::string, LayoutFile *> ClassMap;
 	/// noncopyable