X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=564ea5bb9a5e75b1b72516c4a2aa22bd2a8b5916;hb=cc3e227cba3571bb8c383cd41348b932e3104df3;hp=e1f40eaebf04f7c14cfd377199f837e21bf0abea;hpb=f8e8877f839dcd0d133e6982d107b7d167c524c3;p=lyx.git

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index e1f40eaebf..564ea5bb9a 100644
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -329,15 +329,17 @@ inline docstring wrapCitation(docstring const & key,
 } // 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;
 }
@@ -399,8 +401,8 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const
 		&& (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,6 +445,18 @@ 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;
@@ -458,8 +472,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);
 }
 
 
@@ -552,7 +566,10 @@ void InsetCitation::forOutliner(docstring & os, size_t const, bool const) const
 // engine, e.g. \cite[]{} for the basic engine.
 void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 {
-	BiblioInfo const & bi = buffer().masterBibInfo();
+	// When this is a child compiled on its own, we use the childs
+	// own bibinfo, else the master's
+	BiblioInfo const & bi = runparams.is_child
+			? buffer().masterBibInfo() : buffer().bibInfo();
 	docstring const key = getParam("key");
 	// "keyonly" command: output the plain key and stop.
 	if (getCmdName() == "keyonly") {
@@ -608,12 +625,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)