Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index fc7684ab73a4afcd0b80b0a8e134f1cc3f6f2e4c..2dc9c553ed70930e03c8d9fbefb1fc4a267d1446 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -44,7 +44,8 @@ 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 &);
        ///
@@ -59,12 +60,15 @@ private:
        ///
        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;
@@ -74,7 +78,7 @@ private:
        ///
        ColorCode ColorName() const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       std::string contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewline(*this); }
        ///