X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.h;h=3a7569624926e59d0f8c879b75a08d3bccadc65a;hb=f146bded7a1eed37174efca16ea63e65f93f6fbc;hp=62e462b66f3f55224f9cc8cec53fb0b376d341dd;hpb=39e79d8602920eefe36e898c9f415afb979521b2;p=lyx.git

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 62e462b66f..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,21 +14,19 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "layout.h"
-#include "LyXLength.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 Layout;
+class Length;
 class Lexer;
 class Paragraph;
 class Spacing;
@@ -76,19 +74,27 @@ public:
 	///
 	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(Lexer & 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;
 
-	//friend bool operator==(ParameterStruct const & ps1,
-	//ParameterStruct const & ps2);
-
 private:
 	///
 	Spacing spacing_;
@@ -107,7 +113,7 @@ private:
 	///
 	docstring labelwidthstring_;
 	///
-	LyXLength leftindent_;
+	Length leftindent_;
 };