X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.cpp;h=fcd4c746c449f847a53d40099dacb00b729f1d3a;hb=09177238e6e4eeadca7de46edd54d314d78d14ac;hp=50e1cb1c8a33e0804c3d0a2c27302fcaa2056e83;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index 50e1cb1c8a..fcd4c746c4 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -9,10 +9,13 @@ */ #include +#include #include "InsetBibitem.h" +#include "BiblioInfo.h" #include "Buffer.h" +#include "buffer_funcs.h" #include "BufferParams.h" #include "BufferView.h" #include "Counters.h" @@ -21,45 +24,85 @@ #include "InsetIterator.h" #include "InsetList.h" #include "Lexer.h" +#include "output_xhtml.h" #include "Paragraph.h" #include "ParagraphList.h" +#include "TextClass.h" + +#include "frontends/alert.h" -#include "support/lstrings.h" -#include "support/std_ostream.h" #include "support/convert.h" +#include "support/docstream.h" +#include "support/gettext.h" +#include "support/lstrings.h" +using namespace std; +using namespace lyx::support; namespace lyx { int InsetBibitem::key_counter = 0; - - docstring const key_prefix = from_ascii("key-"); -InsetBibitem::InsetBibitem(InsetCommandParams const & p) +InsetBibitem::InsetBibitem(Buffer const & buf, InsetCommandParams const & p) : InsetCommand(p, "bibitem") { + Inset::setBuffer(const_cast(buf)); + buffer_->invalidateBibinfoCache(); if (getParam("key").empty()) setParam("key", key_prefix + convert(++key_counter)); } -CommandInfo const * InsetBibitem::findInfo(std::string const & /* cmdName */) +InsetBibitem::~InsetBibitem() { - static const char * const paramnames[] = {"label", "key", ""}; - static const bool isoptional[] = {true, false}; - static const CommandInfo info = {2, paramnames, isoptional}; - return &info; + if (isBufferValid()) + buffer_->invalidateBibinfoCache(); } -Inset * InsetBibitem::clone() const +void InsetBibitem::initView() { - InsetBibitem * b = new InsetBibitem(params()); - b->autolabel_ = autolabel_; - return b; + updateCommand(getParam("key")); +} + + +void InsetBibitem::updateCommand(docstring const & new_key, bool) +{ + docstring const old_key = getParam("key"); + docstring key = new_key; + + vector bibkeys = buffer().masterBibInfo().getKeys(); + + int i = 1; + + if (find(bibkeys.begin(), bibkeys.end(), key) != bibkeys.end()) { + // generate unique label + key = new_key + '-' + convert(i); + while (find(bibkeys.begin(), bibkeys.end(), key) != bibkeys.end()) { + ++i; + key = new_key + '-' + convert(i); + } + frontend::Alert::warning(_("Keys must be unique!"), + bformat(_("The key %1$s already exists,\n" + "it will be changed to %2$s."), new_key, key)); + } + setParam("key", key); + + buffer().updateLabels(); +} + + +ParamInfo const & InsetBibitem::findInfo(string const & /* cmdName */) +{ + static ParamInfo param_info_; + if (param_info_.empty()) { + param_info_.add("label", ParamInfo::LATEX_OPTIONAL); + param_info_.add("key", ParamInfo::LATEX_REQUIRED); + } + return param_info_; } @@ -69,15 +112,20 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_INSET_MODIFY: { InsetCommandParams p(BIBITEM_CODE); - InsetCommandMailer::string2params("bibitem", to_utf8(cmd.argument()), p); + InsetCommand::string2params("bibitem", to_utf8(cmd.argument()), p); if (p.getCmdName().empty()) { cur.noUpdate(); break; } - if (p["key"] != params()["key"]) - cur.bv().buffer().changeRefsIfUnique(params()["key"], - p["key"], CITE_CODE); - setParams(p); + docstring const & old_key = params()["key"]; + setParam("label", p["label"]); + if (p["key"] != old_key) { + updateCommand(p["key"]); + cur.bv().buffer().changeRefsIfUnique(old_key, + params()["key"], CITE_CODE); + } + buffer_->invalidateBibinfoCache(); + break; } default: @@ -87,35 +135,34 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd) } -void InsetBibitem::read(Buffer const & buf, Lexer & lex) +void InsetBibitem::read(Lexer & lex) { - InsetCommand::read(buf, lex); + InsetCommand::read(lex); - if (support::prefixIs(getParam("key"), key_prefix)) { + if (prefixIs(getParam("key"), key_prefix)) { int const key = convert(getParam("key").substr(key_prefix.length())); - key_counter = std::max(key_counter, key); + key_counter = max(key_counter, key); } } -docstring const InsetBibitem::getBibLabel() const +docstring InsetBibitem::bibLabel() const { docstring const & label = getParam("label"); return label.empty() ? autolabel_ : label; } -docstring const InsetBibitem::getScreenLabel(Buffer const &) const +docstring InsetBibitem::screenLabel() const { - return getParam("key") + " [" + getBibLabel() + ']'; + return getParam("key") + " [" + bibLabel() + ']'; } -int InsetBibitem::plaintext(Buffer const &, odocstream & os, - OutputParams const &) const +int InsetBibitem::plaintext(odocstream & os, OutputParams const &) const { odocstringstream oss; - oss << '[' << getBibLabel() << "] "; + oss << '[' << bibLabel() << "] "; docstring const str = oss.str(); os << str; @@ -125,7 +172,7 @@ int InsetBibitem::plaintext(Buffer const &, odocstream & os, // ale070405 -docstring const bibitemWidest(Buffer const & buffer) +docstring bibitemWidest(Buffer const & buffer) { int w = 0; @@ -136,7 +183,7 @@ docstring const bibitemWidest(Buffer const & buffer) /* bibitemWidest() is supposed to find the bibitem with the widest label in the output, because that is needed as an argument of the bibliography - environment to dtermine the correct indentation. To be 100% correct we + environment to determine the correct indentation. To be 100% correct we would need the metrics of the font that is used in the output, but usually we don't have access to these. In practice, any proportional font is probably good enough, since we don't @@ -153,6 +200,8 @@ docstring const bibitemWidest(Buffer const & buffer) font. */ + docstring lbl; + ParagraphList::const_iterator it = buffer.paragraphs().begin(); ParagraphList::const_iterator end = buffer.paragraphs().end(); @@ -164,7 +213,7 @@ docstring const bibitemWidest(Buffer const & buffer) continue; bitem = static_cast(inset); - docstring const label = bitem->getBibLabel(); + docstring const label = bitem->bibLabel(); // FIXME: we can't be sure using the following that the GUI // version and the command-line version will give the same @@ -178,42 +227,49 @@ docstring const bibitemWidest(Buffer const & buffer) // potentially the wrong one. int const wx = label.size(); - if (wx > w) + if (wx > w) { w = wx; + lbl = label; + } } - if (bitem && !bitem->getBibLabel().empty()) - return bitem->getBibLabel(); + if (!lbl.empty()) + return lbl; return from_ascii("99"); } -void InsetBibitem::fillWithBibKeys(Buffer const & buf, - BiblioInfo & keys, InsetIterator const & it) const +void InsetBibitem::fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it) const { docstring const key = getParam("key"); - BibTeXInfo keyvalmap; - keyvalmap[from_ascii("label")] = getParam("label"); + BibTeXInfo keyvalmap(false); + keyvalmap.label(bibLabel()); DocIterator doc_it(it); doc_it.forwardPos(); - keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString(buf, false); - keyvalmap.isBibTeX = false; + keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString(); keys[key] = keyvalmap; } -/// Update the counters of this inset and of its contents -void InsetBibitem::updateLabels(Buffer const &buf, ParIterator const &) +// Update the counters of this inset and of its contents +void InsetBibitem::updateLabels(ParIterator const &) { - Counters & counters = buf.params().getTextClass().counters(); + Counters & counters = buffer().masterBuffer()->params().documentClass().counters(); docstring const bibitem = from_ascii("bibitem"); if (counters.hasCounter(bibitem) && getParam("label").empty()) { counters.step(bibitem); autolabel_ = counters.theCounter(bibitem); - } else + } else { autolabel_ = from_ascii("??"); - refresh(); + } +} + + +int InsetBibitem::xhtml(odocstream & os, OutputParams const &) const +{ + os << ""; + os << "" << bibLabel() << " "; }