X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.h;h=f651068f06055a6cba5395a416a9bb97fc3c80cd;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=82f8ddc0a714794e61673cd76a6b2e35f8587bbc;hpb=b17500c1c47d7bdd4508743c27fb72f0e57a5105;p=lyx.git

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 82f8ddc0a7..f651068f06 100644
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -1,19 +1,36 @@
 // -*- C++ -*-
+/**
+ * \file ParagraphParameters.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Angus Leeming
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "ShareContainer.h"
-#include "LString.h"
-#include "layout.h"
-#include "ParameterStruct.h"
+#include "LayoutEnums.h"
+#include "Length.h"
+#include "Spacing.h"
+
+#include "support/types.h"
+#include "support/docstring.h"
 
-class VSpace;
-class Spacing;
 
+namespace lyx {
+
+class BufferView;
+class Layout;
+class Length;
+class Lexer;
+class Paragraph;
+class Spacing;
 
-// Not yet... lyx 1.3.x or so
-//#define NO_PEXTRA_REALLY 1
 
 ///
 class ParagraphParameters {
@@ -25,16 +42,6 @@ public:
 	///
 	bool sameLayout(ParagraphParameters const &) const;
 	///
-	void makeSame(ParagraphParameters const & pp);
-	///
-	VSpace const & spaceTop() const;
-	///
-	void spaceTop(VSpace const &);
-	///
-	VSpace const & spaceBottom() const;
-	///
-	void spaceBottom(VSpace const &);
-	///
 	Spacing const & spacing() const;
 	///
 	void spacing(Spacing const &);
@@ -43,29 +50,13 @@ public:
 	///
 	void noindent(bool);
 	///
-	bool lineTop() const;
-	///
-	void lineTop(bool);
-	///
-	bool lineBottom() const;
-	///
-	void lineBottom(bool);
-	///
-	bool pagebreakTop() const;
-	///
-	void pagebreakTop(bool);
-	///
-	bool pagebreakBottom() const;
-	///
-	void pagebreakBottom(bool);
-	///
 	LyXAlignment align() const;
 	///
 	void align(LyXAlignment);
 	///
-	char depth() const;
+	depth_type depth() const;
 	///
-	void depth(char);
+	void depth(depth_type);
 	///
 	bool startOfAppendix() const;
 	///
@@ -75,52 +66,65 @@ public:
 	///
 	void appendix(bool);
 	///
-	string const & labelString() const;
+	docstring const & labelString() const;
 	///
-	void labelString(string const &);
+	void labelString(docstring const &);
 	///
-	string const & labelWidthString() const;
+	docstring const & labelWidthString() const;
 	///
-	void labelWidthString(string const &);
-#ifndef NO_PEXTRA_REALLY
+	void labelWidthString(docstring const &);
 	///
-	int pextraType() const;
+	Length const & leftIndent() const;
 	///
-	void pextraType(int);
-	///
-	string const & pextraWidth() const;
-	///
-	void pextraWidth(string const &);
-	///
-	string const & pextraWidthp() const;
+	void leftIndent(Length const &);
+
+	/// read the parameters from a string
+	void read (std::string str, bool merge = true);
+
+	/// read the parameters from a lex
+	void read(Lexer & lex, bool merge = true);
+
 	///
-	void pextraWidthp(string const &);
+	void apply(ParagraphParameters const & params, Layout const & layout);
+
+	// It would be nice to have a working version of this method, so that
+	// getStatus() could return information about what was possible.
+	// bool canApply(ParagraphParameters const & params, Layout const & layout)
+	// 	{ return true; }
+
+	/// write out the parameters to a stream
+	void write(std::ostream & os) const;
+
+private:
 	///
-	int pextraAlignment() const;
+	Spacing spacing_;
 	///
-	void pextraAlignment(int);
+	bool noindent_;
 	///
-	bool pextraHfill() const;
+	bool start_of_appendix_;
 	///
-	void pextraHfill(bool);
+	bool appendix_;
 	///
-	bool pextraStartMinipage() const;
+	LyXAlignment align_;
 	///
-	void pextraStartMinipage(bool);
-#endif
-private:
+	depth_type depth_;
 	///
-	void set_from_struct(ParameterStruct const &);
+	docstring labelstring_;
 	///
-	boost::shared_ptr<ParameterStruct> param;
+	docstring labelwidthstring_;
 	///
-	static ShareContainer<ParameterStruct> container;
+	Length leftindent_;
 };
 
 
-inline
-char 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, std::string & data);
+
+
+} // namespace lyx
+
 #endif