Alfredo's second patch

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index de6b2c08948d72a1c0e91a624f6ff2701adc27d0..491b55c9c0711e15a5e3424c526ad24f635b8059 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -3,21 +3,18 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "ShareContainer.h"
 #include "LString.h"
+#include "ShareContainer.h"
 #include "layout.h"
 
-// Not yet... lyx 1.3.x or so
-#define NO_PEXTRA_REALLY 1
-
 #include "ParameterStruct.h"
 
+#include <iosfwd>
+
 class VSpace;
 class Spacing;
+class LyXLex;
+class Paragraph;
 
 
 ///
@@ -91,33 +88,13 @@ public:
        LyXLength const & leftIndent() const;
        ///
        void leftIndent(LyXLength const &);
-       ///
-#ifndef NO_PEXTRA_REALLY
-       ///
-       int pextraType() const;
-       ///
-       void pextraType(int);
-       ///
-       string const & pextraWidth() 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);
-#endif
+
+       /// read the parameters from a lex
+       void read(LyXLex & lex);
+
+       /// write out the parameters to a stream
+       void write(std::ostream & os) const;
+
 private:
        ///
        void set_from_struct(ParameterStruct const &);
@@ -133,4 +110,18 @@ ParagraphParameters::depth_type ParagraphParameters::depth() const
 {
        return param->depth;
 }
+
+
+/** Generate a string \param data from \param par's ParagraphParameters.
+    The function also generates some additional info needed by the
+    Paragraph dialog.
+ */
+void params2string(Paragraph const & par, string & data);
+
+/** Given \param data, an encoding of the ParagraphParameters generated
+    in the Paragraph dialog, this function sets the current paragraph
+    appropriately.
+ */
+void setParagraphParams(BufferView & bv, string const & data);
+
 #endif