X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIndex.h;h=80d8149bc4cab58a93814baafe6eef8270800343;hb=3391fed36a574fb729f243888258d1b6d45b0251;hp=c66be3004913b67d37f753923ba8f5bed1c314c6;hpb=bbfc419c10010c1ebf6ab59adf2eaf6f63104a9e;p=features.git

diff --git a/src/insets/InsetIndex.h b/src/insets/InsetIndex.h
index c66be30049..80d8149bc4 100644
--- a/src/insets/InsetIndex.h
+++ b/src/insets/InsetIndex.h
@@ -38,7 +38,7 @@ public:
 class InsetIndex : public InsetCollapsable {
 public:
 	///
-	InsetIndex(Buffer const &, InsetIndexParams const &);
+	InsetIndex(Buffer *, InsetIndexParams const &);
 	///
 	static std::string params2string(InsetIndexParams const &);
 	///
@@ -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,11 +58,10 @@ private:
 	void read(Lexer & lex);
 	///
 	int docbook(odocstream &, OutputParams const &) const;
-	/// At the moment, this does nothing. See development/HTML.notes
-	/// for some remarks on what could be done.
-	docstring xhtml(odocstream &, OutputParams const &) const;
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	///
+	void latex(otexstream &, OutputParams const &) const;
 	///
 	bool showInsetDialog(BufferView *) const;
 	///
@@ -72,17 +71,20 @@ private:
 	/// should paragraph indendation be omitted in any case?
 	bool neverIndent() const { return true; }
 	///
-	void addToToc(DocIterator const &);
-	///
-	docstring const buttonLabel(BufferView const & bv) const;
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype, TocBackend & backend) const;
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
+	///
+	docstring const buttonLabel(BufferView const & bv) const;
 	/// 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); }
+	/// Is the content of this inset part of the immediate text sequence?
+	bool isPartOfTextSequence() const { return false; }
 
 	///
 	friend class InsetIndexParams;
@@ -94,38 +96,52 @@ private:
 class InsetPrintIndex : public InsetCommand {
 public:
 	///
-	InsetPrintIndex(InsetCommandParams const &);
-	///
-	InsetCode lyxCode() const { return INDEX_PRINT_CODE; }
+	InsetPrintIndex(Buffer * buf, InsetCommandParams const &);
 
+	/// \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;
-	/// Does nothing yet.
-	docstring xhtml(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;
+	//@}
 };