changes from Angus

[lyx.git] / src / layout.h

diff --git a/src/layout.h b/src/layout.h
index 2eb47cef59451c2a9d71c161199504fc47df2180..cea07e1e19a5a3beed20f04f9d40af0d4bc64d14 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -18,23 +18,19 @@
 #pragma interface
 #endif
 
-#include "lyxlex.h"
+class LyXLeX;
 #include "lyxfont.h"
 #include "Spacing.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 /// Reads the style files
 extern void LyXSetStyle();
 
-///
-enum no_good_name_for_this {
-       ///
-        LYX_ENVIRONMENT_DEFAULT = 97,
+enum layout_default {
        ///
        LYX_LAYOUT_DEFAULT = 99
 };
 
-
 // Could this cause confusion that both DUMMY_LAYOUT and  LAYOUT_DEFAULT has
 // the same value? (Lgb)
 ///
@@ -210,7 +206,7 @@ public:
        ///
        string const & name() const { return name_; }
        ///
-       void name(string const & n) { name_ = n; }
+       void setName(string const & n) { name_ = n; }
        ///
        string const & obsoleted_by() const { return obsoleted_by_; }
        ///
@@ -302,7 +298,7 @@ public:
        char labeltype; // add approp. type
 
        ///
-       char endlabeltype;
+       LYX_END_LABEL_TYPES endlabeltype;
 
        ///
        LYX_MARGIN_TYPE margintype;
@@ -321,6 +317,10 @@ public:
 
        ///
        bool free_spacing;
+
+       ///
+       bool pass_thru;
+
        /** true when the fragile commands in the paragraph need to be
            \protect'ed. */
        bool needprotect;
@@ -547,7 +547,7 @@ std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
 
 ///
-class LyXTextClassList : public noncopyable {
+class LyXTextClassList : boost::noncopyable {
 public:
        ///
        typedef std::vector<LyXTextClass> ClassList;
@@ -565,7 +565,7 @@ public:
                                LyXTextClass::size_type layout) const;
 
        /// Gets layout number from textclass number and layout name
-       std::pair<bool, LyXTextClass::size_type>
+       std::pair<bool, LyXTextClass::size_type> const
        NumberOfLayout(size_type textclass,
                       string const & name) const;
 
@@ -577,7 +577,7 @@ public:
        /** Gets textclass number from name.
            Returns -1 if textclass name does not exist
        */
-       std::pair<bool, size_type>
+       std::pair<bool, size_type> const
        NumberOfClass(string const & textclass) const;
 
        ///