Merge branch 'master' into biblatex2

[lyx.git] / src / insets / InsetNewline.h

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index 50a08face72a839fb31cf4bd139afe6ae4ebc538..2dc9c553ed70930e03c8d9fbefb1fc4a267d1446 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -13,15 +13,12 @@
 #define INSET_NEWLINE_H
 
 #include "Inset.h"
-#include "MailInset.h"
-
-#include "support/docstring.h"
-#include "support/gettext.h"
 
 
 namespace lyx {
 
-class InsetNewlineParams {
+class InsetNewlineParams
+{
 public:
        /// The different kinds of spaces we support
        enum Kind {
@@ -47,7 +44,13 @@ public:
        ///
        InsetNewline();
        ///
-       InsetNewline(InsetNewlineParams par) { params_.kind = par.kind; }
+       InsetNewline(InsetNewlineParams par) : Inset(0)
+       { params_.kind = par.kind; }
+       ///
+       static void string2params(std::string const &, InsetNewlineParams &);
+       ///
+       static std::string params2string(InsetNewlineParams const &);
+private:
        ///
        InsetNewlineParams params() const { return params_; }
        ///
@@ -57,12 +60,15 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       ///
        void read(Lexer & lex);
        ///
        void write(std::ostream & os) const;
@@ -72,39 +78,16 @@ public:
        ///
        ColorCode ColorName() const;
        ///
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
-
-private:
+       std::string contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewline(*this); }
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
-       ///
-       InsetNewlineParams params_;
-};
 
-
-class InsetNewlineMailer : public MailInset {
-public:
-       ///
-       InsetNewlineMailer(InsetNewline & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static void string2params(std::string const &, InsetNewlineParams &);
-       ///
-       static std::string const params2string(InsetNewlineParams const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetNewline & inset_;
+       InsetNewlineParams params_;
 };