X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=0335b9c771d9b21a3b8231803cdedebae657e232;hb=a6b07608d8e9de24383d3ebaec20b6b265ed9314;hp=ba45f691a37cbe0cef69fdab1313ca90e6e2c02a;hpb=6415d986ba32373d3c3915ec77473dfa2e2b7ad3;p=features.git

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index ba45f691a3..0335b9c771 100644
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -322,22 +322,24 @@ inline docstring wrapCitation(docstring const & key,
 		return content;
 	// we have to do the escaping here, because we will ultimately
 	// write this as a raw string, so as not to escape the tags.
-	return "<a href='#LyXCite-" + html::cleanAttr(key) + "'>" +
-			html::htmlize(content, XHTMLStream::ESCAPE_ALL) + "</a>";
+	return "<a href='#LyXCite-" + xml::cleanAttr(key) + "'>" +
+			xml::xmlize(content, XMLStream::ESCAPE_ALL) + "</a>";
 }
 
 } // anonymous namespace
 
 
-map<docstring, docstring> InsetCitation::getQualifiedLists(docstring const p) const
+vector<pair<docstring, docstring>> InsetCitation::getQualifiedLists(docstring const & p) const
 {
 	vector<docstring> ps =
 		getVectorFromString(p, from_ascii("\t"));
-	std::map<docstring, docstring> res;
+	QualifiedList res;
 	for (docstring const & s: ps) {
-		docstring key;
-		docstring val = split(s, key, ' ');
-		res[key] = val;
+		docstring key = s;
+		docstring val;
+		if (contains(s, ' '))
+			val = split(s, key, ' ');
+		res.push_back(make_pair(key, val));
 	}
 	return res;
 }
@@ -362,14 +364,33 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const
 	if (!buf.isFullyLoaded())
 		return docstring();
 
+	docstring const & key = getParam("key");
+
 	BiblioInfo const & biblist = buf.masterBibInfo();
-	if (biblist.empty())
+
+	// mark broken citations
+	setBroken(false);
+
+	if (biblist.empty()) {
+		setBroken(true);
 		return docstring();
+	}
 
-	docstring const & key = getParam("key");
 	if (key.empty())
 		return _("No citations selected!");
 
+	// check all citations
+	// we only really want the last 'false', to suppress trimming, but
+	// we need to give the other defaults, too, to set it.
+	vector<docstring> keys =
+		getVectorFromString(key, from_ascii(","), false, false);
+	for (auto const & k : keys) {
+		if (biblist.find(k) == biblist.end()) {
+			setBroken(true);
+			break;
+		}
+	}
+	
 	string cite_type = getCmdName();
 	bool const uppercase = isUpperCase(cite_type[0]);
 	if (uppercase)
@@ -389,18 +410,14 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const
 	buffer().params().documentClass().addCiteMacro("!textafter", to_utf8(after));
 	*/
 	docstring label;
-	// we only really want the last 'false', to suppress trimming, but
-	// we need to give the other defaults, too, to set it.
-	vector<docstring> keys =
-		getVectorFromString(key, from_ascii(","), false, false);
 	CitationStyle cs = getCitationStyle(buffer().masterParams(),
 			cite_type, buffer().masterParams().citeStyles());
 	bool const qualified = cs.hasQualifiedList
 		&& (keys.size() > 1
 		    || !getParam("pretextlist").empty()
 		    || !getParam("posttextlist").empty());
-	map<docstring, docstring> pres = getQualifiedLists(getParam("pretextlist"));
-	map<docstring, docstring> posts = getQualifiedLists(getParam("posttextlist"));
+	QualifiedList pres = getQualifiedLists(getParam("pretextlist"));
+	QualifiedList posts = getQualifiedLists(getParam("posttextlist"));
 
 	CiteItem ci;
 	ci.textBefore = getParam("before");
@@ -443,13 +460,25 @@ docstring InsetCitation::basicLabel(bool for_xhtml) const
 	return '[' + label + ']';
 }
 
+
+bool InsetCitation::forceLTR(OutputParams const & rp) const
+{
+	// We have to force LTR for numeric references
+	// [= bibliography, plain BibTeX, numeric natbib
+	// and biblatex]. Except for XeTeX/bidi. See #3005.
+	if (rp.useBidiPackage())
+		return false;
+	return (buffer().masterParams().citeEngine() == "basic"
+		|| buffer().masterParams().citeEngineType() == ENGINE_TYPE_NUMERICAL);
+}
+
 docstring InsetCitation::screenLabel() const
 {
 	return cache.screen_label;
 }
 
 
-void InsetCitation::updateBuffer(ParIterator const &, UpdateType)
+void InsetCitation::updateBuffer(ParIterator const &, UpdateType, bool const /*deleted*/)
 {
 	if (!cache.recalculate && buffer().citeLabelsValid())
 		return;
@@ -458,8 +487,8 @@ void InsetCitation::updateBuffer(ParIterator const &, UpdateType)
 	cache.recalculate = false;
 	cache.generated_label = glabel;
 	unsigned int const maxLabelChars = 45;
-	cache.screen_label = glabel.substr(0, maxLabelChars + 1);
-	support::truncateWithEllipsis(cache.screen_label, maxLabelChars);
+	cache.screen_label = glabel;
+	support::truncateWithEllipsis(cache.screen_label, maxLabelChars, true);
 }
 
 
@@ -471,10 +500,17 @@ void InsetCitation::addToToc(DocIterator const & cpit, bool output_active,
 	// from the document. It is used indirectly, via BiblioInfo::makeCitationLables,
 	// by both XHTML and plaintext output. So, if we change what goes into the TOC,
 	// then we will also need to change that routine.
-	docstring const tocitem = getParam("key");
+	docstring tocitem;
+	if (isBroken())
+		tocitem = _("BROKEN: ");
+	tocitem += getParam("key");
 	TocBuilder & b = backend.builder("citation");
 	b.pushItem(cpit, tocitem, output_active);
 	b.pop();
+	if (isBroken()) {
+		shared_ptr<Toc> toc2 = backend.toc("brokenrefs");
+		toc2->push_back(TocItem(cpit, 0, tocitem, output_active));
+	}
 }
 
 
@@ -518,14 +554,14 @@ int InsetCitation::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-docstring InsetCitation::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetCitation::xhtml(XMLStream & xs, OutputParams const &) const
 {
 	string const & cmd = getCmdName();
 	if (cmd == "nocite")
 		return docstring();
 
 	// have to output this raw, because generateLabel() will include tags
-	xs << XHTMLStream::ESCAPE_NONE << generateLabel(true);
+	xs << XMLStream::ESCAPE_NONE << generateLabel(true);
 
 	return docstring();
 }
@@ -611,12 +647,30 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 		os << '{' << escape(cleanupWhitespace(key)) << '}';
 	else {
 		if (qualified) {
-			map<docstring, docstring> pres = getQualifiedLists(getParam("pretextlist"));
-			map<docstring, docstring> posts = getQualifiedLists(getParam("posttextlist"));
-			for (docstring const & k: keys) {
-				docstring bef = params().prepareCommand(runparams, pres[k],
+			QualifiedList pres = getQualifiedLists(getParam("pretextlist"));
+			QualifiedList posts = getQualifiedLists(getParam("posttextlist"));
+			for (docstring const & k : keys) {
+				docstring prenote;
+				QualifiedList::iterator it = pres.begin();
+				for (; it != pres.end() ; ++it) {
+					if ((*it).first == k) {
+						prenote = (*it).second;
+						pres.erase(it);
+						break;
+					}
+				}
+				docstring bef = params().prepareCommand(runparams, prenote,
 				                   pinfo["pretextlist"].handling());
-				docstring aft = params().prepareCommand(runparams, posts[k],
+				docstring postnote;
+				QualifiedList::iterator pit = posts.begin();
+				for (; pit != posts.end() ; ++pit) {
+					if ((*pit).first == k) {
+						postnote = (*pit).second;
+						posts.erase(pit);
+						break;
+					}
+				}
+				docstring aft = params().prepareCommand(runparams, postnote,
 				                   pinfo["posttextlist"].handling());
 				if (!bef.empty())
 					os << '[' << protectArgument(bef)