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

Upgrade citeproc-js to version 1.0.261. Important fix to avoid a processor hang in some circumstances.

Browse Source
This commit is contained in:
Frank 2012-01-17 06:49:49 +08:00 committed by Simon Kornblith
parent 5e2cd44cc8
commit 8bebd77a57
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1980,7 +1980,7 @@ CSL.DateParser = function () {
};
CSL.Engine = function (sys, style, lang, forceLang) {
var attrs, langspec, localexml, locale;
this.processor_version = "1.0.260";
this.processor_version = "1.0.261";
this.csl_version = "1.0";
this.sys = sys;
this.sys.xml = new CSL.System.Xml.Parsing();
@ -11398,19 +11398,22 @@ CSL.Disambiguation.prototype.disNames = function (ismax) {
};
CSL.Disambiguation.prototype.disExtraText = function () {
var pos, len, mybase;
if (this.clashes[1] === 0) {
mybase = CSL.cloneAmbigConfig(this.base);
mybase.year_suffix = false;
mybase = CSL.cloneAmbigConfig(this.base);
mybase.year_suffix = false;
if (this.clashes[1] === 0 || this.clashes[1] < this.clashes[0]) {
this.state.registry.registerAmbigToken(this.akey, "" + this.partners[0].id, mybase);
if (this.nonpartners.length === 1) {
this.state.registry.registerAmbigToken(this.akey, "" + this.nonpartners[0].id, mybase);
this.lists[this.listpos] = [this.base,[]];
} else {
this.lists[this.listpos] = [this.base, this.nonpartners];
for (var i=0, ilen=this.partners.length; i < ilen; i += 1) {
this.state.registry.registerAmbigToken(this.akey, "" + this.partners[i].id, mybase);
}
for (var i=0, ilen=this.nonpartners.length; i < ilen; i += 1) {
this.state.registry.registerAmbigToken(this.akey, "" + this.nonpartners[i].id, mybase);
}
} else {
this.base.disambiguate = false;
for (var i=0, ilen=this.partners.length; i < ilen; i += 1) {
this.state.registry.registerAmbigToken(this.akey, "" + this.partners[i].id, this.betterbase);
}
}
this.lists[this.listpos] = [this.base, []];
};
CSL.Disambiguation.prototype.disYears = function () {
var pos, len, tokens, token, item;
@ -11483,14 +11486,17 @@ CSL.Disambiguation.prototype.incrementDisambig = function () {
}
}
}
} else if (increment_name) {
maxed = true;
if (this.modeindex < this.modes.length - 1) {
this.modeindex += 1;
}
}
}
if (!maxed && "disExtraText" === this.modes[this.modeindex]) {
if ("disExtraText" === this.modes[this.modeindex]) {
this.base.disambiguate = true;
maxed = true;
}
if (!maxed && "disYears" === this.modes[this.modeindex]) {
maxed = true;
if ("disYears" === this.modes[this.modeindex]) {
}
return maxed;
};