#include "buffer_funcs.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "Citation.h"
#include "DispatchResult.h"
#include "FuncCode.h"
#include "FuncRequest.h"
: InsetCommand(buf, p)
{
buffer().removeBiblioTempFiles();
+ cleanKeys();
}
// fall through
default:
InsetCommand::doDispatch(cur, cmd);
+ if (cmd.action() == LFUN_INSET_MODIFY)
+ cleanKeys();
}
}
bool InsetCitation::addKey(string const & key)
{
- docstring const ukey = from_utf8(key);
+ docstring const ukey = from_utf8(trim(key));
docstring const & curkeys = getParam("key");
if (curkeys.empty()) {
setParam("key", ukey);
}
vector<docstring> keys = getVectorFromString(curkeys);
- vector<docstring>::const_iterator it = keys.begin();
- vector<docstring>::const_iterator en = keys.end();
- for (; it != en; ++it) {
- if (*it == ukey) {
+ for (auto const & k : keys) {
+ if (k == ukey) {
LYXERR0("Key " << key << " already present.");
return false;
}
if (cmd == "nocite")
return 0;
- docstring const label = generateLabel(false);
+ docstring const label = generateLabel();
os << label;
return label.size();
}
static docstring const cleanupWhitespace(docstring const & citelist)
{
- docstring::const_iterator it = citelist.begin();
- docstring::const_iterator end = citelist.end();
// Paranoia check: make sure that there is no whitespace in here
// -- at least not behind commas or at the beginning
docstring result;
char_type last = ',';
- for (; it != end; ++it) {
- if (*it != ' ')
- last = *it;
- if (*it != ' ' || last != ',')
- result += *it;
+ for (char_type c : citelist) {
+ if (c != ' ')
+ last = c;
+ if (c != ' ' || last != ',')
+ result += c;
}
return result;
}
+void InsetCitation::cleanKeys() {
+ docstring cleankeys = cleanupWhitespace(getParam("key"));
+ setParam("key", cleankeys);
+}
+
void InsetCitation::docbook(XMLStream & xs, OutputParams const &) const
{
if (getCmdName() == "nocite")
void InsetCitation::toString(odocstream & os) const
{
odocstringstream ods;
- plaintext(ods, OutputParams(0));
+ plaintext(ods, OutputParams(nullptr));
os << ods.str();
}
}
+pair<int, int> InsetCitation::isWords() const
+{
+ docstring const label = generateLabel(false);
+ return pair<int, int>(label.size(), wordCount(label));
+}
+
+
string InsetCitation::contextMenuName() const
{
return "context-citation";