mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upgrade citeproc-js to version 1.0.289

Browse source
This commit is contained in:
Frank 2012-02-24 20:56:21 +08:00 committed by Simon Kornblith
parent 01f3223cd3
commit 96bf57c216
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
chrome/content/zotero/xpcom/citeproc.js
View file

@ -2149,7 +2149,7 @@ CSL.DateParser = function () {
}; };
CSL.Engine = function (sys, style, lang, forceLang) { CSL.Engine = function (sys, style, lang, forceLang) {
var attrs, langspec, localexml, locale; var attrs, langspec, localexml, locale;
this.processor_version = "1.0.288"; this.processor_version = "1.0.289";
this.csl_version = "1.0"; this.csl_version = "1.0";
this.sys = sys; this.sys = sys;
this.sys.xml = new CSL.System.Xml.Parsing(); this.sys.xml = new CSL.System.Xml.Parsing();
@ -5838,6 +5838,9 @@ CSL.NameOutput.prototype.disambigNames = function () {
CSL.NameOutput.prototype._runDisambigNames = function (lst, pos) { CSL.NameOutput.prototype._runDisambigNames = function (lst, pos) {
var chk, myform, myinitials, param, i, ilen, paramx; var chk, myform, myinitials, param, i, ilen, paramx;
for (i = 0, ilen = lst.length; i < ilen; i += 1) { for (i = 0, ilen = lst.length; i < ilen; i += 1) {
if (!lst[i].given || !lst[i].family) {
continue;
}
this.state.registry.namereg.addname("" + this.Item.id, lst[i], i); this.state.registry.namereg.addname("" + this.Item.id, lst[i], i);
chk = this.state.tmp.disambig_settings.givens[pos]; chk = this.state.tmp.disambig_settings.givens[pos];
if ("undefined" === typeof chk) { if ("undefined" === typeof chk) {
@ -6648,6 +6651,12 @@ CSL.NameOutput.prototype.fixupInstitution = function (name, varname, listpos) {
jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-part", long_form[j]); jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-part", long_form[j]);
if (this.state.transform.abbrevs[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]]; short_form[j] = this.state.transform.abbrevs[jurisdiction]["institution-part"][long_form[j]];
if (this.Item["container-title"]) {
var suppressing_partner = this.state.transform.abbrevs[jurisdiction]["container-title"][this.Item["container-title"]];
if (varname === "authority" && suppressing_partner && suppressing_partner === short_form[j]) {
short_form[j] = false;
}
}
} }
} }
} }
@ -8841,7 +8850,7 @@ CSL.Transform = function (state) {
if (myabbrev_family) { if (myabbrev_family) {
primary = abbreviate(state, Item, alternative_varname, primary, myabbrev_family, true); primary = abbreviate(state, Item, alternative_varname, primary, myabbrev_family, true);
if (suppress_monitor && primary) { if (suppress_monitor && primary) {
suppressing_partner = abbreviate(state, Item, false, Item["container-title"], "container-title", true); var suppressing_partner = abbreviate(state, Item, false, Item["container-title"], "container-title", true);
if (suppressing_partner && suppressing_partner.slice(0, primary.length) === primary) { if (suppressing_partner && suppressing_partner.slice(0, primary.length) === primary) {
return null; return null;
} }