X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.h;h=87548187edc9ba626af9ea70fb9a95d9b7a01f7d;hb=dc976c2b6f6e1f19ee4d884c12abafbdae9e5126;hp=b56da88319d122b4dfe2174195a29dbd120c68fc;hpb=16a82d6f971bd64395aaaca24004d82fe9b46c6f;p=lyx.git

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index b56da88319..87548187ed 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
- * \author Richard Heck (typedefs and such)
+ * \author Richard Kimberly Heck (typedefs and such)
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,25 +13,17 @@
 #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>
 
 
 namespace lyx {
 
-class Layout;
-
-/// Reads the style files
-extern bool LyXSetStyle();
-
+class LayoutModuleList;
 
 /// Index into LayoutFileList. Basically a 'strong typedef'.
 class LayoutFileIndex {
@@ -39,7 +31,7 @@ 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_; }
 	///
@@ -49,42 +41,47 @@ private:
 };
 
 /// This class amounts to little more than a `strong typedef'.
-/// 
-/// A LayoutFile represents the layout information that is 
+///
+/// A LayoutFile represents the layout information that is
 /// contained in a *.layout file.
-/// 
-/// No document- (that is, Buffer-) specific information should 
-/// be placed in these objects. They are used as the basis for 
+///
+/// No document- (that is, Buffer-) specific information should
+/// be placed in these objects. They are used as the basis for
 /// constructing DocumentClass objects, which are what represent
-/// the layout information associated with a Buffer. (This is also 
+/// the layout information associated with a Buffer. (This is also
 /// a subclass of TextClass, implemented in TextClass.{h,cpp}.)
 /// 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 
+	LayoutModuleList const & defaultModules() const
 			{ return default_modules_; }
 	///
- 	LayoutModuleList const & providedModules() const 
+ 	LayoutModuleList const & providedModules() const
  			{ return provided_modules_; }
 	///
- 	LayoutModuleList const & excludedModules() const 
+ 	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() {}
 };
 
 
@@ -93,8 +90,6 @@ private:
 /// via LayoutFileList::get()
 class LayoutFileList {
 public:
-	///
-	LayoutFileList() {}
 	///
 	~LayoutFileList();
 	/// \return The sole instance of this class.
@@ -112,16 +107,19 @@ public:
 	/// 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);
+	void reset(LayoutFileIndex const & classname);
 
-	/// 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.
 	/// \return the identifier for the loaded file, or else an
 	/// empty string if no file was loaded.
-	LayoutFileIndex
-		addLocalLayout(std::string const & textclass, std::string const & path);
+	LayoutFileIndex addLocalLayout(std::string const & textclass,
+	                               std::string const & path,
+	                               std::string const & oldpath = empty_string());
 	/// a list of the available classes
 	std::vector<LayoutFileIndex> classList() const;
 
@@ -129,6 +127,8 @@ public:
 	bool load(std::string const & name, std::string const & buf_path);
 
 private:
+	///
+	LayoutFileList() {}
 	///
 	typedef std::map<std::string, LayoutFile *> ClassMap;
 	/// noncopyable