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

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 99f0592dd8..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.
  *
  * ====================================================== */
 
@@ -32,7 +32,7 @@ public:
 	InsetCommandParams();
 	///
 	explicit
-	InsetCommandParams( string const & n,
+	InsetCommandParams(string const & n,
 			    string const & c = string(),
 			    string const & o = string());
 	///
@@ -40,11 +40,11 @@ public:
 	///
 	bool operator!=(InsetCommandParams const &) const;
 	///
-	void Read(LyXLex &);
+	void read(LyXLex &);
 	/// Parse the command
 	void scanCommand(string const &);
 	///
-	void Write(std::ostream &) const;
+	void write(std::ostream &) const;
 	/// Build the complete LaTeX command
 	string const getCommand() const;
 	///
@@ -54,7 +54,7 @@ public:
 	///
 	string const & getContents() const { return contents; }
 	///
-	void setCmdName( string const & n) { cmdname = n; }
+	void setCmdName(string const & n) { cmdname = n; }
 	///
 	void setOptions(string const & o) { options = o; }
 	///
@@ -62,7 +62,7 @@ public:
 	///
 	string const getAsString() const;
 	///
-	void setFromString( string const & );
+	void setFromString(string const &);
 private:
 	///    
 	string cmdname;
@@ -78,36 +78,29 @@ class InsetCommand : public InsetButton, boost::noncopyable {
 public:
 	///
 	explicit
-	InsetCommand(InsetCommandParams const &);
+	InsetCommand(InsetCommandParams const &, bool same_id = false);
 	///
 	virtual ~InsetCommand() { hideDialog(); }
 	///
-	void Write(Buffer const *, std::ostream & os) const
-		{ p_.Write( os ); }
+	void write(Buffer const *, std::ostream & os) const
+		{ p_.write(os); }
 	///
-	virtual void Read(Buffer const *, LyXLex & lex)
-		{ p_.Read( lex ); }
+	virtual void read(Buffer const *, LyXLex & lex)
+		{ p_.read(lex); }
 	/// Can remove one InsetBibKey is modified
-	void scanCommand(string const & c) { p_.scanCommand( c ); };
+	void scanCommand(string const & c) { p_.scanCommand(c); };
 	/// 
-	virtual int Latex(Buffer const *, std::ostream &,
+	virtual int latex(Buffer const *, std::ostream &,
 			  bool fragile, bool free_spc) const;
 	///
-	int Ascii(Buffer const *, std::ostream &, int linelen) const;
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	virtual int Linuxdoc(Buffer const *, std::ostream &) const;
+	virtual int linuxdoc(Buffer const *, std::ostream &) const;
 	///
-	virtual int DocBook(Buffer const *, std::ostream &) const;
+	virtual int docbook(Buffer const *, std::ostream &) const;
 	///
-	Inset::Code LyxCode() const { return Inset::NO_CODE; }
+	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 const getScreenLabel() const = 0;
 	///
 	string const getCommand() const { return p_.getCommand(); }
 	///