remove NO_PEXTRA_STUFF

[features.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 10023bf801c10e9d9bf3a8402541376ba03c2453..d68e9a5e2e6537f02f343dec93644b570672beca 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -32,11 +32,6 @@ class LaTeXFeatures;
 class ParagraphParameters;
 class TexRow;
 
-// 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. (Lgb)
 // This is non working and far from finished.
@@ -45,28 +40,6 @@ class TexRow;
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
 public:
-#ifndef NO_PEXTRA_REALLY
-       ///
-       enum PEXTRA_TYPE {
-               ///
-               PEXTRA_NONE,
-               ///
-               PEXTRA_INDENT,
-               ///
-               PEXTRA_MINIPAGE,
-               ///
-               PEXTRA_FLOATFLT
-       };
-       ///
-       enum MINIPAGE_ALIGNMENT {
-               ///
-               MINIPAGE_ALIGN_TOP,
-               ///
-               MINIPAGE_ALIGN_MIDDLE,
-               ///
-               MINIPAGE_ALIGN_BOTTOM
-       };
-#endif
        ///
        enum META_KIND {
                ///
@@ -83,9 +56,11 @@ public:
 
        ///
        Paragraph();
+#ifndef NO_NEXT
        /// this constructor inserts the new paragraph in a list
        explicit
        Paragraph(Paragraph * par);
+#endif
        ///
        Paragraph(Paragraph const &, bool same_ids);
        /// the destructor removes the new paragraph from the list
@@ -108,7 +83,7 @@ public:
                              bool label);
 
        ///
-       void writeFile(Buffer const *, std::ostream &, BufferParams const &,
+       void write(Buffer const *, std::ostream &, BufferParams const &,
                       depth_type) const;
        ///
        void validate(LaTeXFeatures &) const;
@@ -181,6 +156,7 @@ public:
        ///
        InsetBibKey * bibkey;  // ale970302
 
+#ifndef NO_NEXT
        ///
        void next(Paragraph *);
        /** these function are able to hide closed footnotes
@@ -195,7 +171,7 @@ public:
        Paragraph * previous();
        ///
        Paragraph const * previous() const;
-
+#endif
        /// for the environments
        Paragraph * depthHook(depth_type depth);
        /// for the environments
@@ -223,11 +199,6 @@ public:
        void applyLayout(LyXLayout_ptr const & new_layout);
        ///
        void erase(lyx::pos_type pos);
-       /** the flag determines wether the layout should be copied
-        */
-       void breakParagraph(BufferParams const &, lyx::pos_type pos, int flag);
-       ///
-       void breakParagraphConservative(BufferParams const &, lyx::pos_type pos);
        /** Get unistantiated font setting. Returns the difference
            between the characters font and the layoutfont.
            This is what is stored in the fonttable
@@ -316,15 +287,6 @@ public:
        ///
        int stripLeadingSpaces();
 
-#ifndef NO_PEXTRA_REALLY
-       /* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
-          I have to set it on each of it's elements */
-       ///
-       void setPExtraType(BufferParams const &, int type,
-                          string const & width, string const & widthp);
-       ///
-       void unsetPExtraType(BufferParams const &);
-#endif
        ///
        bool isFreeSpacing() const;
 
@@ -342,11 +304,12 @@ private:
        LyXLayout_ptr layout_;
        /// if anything uses this we don't want it to.
        Paragraph(Paragraph const &);
+#ifndef NO_NEXT
        ///
        Paragraph * next_;
        ///
        Paragraph * previous_;
-
+#endif
        struct Pimpl;
        ///
        friend struct Paragraph::Pimpl;