X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbib.h;h=e51b236deaf9dfa610932c7067697f6cad72947f;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=52893fb97fbc3de82912f3e257766216c1ddd6c5;hpb=0d2e80687d14debf68f82c2282d53577a265b37d;p=lyx.git

diff --git a/src/insets/insetbib.h b/src/insets/insetbib.h
index 52893fb97f..e51b236dea 100644
--- a/src/insets/insetbib.h
+++ b/src/insets/insetbib.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,11 +16,10 @@
 #pragma interface
 #endif
 
-#include "insetcommand.h"
 #include <vector>
+#include "insetcommand.h"
 
 class Buffer;
-struct FD_bibitem_form;
 
 /** Used to insert bibitem's information (key and label)
   
@@ -30,41 +29,35 @@ struct FD_bibitem_form;
 class InsetBibKey : public InsetCommand {
 public:
 	///
-	InsetBibKey() : InsetCommand("bibitem") { counter = 1; }
-	///
-	explicit
-	InsetBibKey(string const & key, string const & label = string());
-	///
-	explicit
-	InsetBibKey(InsetBibKey const *);
+	InsetBibKey(InsetCommandParams const &);
 	///
 	~InsetBibKey();
 	///
-        Inset * Clone() const { return new InsetBibKey(this); }
+	Inset * clone(Buffer const &, bool same_id = false) const;
 	/** Currently \bibitem is used as a LyX2.x command,
 	    so we need this method.
 	*/
-        void Write(Buffer const *, std::ostream &) const;
+	void write(Buffer const *, std::ostream &) const;
 	///
-	void Read(Buffer const *, LyXLex & lex);
+	void read(Buffer const *, LyXLex & lex);
 	///
-	virtual string getScreenLabel() const;
-        ///
-	void Edit(BufferView *, int x, int y, unsigned int button);
+	virtual string const getScreenLabel(Buffer const *) const;
 	///
-	EDITABLE Editable() const {
-		return IS_EDITABLE;
-	}
+	void edit(BufferView *, int x, int y, unsigned int button);
+	///
+	void edit(BufferView * bv, bool front = true);
+	///
+	EDITABLE editable() const { return IS_EDITABLE; } 
 	/// A user can't neither insert nor delete this inset
-	bool Deletable() const {
+	bool deletable() const {
 		return false;
 	}
-        ///
-        void setCounter(int);
-        ///
-        int  getCounter() const { return counter; }
 	///
-	void callback( FD_bibitem_form *, long );
+	void setCounter(int);
+	///
+	int  getCounter() const { return counter; }
+	///
+	string const getBibLabel() const;
 	///
 	struct Holder {
 		InsetBibKey * inset;
@@ -73,9 +66,11 @@ public:
  
 private:
 	///
-        int counter;
+	int counter;
 	///
 	Holder holder;
+	///
+	static int key_counter;
 };
 
 
@@ -83,40 +78,35 @@ private:
   */
 class InsetBibtex : public InsetCommand {
 public:
-	/// 
-	InsetBibtex() : InsetCommand("BibTeX") { owner = 0; }
 	///
-	InsetBibtex(string const & dbase, string const & style,
-		    Buffer *);
+	InsetBibtex(InsetCommandParams const &, bool same_id = false);
 	///
 	~InsetBibtex();
-
-        ///
-	Inset * Clone() const {
-		return new InsetBibtex(getCmdName(), getOptions(), owner);
-	}
 	///
-	Inset::Code LyxCode() const
-	{
-		return Inset::BIBTEX_CODE;
+	Inset * clone(Buffer const &, bool same_id = false) const {
+		return new InsetBibtex(params(), same_id);
 	}
 	///
-	string getScreenLabel() const;
+	string const getScreenLabel(Buffer const *) const;
+	///
+	EDITABLE editable() const { return IS_EDITABLE; }
+	///
+	Inset::Code lyxCode() const { return Inset::BIBTEX_CODE; }
+	///
+	void edit(BufferView *, int x, int y, unsigned int button);
 	///
-	void Edit(BufferView *, int x, int y, unsigned int button);
+	void edit(BufferView * bv, bool front = true);
 	/// 
-	int Latex(Buffer const *, std::ostream &,
-		  bool fragile, bool freespace) const;
+	int latex(Buffer const *, std::ostream &,
+	          bool fragile, bool freespace) const;
 	///
-	std::vector<std::pair<string,string> > getKeys() const;
+	std::vector<std::pair<string,string> > const getKeys(Buffer const *) const;
 	///
-	EDITABLE Editable() const {
-		return IS_EDITABLE;
-	}
-        ///
-        bool addDatabase(string const &);
-        ///
-        bool delDatabase(string const &);
+	std::vector<string> const getFiles(Buffer const &) const;
+	///
+	bool addDatabase(string const &);
+	///
+	bool delDatabase(string const &);
 	///
 	bool display() const { return true; } 
 	///
@@ -126,9 +116,6 @@ public:
 	};
 
 private:
-	///
-	mutable Buffer * owner;
-
 	///
 	Holder holder;
 };