next step...

[lyx.git] / src / layout.h

diff --git a/src/layout.h b/src/layout.h
index 789f9ca098d14a43040bb1db9ee60008b0a61315..a4141c70da7a5ac9546493d26776c5ac67caf97a 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,10 +18,10 @@
 #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();
@@ -210,7 +210,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 +302,7 @@ public:
        char labeltype; // add approp. type
 
        ///
-       char endlabeltype;
+       LYX_END_LABEL_TYPES endlabeltype;
 
        ///
        LYX_MARGIN_TYPE margintype;
@@ -321,6 +321,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 +551,7 @@ std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
 
 ///
-class LyXTextClassList : public noncopyable {
+class LyXTextClassList : boost::noncopyable {
 public:
        ///
        typedef std::vector<LyXTextClass> ClassList;