X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.h;h=6428e667fd006611b40e9b12438cebb3777e6f71;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=9bb25a235e228d45aa5fd903aac5a3a9d84d7d18;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 9bb25a235e..6428e667fd 100644
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  * 	 
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -16,10 +16,9 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
-#include "LString.h"
-
-using std::ostream;
+#include "insetbutton.h"
+#include <sigc++/signal_system.h>
+#include <boost/utility.hpp>
 
 // Created by Alejandro 970222
 /** Used to insert a LaTeX command automatically
@@ -27,85 +26,104 @@ using std::ostream;
  * Similar to InsetLaTeX but having control of the basic structure of a
  *   LaTeX command: \name[options]{contents}. 
  */
-class InsetCommand: public Inset {
+class InsetCommandParams {
 public:
 	///
-	InsetCommand();
+	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; }
 	///
-	InsetCommand(string const & name, string const & arg = string(), 
-		     string const & opt = string());
+	string const & getContents() const { return contents; }
 	///
-	int ascent(Painter &, LyXFont const &) const;
+	void setCmdName(string const & n) { cmdname = n; }
 	///
-	int descent(Painter &, LyXFont const &) const;
+	void setOptions(string const & o) { options = o; }
 	///
-	int width(Painter &, LyXFont const &) const;
+	void setContents(string const & c) { contents = c; }
 	///
-	void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+	string const getAsString() const;
 	///
-	void Write(ostream &) const;
-	/// Parse the command.
-	void scanCommand(string const & cmd);
-	/// Will not be used when lyxf3
-	void Read(LyXLex & lex);
+	void setFromString(string const &);
+private:
+	///    
+	string cmdname;
+	///    
+	string contents;
+	///    
+	string options;
+};
+
+
+///
+class InsetCommand : public InsetButton, boost::noncopyable {
+public:
+	///
+	explicit
+	InsetCommand(InsetCommandParams const &, bool same_id = false);
+	///
+	virtual ~InsetCommand() { hideDialog(); }
+	///
+	void write(Buffer const *, std::ostream & os) const
+		{ p_.write(os); }
+	///
+	virtual void read(Buffer const *, LyXLex & lex)
+		{ p_.read(lex); }
+	/// Can remove one InsetBibKey is modified
+	void scanCommand(string const & c) { p_.scanCommand(c); };
 	/// 
-	virtual int Latex(ostream &, signed char fragile, bool free_spc) const;
+	virtual int latex(Buffer const *, std::ostream &,
+			  bool fragile, bool free_spc) const;
 	///
-	virtual int Linuxdoc(ostream &) const;
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	virtual int DocBook(ostream &) const;
+	virtual int linuxdoc(Buffer const *, std::ostream &) const;
 	///
-	Inset * Clone() const;
-	///  
-	Inset::Code LyxCode() const
-	{
-		return Inset::NO_CODE;
-	}
-	
-	/** Get the label that appears at screen.
-	  
-         I thought it was enough to eliminate the argument to avoid
-         confusion with lyxinset::getLabel(int), but I've seen that
-         it wasn't. I hope you never confuse again both methods.  (ale)
-	 */
-	virtual string getScreenLabel() const
-	{
-		return getCommand();
-	}
+	virtual int docbook(Buffer const *, std::ostream &) const;
+	///
+	Inset::Code lyxCode() const { return Inset::NO_CODE; }
 	
-	/// Build the complete LaTeX command
-	string getCommand() const;
 	///
-	string const & getCmdName() const {
-		return command;
-	}
+	string const getCommand() const { return p_.getCommand(); }
 	///
-	string const & getOptions() const {
-		return options;
-	}
+	string const & getCmdName() const { return p_.getCmdName(); }
 	///
-	string const & getContents() const {
-		return contents;
-	}
+	string const & getOptions() const { return p_.getOptions(); }
 	///
-	void setCmdName(string const & n) {
-		command = n;
-	}
+	string const & getContents() const { return p_.getContents(); }
 	///
-	void setOptions(string const & o) {
-		options = o;
-	}
+	void setCmdName(string const & n) { p_.setCmdName(n); }
 	///
-	virtual void setContents(string const & c) {
-		contents = c;
-	}
-protected:
-	///    
-	string command;
-	///    
-	string options;
-	///    
-	string contents;
+	void setOptions(string const & o) { p_.setOptions(o); }
+	///
+	void setContents(string const & c) { p_.setContents(c); }
+	///
+	InsetCommandParams const & params() const { return p_; }
+	///
+	void setParams(InsetCommandParams const &);
+	///
+	SigC::Signal0<void> hideDialog;
+private:
+	///
+	InsetCommandParams p_;
 };
 
 #endif