Better TOC output for XHTML, per Rob and Pavel.

[lyx.git] / src / insets / InsetCommand.h

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index 04f40f66a167fd3df152cf5554921837d136e9ae..3ea57c98dc3ade79ca92ebfad310aaa20ce08a5e 100644 (file)
--- 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;
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -35,8 +35,7 @@ class InsetCommand : public Inset
 {
 public:
        ///
-       InsetCommand(Buffer *, InsetCommandParams const &,
-               std::string const & mailer_name);
+       InsetCommand(Buffer *, InsetCommandParams const &);
        ///
        InsetCommand(InsetCommand const & rhs);
        ///
@@ -46,13 +45,11 @@ public:
        ///
        InsetCommand const * asInsetCommand() const { return this; }
 
-
-       /// returns true if params are successfully read
-       static bool string2params(std::string const &, std::string const & name,
+       /// \return true if params are successfully read
+       static bool string2params(std::string const & data,
                                  InsetCommandParams &);
        ///
-       static std::string params2string(std::string const & name,
-                                              InsetCommandParams const &);
+       static std::string params2string(InsetCommandParams const &);
        ///
        InsetCommandParams const & params() const { return p_; }
        ///
@@ -64,7 +61,7 @@ public:
        /// FIXME Remove
        docstring const getFirstNonOptParam() const { return p_.getFirstNonOptParam(); }
 
-       /// \name Methods inherited from Inset class
+       /// \name Public functions inherited from Inset class
        //@{
        ///
        void write(std::ostream & os) const { p_.write(os); }
@@ -79,7 +76,7 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -88,8 +85,13 @@ public:
        bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
        bool clickable(int, int) const { return hasSettings(); }
+       //@}
+
+protected:
+       /// \name Methods relaying to the InsetCommandParams p_
+       //@{
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        bool showInsetDialog(BufferView * bv) const;
        ///
@@ -98,7 +100,7 @@ public:
        //@}
 
 protected:
-       /// \name Methods relaying to the InsetCommandParams
+       /// \name Functions relaying to the InsetCommandParams
        //@{
        /// Build the complete LaTeX command
        /// \see InsetCommandParams::getCommand
@@ -120,7 +122,7 @@ private:
        /// This should provide the text for the button
        virtual docstring screenLabel() const = 0;
 
-       /// \name Methods obligated for InsetCommand derived classes
+       /// \name Static public methods obligated for InsetCommand derived classes
        //@{
        /// Return parameter information for command cmdName.
        /// Not implemented here. Must be implemented in derived class.
@@ -135,8 +137,6 @@ private:
 
        ///
        InsetCommandParams p_;
-       ///
-       std::string mailer_name_;
        /// changes color when mouse enters/leaves this inset
        mutable std::map<BufferView const *, bool> mouse_hover_;
        ///