Move isMultiCell() to Cursor, and use it.

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

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index beada3091a892d786f60a8052fd9e5cbd2b3a619..55e8c4d6cf94db07b52328c13e5e0c2cd29e3b0c 100644 (file)
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -10,41 +10,78 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef INSET_LATEXCOMMAND_H
-#define INSET_LATEXCOMMAND_H
+#ifndef INSETCOMMAND_H
+#define INSETCOMMAND_H
 
 #include "Inset.h"
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
-#include "MailInset.h"
 #include "Cursor.h"
 
 
 namespace lyx {
 
 
+/////////////////////////////////////////////////////////////////////////
+//
+// InsetCommand
+//
+/////////////////////////////////////////////////////////////////////////
+
 // Created by Alejandro 970222
-/** Used to insert a LaTeX command automatically.
- */
+// Used to insert a LaTeX command automatically.
 
-///
-class InsetCommand : public Inset {
+class InsetCommand : public Inset
+{
 public:
        ///
        InsetCommand(InsetCommandParams const &, std::string const & mailer_name);
        ///
        ~InsetCommand();
+
+       /// returns true if params are successfully read
+       static bool string2params(std::string const &, std::string const & name,
+                                 InsetCommandParams &);
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       static std::string params2string(std::string const & name,
+                                              InsetCommandParams const &);
        ///
-       Dimension const dimension(BufferView const &) const { return button_.dimension(); }
+       InsetCommandParams const & params() const { return p_; }
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void setParams(InsetCommandParams const &);
+       ///
+       void setParam(std::string const & name, docstring const & value);
+       ///
+       docstring const & getParam(std::string const & name) const;
+       /// FIXME Remove
+       docstring const getFirstNonOptParam() const { return p_.getFirstNonOptParam(); }
+       /// update label and references.
+       virtual void updateCommand(docstring const &, bool) {}
+
+protected:
        ///
        void write(std::ostream & os) const { p_.write(os); }
        ///
        void read(Lexer & lex) { p_.read(lex); }
        ///
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
+       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+       ///
+       docstring const getCommand() const { return p_.getCommand(); }
+       ///
+       std::string const & getCmdName() const { return p_.getCmdName(); }
+       ///
+       void setCmdName(std::string const & n) { p_.setCmdName(n); }
+
+private:
+       ///
+       void metrics(MetricsInfo &, Dimension &) const;
+       ///
+       Dimension const dimension(BufferView const &) const { return button_.dimension(); }
+       ///
+       void draw(PainterInfo & pi, int x, int y) const;
+       ///
        int latex(odocstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
@@ -53,20 +90,6 @@ public:
        ///
        InsetCode lyxCode() const { return NO_CODE; }
        ///
-       InsetCommandParams const & params() const { return p_; }
-       /// FIXME Remove
-       docstring const getFirstNonOptParam() const { return p_.getFirstNonOptParam(); }
-       ///
-       void setParam(std::string const & name, docstring const & value)
-       {
-               p_[name] = value;
-       }
-       ///
-       docstring const & getParam(std::string const & name) const
-       {
-               return p_[name];
-       }
-       ///
        void edit(Cursor & cur, bool front, 
                EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
        ///
@@ -82,22 +105,8 @@ public:
        /// Whether this is a command this inset can represent.
        /// Not implemented here. Must be implemented in derived class.
        static bool isCompatibleCommand(std::string const & cmd);
-       /// update label and references.
-       virtual void updateCommand(docstring const &, bool) {};
-
-protected:
-       ///
-       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
-       ///
-       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
-       ///
-       docstring const getCommand() const { return p_.getCommand(); }
-       ///
-       std::string const & getCmdName() const { return p_.getCmdName(); }
-       ///
-       void setCmdName(std::string const & n) { p_.setCmdName(n); }
        ///
-       void setParams(InsetCommandParams const &);
+       docstring contextMenu(BufferView const & bv, int x, int y) const;
        /// This should provide the text for the button
        virtual docstring screenLabel() const = 0;
 
@@ -113,31 +122,6 @@ private:
 };
 
 
-class InsetCommandMailer : public MailInset {
-public:
-       ///
-       InsetCommandMailer(std::string const & name, InsetCommand & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
-       /// returns true if params are successfully read
-       static bool string2params(std::string const &, std::string const & name,
-                                 InsetCommandParams &);
-       ///
-       static std::string const params2string(std::string const & name,
-                                              InsetCommandParams const &);
-private:
-       ///
-       std::string const name_;
-       ///
-       InsetCommand & inset_;
-};
-
-
-
 } // namespace lyx
 
 #endif