From 241e59668035a3c2d25a4a39a1be4c49ed67c50e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 21 Sep 2017 15:47:41 -0400
Subject: [PATCH] Update citeproc-js to 1.1.178
---
chrome/content/zotero/xpcom/citeproc.js | 71 +++++++++++++++++--------
1 file changed, 49 insertions(+), 22 deletions(-)
diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 9a5146f0f..2fc21ebea 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -24,7 +24,7 @@
*/
var CSL = {
- PROCESSOR_VERSION: "1.1.177",
+ PROCESSOR_VERSION: "1.1.178",
CONDITION_LEVEL_TOP: 1,
CONDITION_LEVEL_BOTTOM: 2,
PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@@ -3312,8 +3312,12 @@ CSL.Engine.prototype.normalDecorIsOrphan = function (blob, params) {
}
return false;
};
-CSL.getJurisdictionNameAndSuppress = function(state, jurisdictionID, jurisdictionName) {
+CSL.getJurisdictionNameAndSuppress = function(state, jurisdictionID, jurisdictionName, chopTo) {
var ret = null;
+ if (chopTo) {
+ jurisdictionID = jurisdictionID.split(":").slice(0, chopTo).join(":");
+ jurisdictionName = state.sys.getHumanForm(jurisdictionID);
+ }
if (!jurisdictionName) {
jurisdictionName = state.sys.getHumanForm(jurisdictionID);
}
@@ -3357,7 +3361,7 @@ CSL.getJurisdictionNameAndSuppress = function(state, jurisdictionID, jurisdictio
}
}
return ret;
-}
+};
CSL.Engine.prototype.getCitationLabel = function (Item) {
var label = "";
var params = this.getTrigraphParams();
@@ -8469,8 +8473,12 @@ CSL.NameOutput.prototype._checkNickname = function (name) {
var author = "";
author = CSL.Util.Names.getRawName(name);
if (author && this.state.sys.getAbbreviation && !(this.item && this.item["suppress-author"])) {
- this.state.transform.loadAbbreviation("default", "nickname", author);
- var myLocalName = this.state.transform.abbrevs["default"].nickname[author];
+ var normalizedKey = author;
+ if (this.state.sys.normalizeAbbrevsKey) {
+ normalizedKey = this.state.sys.normalizeAbbrevsKey(author);
+ }
+ this.state.transform.loadAbbreviation("default", "nickname", normalizedKey);
+ var myLocalName = this.state.transform.abbrevs["default"].nickname[normalizedKey];
if (myLocalName) {
if (myLocalName === "!here>>>") {
name = false;
@@ -9698,7 +9706,7 @@ CSL.NameOutput.prototype.setRenderedName = function (name) {
}
CSL.NameOutput.prototype.fixupInstitution = function (name, varname, listpos) {
if (this.state.sys.getHumanForm && "legal_case" === this.Item.type && "authority" === varname) {
- name.literal = this.state.sys.getHumanForm(this.Item.jurisdiction, name.literal);
+ name.literal = this.state.sys.getHumanForm(this.Item.jurisdiction, name.literal, true);
}
name = this._splitInstitution(name, varname, listpos);
if (this.institution.strings["reverse-order"]) {
@@ -9710,9 +9718,13 @@ CSL.NameOutput.prototype.fixupInstitution = function (name, varname, listpos) {
if (this.state.sys.getAbbreviation) {
var jurisdiction = this.Item.jurisdiction;
for (var j = 0, jlen = long_form.length; j < jlen; j += 1) {
- jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-part", long_form[j]);
- if (this.state.transform.abbrevs[jurisdiction]["institution-part"][long_form[j]]) {
- short_form[j] = this.state.transform.abbrevs[jurisdiction]["institution-part"][long_form[j]];
+ var normalizedKey = long_form[j];
+ if (this.state.sys.normalizeAbbrevsKey) {
+ normalizedKey = this.state.sys.normalizeAbbrevsKey(long_form[j]);
+ }
+ jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-part", normalizedKey);
+ if (this.state.transform.abbrevs[jurisdiction]["institution-part"][normalizedKey]) {
+ short_form[j] = this.state.transform.abbrevs[jurisdiction]["institution-part"][normalizedKey];
use_short_form = true;
}
}
@@ -9755,9 +9767,13 @@ CSL.NameOutput.prototype._splitInstitution = function (value, v, i) {
var jurisdiction = this.Item.jurisdiction;
for (var j = splitInstitution.length; j > 0; j += -1) {
var str = splitInstitution.slice(0, j).join("|");
- jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-entire", str);
- if (this.state.transform.abbrevs[jurisdiction]["institution-entire"][str]) {
- var splitLst = this.state.transform.abbrevs[jurisdiction]["institution-entire"][str];
+ var normalizedKey = str;
+ if (this.state.sys.normalizeAbbrevsKey) {
+ normalizedKey = this.state.sys.normalizeAbbrevsKey(str);
+ }
+ jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-entire", normalizedKey);
+ if (this.state.transform.abbrevs[jurisdiction]["institution-entire"][normalizedKey]) {
+ var splitLst = this.state.transform.abbrevs[jurisdiction]["institution-entire"][normalizedKey];
splitLst = this.state.transform.quashCheck(splitLst);
var splitSplitLst = splitLst.split(/>>[0-9]{4}>>/);
var m = splitLst.match(/>>([0-9]{4})>>/);
@@ -11326,6 +11342,9 @@ CSL.Attributes["@is-parallel"] = function (state, arg) {
}
this.strings.set_parallel_condition = values;
};
+CSL.Attributes["@jurisdiction-depth"] = function (state, arg) {
+ this.strings.jurisdiction_depth = parseInt(arg, 10);
+};
CSL.Attributes["@require"] = function (state, arg) {
this.strings.require = arg;
}
@@ -12277,10 +12296,14 @@ CSL.Transform = function (state) {
var variable = myabbrev_family;
value = "";
if (state.sys.getAbbreviation) {
- var jurisdiction = state.transform.loadAbbreviation(Item.jurisdiction, myabbrev_family, basevalue, Item.type, true);
- if (state.transform.abbrevs[jurisdiction][myabbrev_family] && basevalue && state.sys.getAbbreviation) {
- if (state.transform.abbrevs[jurisdiction][myabbrev_family][basevalue]) {
- value = state.transform.abbrevs[jurisdiction][myabbrev_family][basevalue].replace("{stet}",basevalue);
+ var normalizedKey = basevalue;
+ if (state.sys.normalizeAbbrevsKey) {
+ normalizedKey = state.sys.normalizeAbbrevsKey(basevalue);
+ }
+ var jurisdiction = state.transform.loadAbbreviation(Item.jurisdiction, myabbrev_family, normalizedKey, Item.type, true);
+ if (state.transform.abbrevs[jurisdiction][myabbrev_family] && normalizedKey && state.sys.getAbbreviation) {
+ if (state.transform.abbrevs[jurisdiction][myabbrev_family][normalizedKey]) {
+ value = state.transform.abbrevs[jurisdiction][myabbrev_family][normalizedKey].replace("{stet}",basevalue);
}
}
}
@@ -12376,8 +12399,8 @@ CSL.Transform = function (state) {
}
}
ret.token = CSL.Util.cloneToken(this);
- if (state.sys.getHumanForm && field === 'jurisdiction' && ret.name) {
- ret.name = CSL.getJurisdictionNameAndSuppress(state, Item[field], jurisdictionName);
+ if (state.sys.getHumanForm && ret.name && field === 'jurisdiction') {
+ ret.name = CSL.getJurisdictionNameAndSuppress(state, Item[field], jurisdictionName, this.strings.jurisdiction_depth);
} else if (["title", "container-title"].indexOf(field) > -1) {
if (!usedOrig
&& (!ret.token.strings["text-case"]
@@ -13184,11 +13207,15 @@ CSL.Util.Dates.year.imperial = function (state, num, end, makeShort) {
offset = 1988;
}
if (label && offset) {
- if (!state.transform.abbrevs['default']['number'][label]) {
- state.transform.loadAbbreviation('default', "number", label);
+ var normalizedKey = label;
+ if (state.sys.normalizeAbbrevsKey) {
+ normalizedKey = state.sys.normalizeAbbrevsKey(label);
}
- if (state.transform.abbrevs['default']['number'][label]) {
- label = state.transform.abbrevs['default']['number'][label];
+ if (!state.transform.abbrevs['default']['number'][normalizedKey]) {
+ state.transform.loadAbbreviation('default', "number", normalizedKey);
+ }
+ if (state.transform.abbrevs['default']['number'][normalizedKey]) {
+ label = state.transform.abbrevs['default']['number'][normalizedKey];
};
year = label + (num - offset);
}