} // 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;
}
&& (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");
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;
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);
}
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)