update libtool

[lyx.git] / src / lyxparagraph.h

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index 1c09a72024d8adf7d069ec63b32aded0d82e5e53..8311f79e04bda0e4239d77f4d6fd5ddfb66cbe8e 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.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.
  *
  * ====================================================== */
 
@@ -34,10 +34,16 @@ class InsetBibKey;
 class BufferView;
 class Language;
 
-// I dare you to enable this and help me find all the bugs that then show
-// up. (Lgb)
-#define NEW_INSETS 1
-#define NO_PEXTRA 1
+// After 1.2.0 is released, during 1.3.0cvs, we enable this. And after
+// a while we verify that reading of 1.2.x files work perfectly we remove
+// this code completely. (Lgb)
+//#define NO_PEXTRA_REALLY 1
+
+// Define this if you want to try out the new storage container for
+// paragraphs. std::container instead of obfuscated homegrown
+// linked list. (Lgb)
+// This is non working and far from finished.
+// #define NO_NEXT 1
 
 /// A LyXParagraph holds all text, attributes and insets in a text paragraph
 class LyXParagraph  {
@@ -110,7 +116,7 @@ public:
        
        ///
        void writeFile(Buffer const *, std::ostream &, BufferParams const &,
-                      char, char) const;
+                      char) const;
        ///
        void validate(LaTeXFeatures &) const;
        
@@ -132,10 +138,6 @@ public:
        ///
        LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &,
                                      std::ostream &, TexRow & texrow);
-#if 0
-       ///
-       LyXParagraph * Clone() const;
-#endif
        ///
        bool HasSameLayout(LyXParagraph const * par) const;