X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlayout.h;h=1700811cf8ad62a83c641f6f08f1bfdc313f19f0;hb=c1e009f2d3baa65a05345224ae14f1fe521b8199;hp=2566ece2ede3d49a0c1d05e7bdd27e288f96cf37;hpb=8a91f206c61f68764abce8cfa4a012c14293fe83;p=lyx.git

diff --git a/src/lyxlayout.h b/src/lyxlayout.h
index 2566ece2ed..1700811cf8 100644
--- a/src/lyxlayout.h
+++ b/src/lyxlayout.h
@@ -12,10 +12,6 @@
 #ifndef LYX_LAYOUT_H
 #define LYX_LAYOUT_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "lyxfont.h"
 #include "layout.h"
 #include "Spacing.h"
@@ -96,74 +92,58 @@ public:
 
 	/// Text that dictates how wide the left margin is on the screen
 	string leftmargin;
-
 	/// Text that dictates how wide the right margin is on the screen
 	string rightmargin;
-
 	/// Text that dictates how much space to leave after a potential label
 	string labelsep;
-
 	/// Text that dictates how much space to leave before a potential label
 	string labelindent;
-
-	/** Text that dictates the width of the indentation of
-	    indented paragraphs.
-	*/
+	/// Text that dictates the width of the indentation of indented pars
 	string parindent;
-
 	///
 	float parskip;
-
 	///
 	float itemsep;
-
 	///
 	float topsep;
-
 	///
 	float bottomsep;
-
 	///
 	float labelbottomsep;
-
 	///
 	float parsep;
-
 	///
 	Spacing spacing;
-
 	///
 	LyXAlignment align;
-
 	///
 	LyXAlignment alignpossible;
-
 	///
 	char labeltype; // add approp. type
-
 	///
 	LYX_END_LABEL_TYPES endlabeltype;
-
 	///
 	LYX_MARGIN_TYPE margintype;
-
 	///
 	bool fill_top;
-
 	///
 	bool fill_bottom;
-
 	///
 	bool newline_allowed;
-
 	///
 	bool nextnoindent;
-
 	///
 	bool free_spacing;
-
 	///
 	bool pass_thru;
+	///
+	bool is_environment;
+	/// for new environment insets
+	string latexheader;
+	/// for new environment insets
+	string latexfooter;
+	/// for new environment insets
+	string latexparagraph;
 
 	/** true when the fragile commands in the paragraph need to be
 	    \protect'ed. */
@@ -181,6 +161,7 @@ public:
 	///
 	bool isEnvironment() const {
 		return (latextype == LATEX_ENVIRONMENT
+			|| latextype == LATEX_BIB_ENVIRONMENT
 			|| latextype == LATEX_ITEM_ENVIRONMENT
 			|| latextype == LATEX_LIST_ENVIRONMENT);
 	}
@@ -188,6 +169,9 @@ public:
 	LYX_LATEX_TYPES latextype;
 	/// Does this object belong in the title part of the document?
 	bool intitle;
+	/// Does this layout allow for an optional parameter?
+	int optionalargs;
+
 private:
 	/// Name of the layout/paragraph environment
 	string name_;
@@ -206,19 +190,14 @@ private:
 
 	/// LaTeX name for environment
 	string latexname_;
-
 	/// Label string. "Abstract", "Reference", "Caption"...
 	string labelstring_;
-
 	///
 	string endlabelstring_;
-
 	/// Label string inside appendix. "Appendix", ...
 	string labelstring_appendix_;
-
 	/// LaTeX parameter for environment
 	string latexparam_;
-
 	/// Macro definitions needed for this layout
 	string preamble_;
 };