X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.cpp;h=d0a28e73fe964d02965d168b1b6829fa78f51096;hb=c9d9309c1ecffa218dee04ce4f7991ed4fc0c9bb;hp=ded2b8b9cca3507daafad96b1476f9b426c9b5e7;hpb=caa4e94bf02b9d3131bc280390fae44683fd5e9a;p=lyx.git diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index ded2b8b9cc..d0a28e73fe 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -15,17 +15,20 @@ #include "BiblioInfo.h" #include "Buffer.h" +#include "Cursor.h" #include "buffer_funcs.h" #include "BufferParams.h" #include "BufferView.h" #include "Counters.h" #include "DispatchResult.h" +#include "Encoding.h" #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" #include "Paragraph.h" #include "ParagraphList.h" #include "ParIterator.h" @@ -34,9 +37,11 @@ #include "frontends/alert.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; @@ -45,22 +50,25 @@ 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()) + buffer().invalidateBibinfoCache(); + if (getParam("key").empty()) { + Mutex::Locker lock(&counter_mutex); setParam("key", key_prefix + convert(++key_counter)); + } } InsetBibitem::~InsetBibitem() { - if (isBufferValid()) - buffer_->invalidateBibinfoCache(); + if (isBufferLoaded()) + buffer().invalidateBibinfoCache(); } @@ -72,14 +80,11 @@ void InsetBibitem::initView() 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()) { + int i = 1; // generate unique label key = new_key + '-' + convert(i); while (find(bibkeys.begin(), bibkeys.end(), key) != bibkeys.end()) { @@ -91,8 +96,7 @@ void InsetBibitem::updateCommand(docstring const & new_key, bool) "it will be changed to %2$s."), new_key, key)); } setParam("key", key); - - buffer().updateLabels(); + buffer().invalidateBibinfoCache(); } @@ -100,8 +104,10 @@ 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); + param_info_.add("label", ParamInfo::LATEX_OPTIONAL, + ParamInfo::HANDLING_LATEXIFY); + param_info_.add("key", ParamInfo::LATEX_REQUIRED, + ParamInfo::HANDLING_ESCAPE); } return param_info_; } @@ -109,23 +115,74 @@ ParamInfo const & InsetBibitem::findInfo(string const & /* cmdName */) void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { InsetCommandParams p(BIBITEM_CODE); - InsetCommand::string2params("bibitem", to_utf8(cmd.argument()), p); + InsetCommand::string2params(to_utf8(cmd.argument()), p); if (p.getCmdName().empty()) { - cur.noUpdate(); + cur.noScreenUpdate(); break; } + + cur.recordUndo(); + docstring const & old_key = params()["key"]; + docstring const & old_label = params()["label"]; + docstring label = p["label"]; + + // definitions for escaping + 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()) { + 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++) + 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); + } + } + + 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(); } - buffer_->invalidateBibinfoCache(); break; } @@ -142,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); } } @@ -149,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; } @@ -160,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() << "] "; @@ -173,8 +235,12 @@ int InsetBibitem::plaintext(odocstream & os, OutputParams const &) const // ale070405 -docstring bibitemWidest(Buffer const & buffer) +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; @@ -234,33 +300,51 @@ docstring bibitemWidest(Buffer const & buffer) } } - if (!lbl.empty()) - return lbl; + if (!lbl.empty()) { + 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); } // Update the counters of this inset and of its contents -void InsetBibitem::updateLabels(ParIterator const & it, UpdateType utype) +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 { @@ -277,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("key")) + "'"; + string const attrs = + "id='LyXCite-" + to_utf8(html::cleanAttr(getParam("key"))) + "'"; xs << html::CompTag("a", attrs); xs << html::StartTag("span", "class='bibitemlabel'"); xs << bibLabel();