X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.h;h=6fb9e2bc32343b06f1e1e78518a2d8f2cd0071d3;hb=52e5755c84ceb65d935764da467c7b948672e77e;hp=66d23e6485d5f7d1adb8db22e010a57996c27576;hpb=69fae0531d533ce87aaf0962b6a3138009a5fa76;p=lyx.git

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 66d23e6485..6fb9e2bc32 100644
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -14,21 +14,25 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "layout.h"
-#include "ShareContainer.h"
+#include "Layout.h"
+#include "Length.h"
+#include "Spacing.h"
 
 #include "support/types.h"
+#include "support/docstring.h"
 
 #include <iosfwd>
 #include <string>
 
+
+namespace lyx {
+
 class BufferView;
-class LyXLength;
-class LyXLex;
+class Length;
+class Lexer;
 class Paragraph;
-class ParameterStruct;
 class Spacing;
-class VSpace;
+
 
 ///
 class ParagraphParameters {
@@ -40,14 +44,6 @@ public:
 	///
 	bool sameLayout(ParagraphParameters const &) const;
 	///
-	VSpace const & spaceTop() const;
-	///
-	void spaceTop(VSpace const &);
-	///
-	VSpace const & spaceBottom() const;
-	///
-	void spaceBottom(VSpace const &);
-	///
 	Spacing const & spacing() const;
 	///
 	void spacing(Spacing const &);
@@ -60,8 +56,6 @@ public:
 	///
 	void align(LyXAlignment);
 	///
-	typedef lyx::depth_type depth_type;
-	///
 	depth_type depth() const;
 	///
 	void depth(depth_type);
@@ -74,44 +68,57 @@ public:
 	///
 	void appendix(bool);
 	///
-	std::string const & labelString() const;
+	docstring const & labelString() const;
 	///
-	void labelString(std::string const &);
+	void labelString(docstring const &);
 	///
-	std::string const & labelWidthString() const;
+	docstring const & labelWidthString() const;
 	///
-	void labelWidthString(std::string const &);
+	void labelWidthString(docstring const &);
 	///
-	LyXLength const & leftIndent() const;
+	Length const & leftIndent() const;
 	///
-	void leftIndent(LyXLength const &);
+	void leftIndent(Length const &);
 
 	/// read the parameters from a lex
-	void read(LyXLex & lex);
+	void read(Lexer & lex);
 
 	/// write out the parameters to a stream
 	void write(std::ostream & os) const;
 
+	//friend bool operator==(ParameterStruct const & ps1,
+	//ParameterStruct const & ps2);
+
 private:
 	///
-	void set_from_struct(ParameterStruct const &);
+	Spacing spacing_;
 	///
-	boost::shared_ptr<ParameterStruct> param;
+	bool noindent_;
 	///
-	static ShareContainer<ParameterStruct> container;
+	bool start_of_appendix_;
+	///
+	bool appendix_;
+	///
+	LyXAlignment align_;
+	///
+	depth_type depth_;
+	///
+	docstring labelstring_;
+	///
+	docstring labelwidthstring_;
+	///
+	Length leftindent_;
 };
 
 
+
 /** 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, std::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, std::string const & data);
+
+} // namespace lyx
 
 #endif