X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcite.C;h=6eedb6df8ccf46d8bf539f5fe5370078359b374f;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=e138f1b19a202f8e3764a1471e41329e14b7ca81;hpb=31b56dac8042735f75229ad480b3e98531c181ff;p=lyx.git

diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index e138f1b19a..6eedb6df8c 100644
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -14,16 +14,24 @@
 #endif
 
 #include "insetcite.h"
+#include "buffer.h"
 #include "BufferView.h"
+#include "LaTeXFeatures.h"
 #include "LyXView.h"
+
 #include "frontends/Dialogs.h"
+
 #include "support/lstrings.h"
 
-InsetCitation::InsetCitation(InsetCommandParams const & p)
+
+using std::ostream;
+
+
+InsetCitation::InsetCitation(InsetCommandParams const & p, bool)
 	: InsetCommand(p)
 {}
 
-string const InsetCitation::getScreenLabel() const
+string const InsetCitation::getScreenLabel(Buffer const *) const
 {
 	string keys(getContents());
 
@@ -34,7 +42,7 @@ string const InsetCitation::getScreenLabel() const
 		keys = frontStrip(split(keys, label, ',')) + ",";
 
 		string::size_type const maxSize = 40;
-		while (contains( keys, "," )) {
+		while (contains(keys, ",")) {
 			string key;
 			keys = frontStrip(split(keys, key, ','));
 
@@ -56,14 +64,53 @@ string const InsetCitation::getScreenLabel() const
 }
 
 
-void InsetCitation::Edit(BufferView * bv, int, int, unsigned int)
+void InsetCitation::edit(BufferView * bv, int, int, unsigned int)
 {
 	bv->owner()->getDialogs()->showCitation(this);
 }
 
+void InsetCitation::edit(BufferView * bv, bool)
+{
+	edit(bv, 0, 0, 0);
+}
 
-int InsetCitation::Ascii(Buffer const *, std::ostream & os, int) const
+int InsetCitation::ascii(Buffer const *, ostream & os, int) const
 {
         os << "[" << getContents() << "]";
         return 0;
 }
+
+// Have to overwrite the default InsetCommand method in order to check that
+// the \cite command is valid. Eg, the user has natbib enabled, inputs some
+// citations and then changes his mind, turning natbib support off. The output
+// should revert to \cite[]{}
+int InsetCitation::latex(Buffer const * buffer, ostream & os,
+			bool /*fragile*/, bool/*fs*/) const
+{
+	os << "\\";
+	if (buffer->params.use_natbib)
+		os << getCmdName();
+	else
+		os << "cite";
+
+	if (!getOptions().empty())
+		os << "[" << getOptions() << "]";
+
+	// Paranoia check: make sure that there is no whitespace in here
+	string content;
+	for (string::const_iterator it = getContents().begin();
+	     it != getContents().end(); ++it) {
+		if (*it != ' ') content += *it;
+	}
+	
+	os << "{" << content << "}";
+
+	return 0;
+}
+
+
+void InsetCitation::validate(LaTeXFeatures & features) const
+{
+	if (features.bufferParams().use_natbib)
+		features.require("natbib");
+}