Generalize the protection of brackets in citation arguments

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

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index a70f3d2065d202af537362d41548b86ddc7ada1a..ba7a945339497ff849e6d87a9cb3e29c8a400948 100644 (file)
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -39,6 +39,8 @@ public:
        ///
        InsetCommand(InsetCommand const & rhs);
        ///
+       InsetCommand & operator=(InsetCommand const & rhs);
+       ///
        virtual ~InsetCommand();
        ///
        InsetCommand * asInsetCommand() { return this; }
@@ -66,7 +68,7 @@ public:
        ///
        void write(std::ostream & os) const { p_.write(os); }
        ///
-       void read(Lexer & lex) { p_.read(lex); }
+       void read(Lexer & lex) { p_.Read(lex, &buffer()); }
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
@@ -76,27 +78,27 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       virtual void drawBackground(PainterInfo &, int, int) 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 & runparams) const;
        ///
        bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
-       bool clickable(int, int) const { return hasSettings(); }
+       bool clickable(BufferView const &, int, int) const { return hasSettings(); }
        //@}
 
 protected:
        /// \name Methods relaying to the InsetCommandParams p_
        //@{
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        bool showInsetDialog(BufferView * bv) const;
-       ///
-       Dimension const dimension(BufferView const &) const 
-               { return button_.dimension(); }
        //@}
 
 protected: