Don't remove cell selections after fontchange.

[lyx.git] / src / insets / insetcite.C

diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index d89732c80dd5c60e239b0ee5837b0c8597a7bfa5..6eedb6df8ccf46d8bf539f5fe5370078359b374f 100644 (file)
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -18,9 +18,15 @@
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
 #include "LyXView.h"
+
 #include "frontends/Dialogs.h"
+
 #include "support/lstrings.h"
 
+
+using std::ostream;
+
+
 InsetCitation::InsetCitation(InsetCommandParams const & p, bool)
        : InsetCommand(p)
 {}
@@ -36,7 +42,7 @@ string const InsetCitation::getScreenLabel(Buffer const *) 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, ','));
 
@@ -68,7 +74,7 @@ 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;
@@ -78,7 +84,7 @@ int InsetCitation::ascii(Buffer const *, std::ostream & os, int) const
 // 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, std::ostream & os,
+int InsetCitation::latex(Buffer const * buffer, ostream & os,
                        bool /*fragile*/, bool/*fs*/) const
 {
        os << "\\";
@@ -90,7 +96,14 @@ int InsetCitation::latex(Buffer const * buffer, std::ostream & os,
        if (!getOptions().empty())
                os << "[" << getOptions() << "]";
 
-       os << "{" << getContents() << "}";
+       // 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;
 }
@@ -99,5 +112,5 @@ int InsetCitation::latex(Buffer const * buffer, std::ostream & os,
 void InsetCitation::validate(LaTeXFeatures & features) const
 {
        if (features.bufferParams().use_natbib)
-               features.natbib = true;
+               features.require("natbib");
 }