suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade citeproc-js to version 1.0.255

Browse Source
This commit is contained in:
Frank 2012-01-09 09:04:29 +08:00 committed by Simon Kornblith
parent e4086a0069
commit afd6c35406
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
chrome/content/zotero/xpcom/citeproc.js
View File

@ -1963,7 +1963,7 @@ CSL.DateParser = function () {
};
CSL.Engine = function (sys, style, lang, forceLang) {
var attrs, langspec, localexml, locale;
this.processor_version = "1.0.254";
this.processor_version = "1.0.255";
this.csl_version = "1.0";
this.sys = sys;
this.sys.xml = new CSL.System.Xml.Parsing();
@ -6333,7 +6333,7 @@ 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) {
var 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]]) {
short_form[j] = this.state.transform.abbrevs[jurisdiction]["institution-part"][long_form[j]];
}
@ -6367,7 +6367,7 @@ 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("|");
var jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-entire", str);
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 splitSplitLst = splitLst.split(/>>[0-9]{4}>>/);
@ -8331,11 +8331,26 @@ CSL.Transform = function (state) {
return jurisdiction;
}
if (state.sys.getAbbreviation) {
if (!this.abbrevs[jurisdiction]) {
this.abbrevs[jurisdiction] = new CSL.AbbreviationSegments();
var tryList = ['default'];
if (jurisdiction !== 'default') {
var workLst = jurisdiction.split(/\s*;\s*/);
for (var i=0, ilen=workLst.length; i < ilen; i += 1) {
tryList.push(workLst.slice(0,i+1).join(';'));
}
}
if (!this.abbrevs[jurisdiction][category][orig]) {
state.sys.getAbbreviation(state.opt.styleID, this.abbrevs, jurisdiction, category, orig);
for (var i=tryList.length - 1; i > -1; i += -1) {
if (!this.abbrevs[tryList[i]]) {
this.abbrevs[tryList[i]] = new CSL.AbbreviationSegments();
}
if (!this.abbrevs[tryList[i]][category][orig]) {
state.sys.getAbbreviation(state.opt.styleID, this.abbrevs, tryList[i], category, orig);
}
if (this.abbrevs[tryList[i]][category][orig]) {
if (i < tryList.length) {
this.abbrevs[jurisdiction][category][orig] = this.abbrevs[tryList[i]][category][orig];
}
break;
}
}
}
return jurisdiction;