adjust

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index cbbc2759a4e879870369a9051dc0ce0dc909df48..977049d202518be3c4731309abd50d8f713d2318 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -14,7 +14,7 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "layout.h"
+#include "LayoutEnums.h"
 #include "Length.h"
 #include "Spacing.h"
 
@@ -28,6 +28,7 @@
 namespace lyx {
 
 class BufferView;
+class Layout;
 class Length;
 class Lexer;
 class Paragraph;
@@ -80,8 +81,17 @@ public:
        ///
        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);
+       
+       ///
+       bool canApply(ParagraphParameters const & params, Layout const & layout);
 
        /// write out the parameters to a stream
        void write(std::ostream & os) const;