Cleanup mouse/selection/context-menu interactions.

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 6fb9e2bc32343b06f1e1e78518a2d8f2cd0071d3..9c5a52df3e483462999179dc857b6bb58a1ad9bd 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -14,20 +14,18 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "Layout.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 Layout;
 class Length;
 class Lexer;
 class Paragraph;
@@ -80,8 +78,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;