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

diff --git a/src/TextClass.h b/src/TextClass.h
index 5090a9ecfa..36630238ae 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -125,10 +125,10 @@ public:
 	/// returns a special layout for use when we don't really want one,
 	/// e.g., in table cells
 	Layout const & plainLayout() const 
-			{ return operator[](emptylayout_); };
+			{ return operator[](plain_layout_); };
 	/// the name of the plain layout
 	docstring const & plainLayoutName() const 
-			{ return emptylayout_; }
+			{ return plain_layout_; }
 	/// Enumerate the paragraph styles.
 	size_t layoutCount() const { return layoutlist_.size(); }
 	///
@@ -190,12 +190,15 @@ protected:
 	/// Protect construction
 	TextClass();
 	///
-	Layout & operator[](docstring const & vname);
-	/// 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 & operator[](docstring const & name);
+	/** Create an new, very basic layout for this textclass. This is used for
+	    the Plain Layout common to all TextClass objects and also, in 
+	    DocumentClass, for the creation of new layouts `on the fly' when
+	    previously unknown layouts are encountered.
+	    \param unknown Set to true if this layout is used to represent an 
+	    unknown layout
 	 */
-	Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
+	Layout createBasicLayout(docstring const & name, bool unknown = false) const;
 	
 	///////////////////////////////////////////////////////////////////
 	// non-const iterators
@@ -241,7 +244,7 @@ protected:
 	///
 	docstring defaultlayout_;
 	/// name of plain layout
-	static const docstring emptylayout_;
+	static const docstring plain_layout_;
 	/// preamble text to support layout styles
 	docstring preamble_;
 	/// latex packages loaded by document class.
@@ -341,8 +344,8 @@ public:
 	/// happen).  -- Idea JMarc, comment MV
 	InsetLayout const & insetLayout(docstring const & name) const;
 	/// 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_
+	static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
+	/// add a new layout \c name if it does not exist in layoutlist_
 	void addLayoutIfNeeded(docstring const & name) const;
 
 	///////////////////////////////////////////////////////////////////
@@ -406,7 +409,7 @@ private:
 	/// DocumentClassBundle, which calls the protected constructor.
 	friend class DocumentClassBundle;
 	///
-	static InsetLayout empty_insetlayout_;
+	static InsetLayout plain_insetlayout_;
 };