X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.h;h=b56da88319d122b4dfe2174195a29dbd120c68fc;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=976a7dd88103751c4bf99bc578561269583ca998;hpb=9db713da16ddefba7b270c79ae414dbf344054f9;p=lyx.git

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index 976a7dd881..b56da88319 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -13,6 +13,7 @@
 #ifndef BASECLASSLIST_H
 #define BASECLASSLIST_H
 
+#include "LayoutModuleList.h"
 #include "TextClass.h"
 
 #include "support/strfwd.h"
@@ -65,11 +66,13 @@ public:
 	/// check whether the TeX class is available
 	bool isTeXClassAvailable() const { return texClassAvail_; }
 	///
-	std::list<std::string> const & defaultModules() const 
+	LayoutModuleList const & defaultModules() const 
 			{ return default_modules_; }
- 	std::list<std::string> const & providedModules() const 
+	///
+ 	LayoutModuleList const & providedModules() const 
  			{ return provided_modules_; }
- 	std::list<std::string> const & excludedModules() const 
+	///
+ 	LayoutModuleList const & excludedModules() const 
  			{ return excluded_modules_; }
 private:
 	/// Construct a layout with default values. Actual values loaded later.
@@ -92,6 +95,7 @@ class LayoutFileList {
 public:
 	///
 	LayoutFileList() {}
+	///
 	~LayoutFileList();
 	/// \return The sole instance of this class.
 	static LayoutFileList & get();
@@ -99,9 +103,11 @@ 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();
@@ -118,6 +124,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;