X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.h;h=417b46f518700d857066bba6b179c64388858e7d;hb=e4c46abeb7385960c9dd42494e3c7c1f3e699b56;hp=c29415ca2a2b8c6c36cf83277f69f3d2a70ad1cb;hpb=9e9c96035cd48e30f658c96a8448c99c868772b3;p=lyx.git

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index c29415ca2a..417b46f518 100644
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -15,8 +15,6 @@
 
 #include "InsetCommand.h"
 
-#include "Citation.h"
-
 namespace lyx {
 
 /////////////////////////////////////////////////////////////////////////
@@ -31,6 +29,11 @@ class InsetCitation : public InsetCommand
 public:
 	///
 	InsetCitation(Buffer * buf, InsetCommandParams const &);
+	///
+	~InsetCitation();
+
+	///
+	bool addKey(std::string const & key);
 
 	/// \name Public functions inherited from Inset class
 	//@{
@@ -41,11 +44,14 @@ public:
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	///
 	InsetCode lyxCode() const { return CITE_CODE; }
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
@@ -53,25 +59,23 @@ public:
 	///
 	void toString(odocstream &) const;
 	///
-	void forToc(docstring &, size_t) const;
+	void forOutliner(docstring &, size_t const, bool const) const;
 	///
-	void validate(LaTeXFeatures &) const;
+	void validate(LaTeXFeatures &) const {}
 	///
 	void updateBuffer(ParIterator const & it, UpdateType);
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype) const;
 	///
-	docstring contextMenuName() const;
+	std::string contextMenuName() const;
 	//@}
 
 	/// \name Static public methods obligated for InsetCommand derived classes
 	//@{
 	///
 	static ParamInfo const & findInfo(std::string const &);
-	// FIXME This is the locus of the design problem we have.
-	// It really ought to do what default_cite_command() does,
-	// but to do that it needs to know what CiteEngine we are
-	// using.
+	///
 	static std::string defaultCommand() { return "cite"; }
 	///
 	static bool isCompatibleCommand(std::string const & cmd);
@@ -97,19 +101,15 @@ private:
 	docstring screenLabel() const;
 	//@}
 
-	/// we'll eventually want to be able to get info on this from the 
+	/// we'll eventually want to be able to get info on this from the
 	/// various CiteEngines
 	static ParamInfo param_info_;
 
 	///
-	class Cache {
-	public:
-		///
-		Cache() : engine(ENGINE_BASIC), params(CITE_CODE) {}
-		///
-		CiteEngine engine;
+	struct Cache {
+		Cache() : recalculate(true) {}
 		///
-		InsetCommandParams params;
+		bool recalculate;
 		///
 		docstring generated_label;
 		///