X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.h;h=ff627716761f51b3c1a334c413e22949d899397a;hb=98c966c64594611e469313314abd1e59524adb4a;hp=1053fa805fcc6edeffdcafc79bf247bc995698bc;hpb=b922cdd796f9e4b9a46a79808cdee596e04903eb;p=lyx.git

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 1053fa805f..ff62771676 100644
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -37,15 +37,15 @@ public:
 	typedef LayoutList::const_iterator const_iterator;
 	///
 	explicit
-	LyXTextClass (string const & = string(), 
-		      string const & = string(), 
+	LyXTextClass (string const & = string(),
+		      string const & = string(),
 		      string const & = string());
 
 	///
 	const_iterator begin() const { return layoutlist.begin(); }
 	///
 	const_iterator end() const { return layoutlist.end(); }
-	
+
 	///
 	bool Read(string const & filename, bool merge = false);
 	///
@@ -58,30 +58,31 @@ public:
 	bool hasLayout(string const & name) const;
 
 	///
-	LyXLayout const & GetLayout(string const & vname) const;
-
-	///
-	LyXLayout & GetLayout(string const & vname);
+	LyXLayout const & operator[](string const & vname) const;
 
 	/// Sees to that the textclass structure has been loaded
-	void load();
+	bool load() const;
 
 	///
-	string const & name() const { return name_; }
+	string const defaultLayoutName() const;
 	///
-	string const & latexname() const { return latexname_; }
+	LyXLayout const & defaultLayout() const;
 	///
-	string const & description() const { return description_; }
+	string const & name() const;
 	///
-	string const & opt_fontsize() const { return opt_fontsize_; }
+	string const & latexname() const;
 	///
-	string const & opt_pagestyle() const { return opt_pagestyle_; }
+	string const & description() const;
 	///
-	string const & options() const { return options_; }
+	string const & opt_fontsize() const;
 	///
-	string const & pagestyle() const { return pagestyle_; }
+	string const & opt_pagestyle() const;
 	///
-	string const & preamble() const { return preamble_; }
+	string const & options() const;
+	///
+	string const & pagestyle() const;
+	///
+	string const & preamble() const;
 
 	/// Packages that are already loaded by the class
 	enum Provides {
@@ -95,10 +96,10 @@ public:
 		url = 4
 	};
 	///
-	bool provides(Provides p) const { return provides_ & p; }
-	
+	bool provides(Provides p) const;
+
 	///
-	unsigned int columns() const { return columns_; }
+	unsigned int columns() const;
 	///
 	enum PageSides {
 		///
@@ -107,14 +108,14 @@ public:
 		TwoSides
 	};
 	///
-	PageSides sides() const { return sides_; }
+	PageSides sides() const;
 	///
-	int secnumdepth() const { return secnumdepth_; }
+	int secnumdepth() const;
 	///
-	int tocdepth() const { return tocdepth_; }
+	int tocdepth() const;
 
 	///
-	OutputType outputType() const { return outputType_; }
+	OutputType outputType() const;
 
 	///
 	LyXFont const & defaultfont() const;
@@ -124,14 +125,10 @@ public:
 
 	/// Text that dictates how wide the right margin is on the screen
 	string const & rightmargin() const;
-        ///
-	int maxcounter() const { return maxcounter_; }
 	///
-	lyx::layout_type numLayouts() const { return layoutlist.size(); }
+	int maxcounter() const;
 	///
-	LyXLayout const & operator[](lyx::layout_type i) const {
-		return layoutlist[i];
-	}
+	int size() const;
 private:
 	///
 	bool delete_layout(string const &);
@@ -152,6 +149,8 @@ private:
 	///
 	string pagestyle_;
 	///
+	string defaultlayout_;
+	///
 	string preamble_;
 	///
 	Provides provides_;
@@ -183,9 +182,10 @@ private:
 	LayoutList layoutlist;
 
 	/// Has this layout file been loaded yet?
-	bool loaded;
+	mutable bool loaded;
 };
 
+
 ///
 inline
 void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)