X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNomencl.h;h=ef5b452b36a5b75c718e9b5eec8090cb465a5344;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=b53984756ba873b0626adab0988a50f1f520141c;hpb=67e70c6c022fa445cd654937faeb87955e3bca7a;p=lyx.git

diff --git a/src/insets/InsetNomencl.h b/src/insets/InsetNomencl.h
index b53984756b..ef5b452b36 100644
--- a/src/insets/InsetNomencl.h
+++ b/src/insets/InsetNomencl.h
@@ -26,9 +26,13 @@ class LaTeXFeatures;
 class InsetNomencl : public InsetCommand {
 public:
 	///
-	InsetNomencl(InsetCommandParams const &);
+	InsetNomencl(Buffer * buf, InsetCommandParams const &);
+
 	///
-	docstring screenLabel() const;
+	int docbookGlossary(odocstream &) const;
+
+	/// \name Public functions inherited from Inset class
+	//@{
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
@@ -40,9 +44,11 @@ public:
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	/// Does nothing at the moment.
-	docstring xhtml(odocstream &, OutputParams const &) const;
-	///
-	int docbookGlossary(odocstream &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	//@}
+
+	/// \name Static public methods obligated for InsetCommand derived classes
+	//@{
 	///
 	static ParamInfo const & findInfo(std::string const &);
 	///
@@ -50,8 +56,21 @@ public:
 	///
 	static bool isCompatibleCommand(std::string const & s) 
 		{ return s == "nomenclature"; }
+	//@}
+
 private:
+	/// \name Private functions inherited from Inset class
+	//@{
+	///
 	Inset * clone() const { return new InsetNomencl(*this); }
+	//@}
+
+	/// \name Private functions inherited from InsetCommand class
+	//@{
+	///
+	docstring screenLabel() const;
+	//@}
+
 	/// unique id for this nomenclature entry for docbook export
 	docstring nomenclature_entry_id;
 };
@@ -60,13 +79,16 @@ private:
 class InsetPrintNomencl : public InsetCommand {
 public:
 	///
-	InsetPrintNomencl(InsetCommandParams const &);
+	InsetPrintNomencl(Buffer * buf, InsetCommandParams const &);
+
+	/// \name Public functions inherited from Inset class
+	//@{
 	/// Updates needed features for this inset.
 	void validate(LaTeXFeatures & features) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	/// Does nothing at the moment.
-	docstring xhtml(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	InsetCode lyxCode() const;
 	///
@@ -74,7 +96,13 @@ public:
 	///
 	DisplayType display() const { return AlignCenter; }
 	///
-	docstring screenLabel() const;
+	int latex(odocstream &, OutputParams const &) const;
+	///
+	docstring contextMenu(BufferView const & bv, int x, int y) const;
+	//@}
+
+	/// \name Static public methods obligated for InsetCommand derived classes
+	//@{
 	///
 	static ParamInfo const & findInfo(std::string const &);
 	///
@@ -82,17 +110,24 @@ public:
 	///
 	static bool isCompatibleCommand(std::string const & s) 
 		{ return s == "printnomenclature"; }
+	//@}
+
+private:
+	/// \name Private functions inherited from Inset class
+	//@{
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	Inset * clone() const { return new InsetPrintNomencl(*this); }
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
-protected:
+	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	//@}
+
+	/// \name Private functions inherited from InsetCommand class
+	//@{
 	///
-	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
-private:
-	Inset * clone() const { return new InsetPrintNomencl(*this); }
+	docstring screenLabel() const;
+	//@}
 };
 
 } // namespace lyx