X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCommand.h;h=f51f8c939a05452be85e4971ab5df44b3094772e;hb=1bd422355430d4753e48eee298dafaf8c1ac458f;hp=4c1335002af305c70c74a8d1e14d4056f8883de9;hpb=2bbf8e5f2d4ffd691258f94ba46baebf5aa3204c;p=lyx.git

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index 4c1335002a..f51f8c939a 100644
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -16,11 +16,11 @@
 #include "Inset.h"
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
-#include "Cursor.h"
 
 
 namespace lyx {
 
+class Cursor;
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -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,22 +78,29 @@ 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;
 	///
+	void validate(LaTeXFeatures & features) 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 contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenuName() const;
 	///
 	bool showInsetDialog(BufferView * bv) const;
-	///
-	Dimension const dimension(BufferView const &) const 
-		{ return button_.dimension(); }
 	//@}
 
 protected:
@@ -99,7 +108,7 @@ protected:
 	//@{
 	/// Build the complete LaTeX command
 	/// \see InsetCommandParams::getCommand
-	docstring const getCommand(OutputParams const & rp) const 
+	docstring const getCommand(OutputParams const & rp) const
 		{ return p_.getCommand(rp); }
 	/// Return the command name
 	/// \see InsetCommandParams::getCmdName