X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.cpp;h=d0a28e73fe964d02965d168b1b6829fa78f51096;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=9be1656301c031755a9b5aa13d87e293fdd36f44;hpb=c5b9664476770aad788572fd4a16ec89ca4382ab;p=lyx.git diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index 9be1656301..d0a28e73fe 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -15,6 +15,7 @@ #include "BiblioInfo.h" #include "Buffer.h" +#include "Cursor.h" #include "buffer_funcs.h" #include "BufferParams.h" #include "BufferView.h" @@ -24,7 +25,7 @@ #include "FuncRequest.h" #include "InsetIterator.h" #include "InsetList.h" -#include "Language.h" +#include "Language.h" #include "Lexer.h" #include "output_xhtml.h" #include "OutputParams.h" @@ -40,6 +41,7 @@ #include "support/docstream.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/mutex.h" using namespace std; using namespace lyx::support; @@ -48,15 +50,18 @@ namespace lyx { int InsetBibitem::key_counter = 0; +static Mutex counter_mutex; docstring const key_prefix = from_ascii("key-"); InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p) - : InsetCommand(buf, p, "bibitem") + : 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)); + } } @@ -76,12 +81,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()) { @@ -121,12 +124,14 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd) cur.noScreenUpdate(); break; } + + cur.recordUndo(); + docstring const & old_key = params()["key"]; docstring const & old_label = params()["label"]; 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("}"); @@ -135,6 +140,7 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd) static char_type const brackets_escape[2] = {'[', ']'}; if (!label.empty()) { + int previous; // 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++) @@ -162,19 +168,18 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd) if (label[previous] != '{') label.replace(pos, 1, lbrace + brackets_escape[k] + rbrace); } + } - if (old_label != label) { - p["label"] = label; - cur.forceBufferUpdate(); - buffer().invalidateBibinfoCache(); - } + if (old_label != label) { + p["label"] = label; + cur.forceBufferUpdate(); + buffer().invalidateBibinfoCache(); } setParam("label", p["label"]); 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(); } @@ -194,6 +199,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); } } @@ -201,6 +207,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; } @@ -212,7 +221,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() << "] "; @@ -227,6 +237,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; @@ -287,35 +301,38 @@ docstring bibitemWidest(Buffer const & buffer, OutputParams const & runparams) } if (!lbl.empty()) { - docstring latex_lbl; - for (size_t n = 0; n < lbl.size(); ++n) { - try { - latex_lbl += runparams.encoding->latexChar(lbl[n]); - } catch (EncodingException & /* e */) { - if (runparams.dryrun) { - latex_lbl += "<" + _("LyX Warning: ") - + _("uncodable character") + " '"; - latex_lbl += docstring(1, lbl[n]); - latex_lbl += "'>"; - } - } - } - return latex_lbl; + pair latex_lbl = + runparams.encoding->latexString(lbl, runparams.dryrun); + return latex_lbl.first; } return from_ascii("99"); } -void InsetBibitem::fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it) const +void InsetBibitem::collectBibKeys(InsetIterator const & it) const { docstring const key = getParam("key"); + docstring const label = getParam("label"); BibTeXInfo keyvalmap(false); - keyvalmap.label(bibLabel()); - DocIterator doc_it(it); + 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(); - keys[key] = keyvalmap; + keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString( + AS_STR_INSETS | AS_STR_SKIPDELETE); + buffer().addBibTeXInfo(key, keyvalmap); } @@ -325,8 +342,9 @@ 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 (counters.hasCounter(bibitem) && getParam("label").empty()) { - counters.step(bibitem, utype); + 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(); autolabel_ = counters.theCounter(bibitem, lang); } else { @@ -343,7 +361,8 @@ 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 = "id='" + to_utf8(getParam("label")) + "'"; + string const attrs = + "id='LyXCite-" + to_utf8(html::cleanAttr(getParam("key"))) + "'"; xs << html::CompTag("a", attrs); xs << html::StartTag("span", "class='bibitemlabel'"); xs << bibLabel();