X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.cpp;h=f9b244c4603f556d3a5c68af74a1c182f4830b22;hb=d6a93143ec2146210d79f58cac42f9608da86100;hp=1e7d13972efc1e647230b383215ca8fdb3e35cfc;hpb=d3365ebbe748a5500186729add2969c7dc34b812;p=lyx.git

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 1e7d13972e..f9b244c460 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"
@@ -33,10 +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;
@@ -45,22 +51,29 @@ 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<docstring>(++key_counter));
+	}
 }
 
 
 InsetBibitem::~InsetBibitem()
 {
-	if (isBufferValid())
+	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();
+	}
 }
 
 
@@ -72,14 +85,11 @@ void InsetBibitem::initView()
 
 void InsetBibitem::updateCommand(docstring const & new_key, bool)
 {
-	docstring const old_key = getParam("key");
 	docstring key = new_key;
-
 	vector<docstring> 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<docstring>(i);
 		while (find(bibkeys.begin(), bibkeys.end(), key) != bibkeys.end()) {
@@ -91,8 +101,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 +109,12 @@ 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::ParamHandling(ParamInfo::HANDLING_ESCAPE
+							 | ParamInfo::HANDLING_LTRIM));
+		param_info_.add("literal", ParamInfo::LYX_INTERNAL);
 	}
 	return param_info_;
 }
@@ -109,23 +122,44 @@ 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 const & old_literal = params()["literal"];
+		docstring label = p["label"];
+		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();
 		}
-		buffer_->invalidateBibinfoCache();
 		break;
 	}
 
@@ -142,6 +176,7 @@ void InsetBibitem::read(Lexer & lex)
 
 	if (prefixIs(getParam("key"), key_prefix)) {
 		int const key = convert<int>(getParam("key").substr(key_prefix.length()));
+		Mutex::Locker lock(&counter_mutex);
 		key_counter = max(key_counter, key);
 	}
 }
@@ -149,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;
 }
@@ -160,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() << "] ";
@@ -173,8 +212,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;
@@ -206,6 +249,7 @@ docstring bibitemWidest(Buffer const & buffer)
 	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;
@@ -231,36 +275,56 @@ docstring bibitemWidest(Buffer const & buffer)
 		if (wx > w) {
 			w = wx;
 			lbl = label;
+			is_literal = (bitem->getParam("literal") == "true");
 		}
 	}
 
-	if (!lbl.empty())
-		return lbl;
+	if (!lbl.empty()) {
+		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::fillWithBibKeys(BiblioInfo & keys, 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.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) 
+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);
+	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,11 +341,12 @@ 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")) + "'";
-	xs << CompTag("a", attrs);
-	xs << StartTag("span", "class='biblabel'");
+	string const attrs =
+		"id='LyXCite-" + to_utf8(html::cleanAttr(getParam("key"))) + "'";
+	xs << html::CompTag("a", attrs);
+	xs << html::StartTag("span", "class='bibitemlabel'");
 	xs << bibLabel();
-	xs << EndTag("span");
+	xs << html::EndTag("span");
 	return docstring();
 }