fix #832

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

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 2977beb283bfb0dce26287d7dc0f440aa2e6d97c..08a05823dd720b563274dfa03ac68a6a0b0bd15e 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -1,77 +1,30 @@
 // -*- C++ -*-
-/* This file is part of*
- * ====================================================== 
+/**
+ * \file insetcommand.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Angus Leeming
+ * \author Lars Gullik Bjønnes
  *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef INSET_LATEXCOMMAND_H
 #define INSET_LATEXCOMMAND_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "insetbutton.h"
-#include <sigc++/signal_system.h>
+#include "insetcommandparams.h"
+#include "mailinset.h"
 #include <boost/utility.hpp>
 
 // Created by Alejandro 970222
 /** Used to insert a LaTeX command automatically
  *
  * Similar to InsetLaTeX but having control of the basic structure of a
- *   LaTeX command: \name[options]{contents}. 
+ *   LaTeX command: \name[options]{contents}.
  */
-class InsetCommandParams {
-public:
-       ///
-       InsetCommandParams();
-       ///
-       explicit
-       InsetCommandParams(string const & n,
-                           string const & c = string(),
-                           string const & o = string());
-       ///
-       bool operator==(InsetCommandParams const &) const;
-       ///
-       bool operator!=(InsetCommandParams const &) const;
-       ///
-       void read(LyXLex &);
-       /// Parse the command
-       void scanCommand(string const &);
-       ///
-       void write(std::ostream &) const;
-       /// Build the complete LaTeX command
-       string const getCommand() const;
-       ///
-       string const & getCmdName() const { return cmdname; }
-       ///
-       string const & getOptions() const { return options; }
-       ///
-       string const & getContents() const { return contents; }
-       ///
-       void setCmdName(string const & n) { cmdname = n; }
-       ///
-       void setOptions(string const & o) { options = o; }
-       ///
-       void setContents(string const & c) { contents = c; }
-       ///
-       string const getAsString() const;
-       ///
-       void setFromString(string const &);
-private:
-       ///    
-       string cmdname;
-       ///    
-       string contents;
-       ///    
-       string options;
-};
-
 
 ///
 class InsetCommand : public InsetButton, boost::noncopyable {
@@ -80,8 +33,6 @@ public:
        explicit
        InsetCommand(InsetCommandParams const &, bool same_id = false);
        ///
-       virtual ~InsetCommand() { hideDialog(); }
-       ///
        void write(Buffer const *, std::ostream & os) const
                { p_.write(os); }
        ///
@@ -89,7 +40,7 @@ public:
                { p_.read(lex); }
        /// Can remove one InsetBibKey is modified
        void scanCommand(string const & c) { p_.scanCommand(c); };
-       /// 
+       ///
        virtual int latex(Buffer const *, std::ostream &,
                          bool fragile, bool free_spc) const;
        ///
@@ -97,10 +48,10 @@ public:
        ///
        virtual int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       virtual int docbook(Buffer const *, std::ostream &) const;
+       virtual int docbook(Buffer const *, std::ostream &, bool) const;
        ///
        Inset::Code lyxCode() const { return Inset::NO_CODE; }
-       
+
        ///
        string const getCommand() const { return p_.getCommand(); }
        ///
@@ -120,13 +71,35 @@ public:
        ///
        void setParams(InsetCommandParams const &);
        ///
-       SigC::Signal0<void> hideDialog;
-       ///
-       bool insetButtonRelease(BufferView *, int x, int y, int button);
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
 
 private:
        ///
        InsetCommandParams p_;
 };
 
+
+class InsetCommandMailer : public MailInset {
+public:
+       ///
+       InsetCommandMailer(string const & name, InsetCommand & inset);
+       ///
+       virtual InsetBase & inset() const { return inset_; }
+       ///
+       virtual string const & name() const { return name_; }
+       ///
+       virtual string const inset2string() const;
+       ///
+       static void string2params(string const &, InsetCommandParams &);
+       ///
+       static string const params2string(string const & name,
+                                         InsetCommandParams const &);
+private:
+       ///
+       string const name_;
+       ///
+       InsetCommand & inset_;
+};
+
+
 #endif