X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.h;h=3a7569624926e59d0f8c879b75a08d3bccadc65a;hb=86994bf75320524ec656fd70950633c83d445a6c;hp=99369cfcd5e53939bbdf92ff6d8e01a9d0258e4e;hpb=2288d1724715307a71e888faa4bec1f5de1242aa;p=lyx.git

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 99369cfcd5..3a75696249 100644
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Angus Leeming
  * \author John Levon
  *
@@ -14,19 +14,21 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "layout.h"
-#include "ShareContainer.h"
+#include "LayoutEnums.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 Layout;
+class Length;
+class Lexer;
 class Paragraph;
-class ParameterStruct;
 class Spacing;
 
 
@@ -52,8 +54,6 @@ public:
 	///
 	void align(LyXAlignment);
 	///
-	typedef lyx::depth_type depth_type;
-	///
 	depth_type depth() const;
 	///
 	void depth(depth_type);
@@ -66,38 +66,65 @@ 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 string
+	void read (std::string str, bool merge = true);
+	
 	/// read the parameters from a lex
-	void read(LyXLex & lex);
+	void read(Lexer & lex, bool merge = true);
+	
+	/// 
+	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:
 	///
-	void set_from_struct(ParameterStruct const &);
+	Spacing spacing_;
+	///
+	bool noindent_;
+	///
+	bool start_of_appendix_;
+	///
+	bool appendix_;
+	///
+	LyXAlignment align_;
 	///
-	boost::shared_ptr<ParameterStruct> param;
+	depth_type depth_;
 	///
-	static ShareContainer<ParameterStruct> container;
+	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);
 
+
+} // namespace lyx
+
 #endif