X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=5090a9ecfa17c2b21289d4228f1f340f54409133;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=847612a4d429a6762215f3d1f76053c0c41b47e2;hpb=56a35c2c61401f1855e91c11142a5389bfc5572c;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index 847612a4d4..5090a9ecfa 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -124,10 +124,10 @@ public:
 	bool isPlainLayout(Layout const &) const;
 	/// returns a special layout for use when we don't really want one,
 	/// e.g., in table cells
-	Layout const & emptyLayout() const 
+	Layout const & plainLayout() const 
 			{ return operator[](emptylayout_); };
-	/// the name of the empty layout
-	docstring const & emptyLayoutName() const 
+	/// the name of the plain layout
+	docstring const & plainLayoutName() const 
 			{ return emptylayout_; }
 	/// Enumerate the paragraph styles.
 	size_t layoutCount() const { return layoutlist_.size(); }
@@ -135,6 +135,8 @@ public:
 	bool hasLayout(docstring const & name) const;
 	///
 	Layout const & operator[](docstring const & vname) const;
+	/// Inset layouts of this doc class
+	InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
 
 	///////////////////////////////////////////////////////////////////
 	// reading routines
@@ -189,8 +191,8 @@ protected:
 	TextClass();
 	///
 	Layout & operator[](docstring const & vname);
-	/// Create an empty layout for this textclass.
-	/** \param unknown Set to true if this layout is a default layout used to
+	/// Create an new, empty layout for this textclass.
+	/** \param unknown Set to true if this layout is an empty layout used to
 	 * represent an unknown layout
 	 */
 	Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
@@ -238,7 +240,7 @@ protected:
 	std::string class_header_;
 	///
 	docstring defaultlayout_;
-	/// name of empty layout
+	/// name of plain layout
 	static const docstring emptylayout_;
 	/// preamble text to support layout styles
 	docstring preamble_;
@@ -330,8 +332,6 @@ public:
 	bool hasLaTeXLayout(std::string const & lay) const;
 	/// A DocumentClass nevers count as loaded, since it is dynamic
 	virtual bool loaded() { return false; }
-	/// Inset layouts of this doc class
-	InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
 	/// \return the layout object of an inset given by name. If the name
 	/// is not found as such, the part after the ':' is stripped off, and
 	/// searched again. In this way, an error fallback can be provided:
@@ -340,9 +340,9 @@ public:
 	/// If that doesn't work either, an empty object returns (shouldn't
 	/// happen).  -- Idea JMarc, comment MV
 	InsetLayout const & insetLayout(docstring const & name) const;
-	/// an empty inset layout for use as a default
-	static InsetLayout const & emptyInsetLayout() { return empty_insetlayout_; }
-	/// add an empty layout \c name if it does not exist in layoutlist_
+	/// a plain inset layout for use as a default
+	static InsetLayout const & plainInsetLayout() { return empty_insetlayout_; }
+	/// add a new, empty layout \c name if it does not exist in layoutlist_
 	void addLayoutIfNeeded(docstring const & name) const;
 
 	///////////////////////////////////////////////////////////////////