X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.cpp;h=f9b244c4603f556d3a5c68af74a1c182f4830b22;hb=79cf3f5ec1088e7de988e889247ec300d42fb70b;hp=f150d0d52ad5db701daff9f346baf728f9b97f1d;hpb=51d591d16893e595ac1163c963e5c0928fdaff68;p=lyx.git diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index f150d0d52a..f9b244c460 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -36,11 +36,13 @@ #include "frontends/alert.h" +#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/mutex.h" using namespace std; using namespace lyx::support; @@ -49,6 +51,7 @@ namespace lyx { int InsetBibitem::key_counter = 0; +static Mutex counter_mutex; docstring const key_prefix = from_ascii("key-"); @@ -56,15 +59,21 @@ InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p) : InsetCommand(buf, p) { buffer().invalidateBibinfoCache(); - if (getParam("key").empty()) + if (getParam("key").empty()) { + Mutex::Locker lock(&counter_mutex); setParam("key", key_prefix + convert(++key_counter)); + } } InsetBibitem::~InsetBibitem() { - if (isBufferLoaded()) - buffer().invalidateBibinfoCache(); + if (isBufferLoaded()) { + /* We do not use buffer() because Coverity believes that this + * may throw an exception. Actually this code path is not + * taken when buffer_ == 0 */ + buffer_->invalidateBibinfoCache(); + } } @@ -77,12 +86,10 @@ void InsetBibitem::initView() void InsetBibitem::updateCommand(docstring const & new_key, bool) { docstring key = new_key; - vector bibkeys = buffer().masterBibInfo().getKeys(); - int i = 1; - if (find(bibkeys.begin(), bibkeys.end(), key) != bibkeys.end()) { + int i = 1; // generate unique label key = new_key + '-' + convert(i); while (find(bibkeys.begin(), bibkeys.end(), key) != bibkeys.end()) { @@ -105,7 +112,9 @@ ParamInfo const & InsetBibitem::findInfo(string const & /* cmdName */) param_info_.add("label", ParamInfo::LATEX_OPTIONAL, ParamInfo::HANDLING_LATEXIFY); param_info_.add("key", ParamInfo::LATEX_REQUIRED, - ParamInfo::HANDLING_ESCAPE); + ParamInfo::ParamHandling(ParamInfo::HANDLING_ESCAPE + | ParamInfo::HANDLING_LTRIM)); + param_info_.add("literal", ParamInfo::LYX_INTERNAL); } return param_info_; } @@ -127,58 +136,27 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd) docstring const & old_key = params()["key"]; docstring const & old_label = params()["label"]; + docstring const & old_literal = params()["literal"]; docstring label = p["label"]; - - // definitions for escaping - int previous; - static docstring const backslash = from_ascii("\\"); - static docstring const lbrace = from_ascii("{"); - static docstring const rbrace = from_ascii("}"); - static char_type const chars_escape[6] = { - '&', '_', '$', '%', '#', '^'}; - static char_type const brackets_escape[2] = {'[', ']'}; - - if (!label.empty()) { - // The characters in chars_name[] need to be changed to a command when - // they are in the name field. - for (int k = 0; k < 6; k++) - for (size_t i = 0, pos; - (pos = label.find(chars_escape[k], i)) != string::npos; - i = pos + 2) { - if (pos == 0) - previous = 0; - else - previous = pos - 1; - // only if not already escaped - if (label[previous] != '\\') - label.replace(pos, 1, backslash + chars_escape[k] + lbrace + rbrace); - } - // The characters '[' and ']' need to be put into braces - for (int k = 0; k < 2; k++) - for (size_t i = 0, pos; - (pos = label.find(brackets_escape[k], i)) != string::npos; - i = pos + 2) { - if (pos == 0) - previous = 0; - else - previous = pos - 1; - // only if not already escaped - if (label[previous] != '{') - label.replace(pos, 1, lbrace + brackets_escape[k] + rbrace); - } - } + docstring literal = p["literal"]; if (old_label != label) { p["label"] = label; cur.forceBufferUpdate(); buffer().invalidateBibinfoCache(); } - setParam("label", p["label"]); + + if (old_literal != literal) { + p["literal"] = literal; + cur.forceBufferUpdate(); + buffer().invalidateBibinfoCache(); + } + setParam("literal", p["literal"]); + if (p["key"] != old_key) { updateCommand(p["key"]); - cur.bv().buffer().changeRefsIfUnique(old_key, - params()["key"], CITE_CODE); + cur.bv().buffer().changeRefsIfUnique(old_key, params()["key"]); cur.forceBufferUpdate(); buffer().invalidateBibinfoCache(); } @@ -198,6 +176,7 @@ void InsetBibitem::read(Lexer & lex) if (prefixIs(getParam("key"), key_prefix)) { int const key = convert(getParam("key").substr(key_prefix.length())); + Mutex::Locker lock(&counter_mutex); key_counter = max(key_counter, key); } } @@ -205,6 +184,9 @@ void InsetBibitem::read(Lexer & lex) docstring InsetBibitem::bibLabel() const { + BufferParams const & bp = buffer().masterBuffer()->params(); + if (bp.citeEngineType() == ENGINE_TYPE_NUMERICAL) + return autolabel_; docstring const & label = getParam("label"); return label.empty() ? autolabel_ : label; } @@ -216,7 +198,8 @@ docstring InsetBibitem::screenLabel() const } -int InsetBibitem::plaintext(odocstream & os, OutputParams const &) const +int InsetBibitem::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { odocstringstream oss; oss << '[' << bibLabel() << "] "; @@ -231,6 +214,10 @@ int InsetBibitem::plaintext(odocstream & os, OutputParams const &) const // ale070405 docstring bibitemWidest(Buffer const & buffer, OutputParams const & runparams) { + BufferParams const & bp = buffer.masterBuffer()->params(); + if (bp.citeEngineType() == ENGINE_TYPE_NUMERICAL) + return from_ascii("99"); + int w = 0; InsetBibitem const * bitem = 0; @@ -262,6 +249,7 @@ docstring bibitemWidest(Buffer const & buffer, OutputParams const & runparams) ParagraphList::const_iterator it = buffer.paragraphs().begin(); ParagraphList::const_iterator end = buffer.paragraphs().end(); + bool is_literal = false; for (; it != end; ++it) { if (it->insetList().empty()) continue; @@ -287,26 +275,39 @@ docstring bibitemWidest(Buffer const & buffer, OutputParams const & runparams) if (wx > w) { w = wx; lbl = label; + is_literal = (bitem->getParam("literal") == "true"); } } if (!lbl.empty()) { - pair latex_lbl = - runparams.encoding->latexString(lbl, runparams.dryrun); - return latex_lbl.first; + InsetCommandParams p(BIBITEM_CODE); + if (is_literal) + p["literal"] = from_ascii("true"); + return p.prepareCommand(runparams, lbl, ParamInfo::HANDLING_LATEXIFY); } return from_ascii("99"); } -void InsetBibitem::collectBibKeys(InsetIterator const & it) const +void InsetBibitem::collectBibKeys(InsetIterator const & it, FileNameList & /*checkedFiles*/) const { docstring const key = getParam("key"); docstring const label = getParam("label"); BibTeXInfo keyvalmap(false); keyvalmap.key(key); keyvalmap.label(label); + + BufferParams const & bp = buffer().masterBuffer()->params(); + Counters & counters = bp.documentClass().counters(); + docstring const bibitem = from_ascii("bibitem"); + if (bp.citeEngineType() == ENGINE_TYPE_NUMERICAL || getParam("label").empty()) { + if (counters.hasCounter(bibitem)) + counters.step(bibitem, InternalUpdate); + string const & lang = it.paragraph().getParLanguage(bp)->code(); + keyvalmap.setCiteNumber(counters.theCounter(bibitem, lang)); + } + DocIterator doc_it(it); doc_it.forwardPos(); keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString( @@ -321,7 +322,7 @@ void InsetBibitem::updateBuffer(ParIterator const & it, UpdateType utype) BufferParams const & bp = buffer().masterBuffer()->params(); Counters & counters = bp.documentClass().counters(); docstring const bibitem = from_ascii("bibitem"); - if (getParam("label").empty()) { + if (bp.citeEngineType() == ENGINE_TYPE_NUMERICAL || getParam("label").empty()) { if (counters.hasCounter(bibitem)) counters.step(bibitem, utype); string const & lang = it.paragraph().getParLanguage(bp)->code(); @@ -340,7 +341,7 @@ docstring InsetBibitem::xhtml(XHTMLStream & xs, OutputParams const &) const // need to use "name" anyway, eventually, because some browsers do not // handle jumping to ids. If we don't do that, though, we can just put the // id into the span tag. - string const attrs = + string const attrs = "id='LyXCite-" + to_utf8(html::cleanAttr(getParam("key"))) + "'"; xs << html::CompTag("a", attrs); xs << html::StartTag("span", "class='bibitemlabel'");