X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetScript.h;h=11864d305c4a39e01d37939ad7ed6ef8fff83751;hb=e4c46abeb7385960c9dd42494e3c7c1f3e699b56;hp=4bb57674d85b67966422469a574ad45d6589095a;hpb=dea050cb93ec5b427caaf1dcfe0e0addec121881;p=lyx.git

diff --git a/src/insets/InsetScript.h b/src/insets/InsetScript.h
index 4bb57674d8..11864d305c 100644
--- a/src/insets/InsetScript.h
+++ b/src/insets/InsetScript.h
@@ -59,11 +59,13 @@ public:
 	static void string2params(std::string const &, InsetScriptParams &);
 	///
 	InsetScriptParams const & params() const { return params_; }
-private:
+
+	/// \name Public functions inherited from Inset class
+	//@{
 	///
 	InsetCode lyxCode() const { return SCRIPT_CODE; }
 	///
-	docstring name() const;
+	docstring layoutName() const;
 	///
 	DisplayType display() const;
 	///
@@ -71,52 +73,58 @@ private:
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	virtual void cursorPos(BufferView const & bv,
+	void cursorPos(BufferView const & bv,
 		CursorSlice const & sl, bool boundary, int & x, int & y) const;
 	///
 	void write(std::ostream &) const;
 	///
 	void read(Lexer & lex);
 	///
-	bool neverIndent() const { return true; }
-	///
-	virtual bool forcePlainLayout(idx_type = 0) const { return true; }
-	///
-	virtual bool allowMultiPar() const { return false; }
+	bool forcePlainLayout(idx_type = 0) const { return true; }
 	///
-	virtual bool allowParagraphCustomization(idx_type = 0) const { return false; }
+	bool allowParagraphCustomization(idx_type = 0) const { return false; }
 	///
-	virtual void validate(LaTeXFeatures &) const;
-	///
-	int latex(odocstream &, OutputParams const &) const;
+	bool neverIndent() const { return true; }
 	///
-	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 edit(Cursor & cur, bool front,
 	          EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 	///
-	virtual bool insetAllowed(InsetCode code) const;
+	bool insetAllowed(InsetCode code) const;
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void doDispatch(Cursor & cur, FuncRequest & cmd);
-	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
 	Inset * clone() const { return new InsetScript(*this); }
+	///
+	std::string contextMenuName() const;
+	//@}
+
+	/// \name Public functions inherited from InsetText class
+	//@{
+	///
+	bool allowMultiPar() const { return false; }
+	//@}
+
+protected:
+	/// \name Protected functions inherited from Inset class
+	//@{
+	///
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	//@}
+
+private:
 	/// used by the constructors
 	void init();
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
-	///
 	friend class InsetScriptParams;
-
 	///
 	InsetScriptParams params_;
 };