Account for old versions of Pygments

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index fc6d9acf3b5152a9d17b51f7d70ebc3335ba9b19..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,18 +14,20 @@
 #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 LyXLex;
+class Layout;
+class Length;
+class Lexer;
 class Paragraph;
 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,27 +66,35 @@ 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;
 
-       //friend bool operator==(ParameterStruct const & ps1,
-       //ParameterStruct const & ps2);
-
 private:
        ///
        Spacing spacing_;
@@ -101,11 +109,11 @@ private:
        ///
        depth_type depth_;
        ///
-       std::string labelstring_;
+       docstring labelstring_;
        ///
-       std::string labelwidthstring_;
+       docstring labelwidthstring_;
        ///
-       LyXLength leftindent_;
+       Length leftindent_;
 };
 
 
@@ -116,4 +124,7 @@ private:
  */
 void params2string(Paragraph const & par, std::string & data);
 
+
+} // namespace lyx
+
 #endif