the toc fix plus layout stuff

[lyx.git] / src / lyxlayout.h

diff --git a/src/lyxlayout.h b/src/lyxlayout.h
index 079b79a85374fda99ad08ad6d449557fd9db3492..f2a87f895f0c7fef2b85cbe51bd52422d5baa84f 100644 (file)
--- a/src/lyxlayout.h
+++ b/src/lyxlayout.h
@@ -1,13 +1,15 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxlayout.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author André Pönitz
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYX_LAYOUT_H
 #define LYX_LAYOUT_H
@@ -15,7 +17,7 @@
 #include "lyxfont.h"
 #include "layout.h"
 #include "Spacing.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXLex;
 class LyXTextClass;
@@ -119,7 +121,7 @@ public:
        ///
        LyXAlignment alignpossible;
        ///
-       char labeltype; // add approp. type
+       LYX_LABEL_TYPES labeltype;
        ///
        LYX_END_LABEL_TYPES endlabeltype;
        ///
@@ -136,10 +138,16 @@ public:
        bool free_spacing;
        ///
        bool pass_thru;
+       ///
+       bool is_environment;
+       /// show this in toc
+       int toclevel;
        /// 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. */
@@ -167,6 +175,8 @@ public:
        bool intitle;
        /// Does this layout allow for an optional parameter?
        int optionalargs;
+       /// Which counter to step
+       string counter;
 
 private:
        /// Name of the layout/paragraph environment