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

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index b56da88319..b71f123009 100644
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -29,10 +29,6 @@ namespace lyx {
 
 class Layout;
 
-/// Reads the style files
-extern bool LyXSetStyle();
-
-
 /// Index into LayoutFileList. Basically a 'strong typedef'.
 class LayoutFileIndex {
 public:
@@ -64,7 +60,7 @@ 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_; }
@@ -79,7 +75,8 @@ private:
 	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(),
+			bool texclassavail = false);
 	/// The only class that should create a LayoutFile is
 	/// LayoutFileList, which calls the private constructor.
 	friend class LayoutFileList;
@@ -114,7 +111,9 @@ public:
 	/// 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.