Fix natbib bug spotted by JMarc.

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index fe64dbe3cba7b87d88947b5733d14db4a788304d..a4b7ebbf8fdd03b716496984fc2db375bdcec66d 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -3,13 +3,19 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "ShareContainer.h"
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
+#include "ShareContainer.h"
 #include "layout.h"
 
+#include "ParameterStruct.h"
+
 class VSpace;
 class Spacing;
-struct ParameterStruct;
+
 
 ///
 class ParagraphParameters {
@@ -21,8 +27,6 @@ public:
        ///
        bool sameLayout(ParagraphParameters const &) const;
        ///
-       void makeSame(ParagraphParameters const & pp);
-       ///
        VSpace const & spaceTop() const;
        ///
        void spaceTop(VSpace const &);
@@ -59,9 +63,11 @@ public:
        ///
        void align(LyXAlignment);
        ///
-       char depth() const;
+       typedef ParameterStruct::depth_type depth_type;
+       ///
+       depth_type depth() const;
        ///
-       void depth(char);
+       void depth(depth_type);
        ///
        bool startOfAppendix() const;
        ///
@@ -79,29 +85,9 @@ public:
        ///
        void labelWidthString(string const &);
        ///
-       int pextraType() const;
-       ///
-       void pextraType(int);
-       ///
-       string const & pextraWidth() const;
+       LyXLength const & leftIndent() const;
        ///
-       void pextraWidth(string const &);
-       ///
-       string const & pextraWidthp() const;
-       ///
-       void pextraWidthp(string const &);
-       ///
-       int pextraAlignment() const;
-       ///
-       void pextraAlignment(int);
-       ///
-       bool pextraHfill() const;
-       ///
-       void pextraHfill(bool);
-       ///
-       bool pextraStartMinipage() const;
-       ///
-       void pextraStartMinipage(bool);
+       void leftIndent(LyXLength const &);
 private:
        ///
        void set_from_struct(ParameterStruct const &);
@@ -110,4 +96,11 @@ private:
        ///
        static ShareContainer<ParameterStruct> container;
 };
+
+
+inline
+ParagraphParameters::depth_type ParagraphParameters::depth() const
+{
+       return param->depth;
+}
 #endif