X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIndex.h;h=a980a4278143b75fa63966044ac88f87374d7413;hb=dae8555234f0e5c8358b91c307d91b219c664617;hp=993747931769ce66cb4b5c114c2f2237b87a9dcb;hpb=9a63a02956e9fef48251ca16424e0e5e7b22a252;p=lyx.git

diff --git a/src/insets/InsetIndex.h b/src/insets/InsetIndex.h
index 9937479317..a980a42781 100644
--- a/src/insets/InsetIndex.h
+++ b/src/insets/InsetIndex.h
@@ -49,7 +49,7 @@ private:
 	///
 	InsetCode lyxCode() const { return INDEX_CODE; }
 	///
-	docstring name() const { return from_ascii("Index"); }
+	docstring layoutName() const { return from_ascii("Index"); }
 	///
 	ColorCode labelColor() const;
 	///
@@ -58,10 +58,10 @@ private:
 	void read(Lexer & lex);
 	///
 	int docbook(odocstream &, OutputParams const &) const;
-	/// 
+	///
 	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
 	bool showInsetDialog(BufferView *) const;
 	///
@@ -71,7 +71,7 @@ private:
 	/// should paragraph indendation be omitted in any case?
 	bool neverIndent() const { return true; }
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const & di, bool output_active) const;
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
@@ -79,7 +79,7 @@ private:
 	/// Updates needed features for this inset.
 	void validate(LaTeXFeatures & features) const;
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenuName() const;
 	///
 	Inset * clone() const { return new InsetIndex(*this); }
 
@@ -94,37 +94,51 @@ class InsetPrintIndex : public InsetCommand {
 public:
 	///
 	InsetPrintIndex(Buffer * buf, InsetCommandParams const &);
-	///
-	InsetCode lyxCode() const { return INDEX_PRINT_CODE; }
 
+	/// \name Public functions inherited from Inset class
+	//@{
 	///
-	static ParamInfo const & findInfo(std::string const &);
-	///
-	static std::string defaultCommand() { return "printindex"; }
+	InsetCode lyxCode() const { return INDEX_PRINT_CODE; }
 	///
-	static bool isCompatibleCommand(std::string const & s);
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	int latex(odocstream &, OutputParams const &) const;
-	/// 
 	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
-private:
+	std::string contextMenuName() const;
 	/// Updates needed features for this inset.
 	void validate(LaTeXFeatures & features) const;
 	///
 	bool hasSettings() const;
-
 	///
 	DisplayType display() const { return AlignCenter; }
+	//@}
+
+	/// \name Static public methods obligated for InsetCommand derived classes
+	//@{
 	///
-	docstring screenLabel() const;
+	static ParamInfo const & findInfo(std::string const &);
+	///
+	static std::string defaultCommand() { return "printindex"; }
+	///
+	static bool isCompatibleCommand(std::string const & s);
+	//@}
+
+private:
+	/// \name Private functions inherited from Inset class
+	//@{
 	///
 	Inset * clone() const { return new InsetPrintIndex(*this); }
+	//@}
+
+	/// \name Private functions inherited from InsetCommand class
+	//@{
+	///
+	docstring screenLabel() const;
+	//@}
 };