Account for old versions of Pygments

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index cbbc2759a4e879870369a9051dc0ce0dc909df48..3a7569624926e59d0f8c879b75a08d3bccadc65a 100644 (file)
--- 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,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,15 +78,23 @@ 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);
+       
+       // 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_;