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

Update to citeproc-js 1.0.38

Browse Source 
From Frank's announcement:

 Fix appendCitationCluster() to work with the API revision
 made to processCitationCluster() in point release 1.0.28.

 When user provides a cite suffix that ends with a full stop,
 suppress the normal inter-cite join.
This commit is contained in:
Simon Kornblith 2010-06-28 09:31:35 +00:00
parent bddb583e43
commit b87b46aa95
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1487,7 +1487,7 @@ CSL.dateParser = function (txt) {
}; };
CSL.Engine = function (sys, style, lang, xmlmode) { CSL.Engine = function (sys, style, lang, xmlmode) {
var attrs, langspec, localexml, locale; var attrs, langspec, localexml, locale;
this.processor_version = "1.0.37"; this.processor_version = "1.0.38";
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();
@ -2298,7 +2298,7 @@ CSL.Engine.prototype.appendCitationCluster = function (citation) {
c = this.registry.citationreg.citationByIndex[pos]; c = this.registry.citationreg.citationByIndex[pos];
citationsPre.push([c.citationID, c.properties.noteIndex]); citationsPre.push([c.citationID, c.properties.noteIndex]);
} }
return this.processCitationCluster(citation, citationsPre, [], CSL.ASSUME_ALL_ITEMS_REGISTERED); return this.processCitationCluster(citation, citationsPre, [])[1];
}; };
CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre, citationsPost, flag) { CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre, citationsPost, flag) {
var sortedItems, new_citation, pos, len, item, citationByIndex, c, Item, newitem, k, textCitations, noteCitations, update_items, citations, first_ref, last_ref, ipos, ilen, cpos, onecitation, oldvalue, ibidme, suprame, useme, items, i, key, prev_locator, curr_locator, param, ret, obj, ppos, llen, lllen, pppos, ppppos, llllen, cids, note_distance, return_data, lostItemId, lostItemList, lostItemData, otherLostPkeys, disambig, oldItemIds; var sortedItems, new_citation, pos, len, item, citationByIndex, c, Item, newitem, k, textCitations, noteCitations, update_items, citations, first_ref, last_ref, ipos, ilen, cpos, onecitation, oldvalue, ibidme, suprame, useme, items, i, key, prev_locator, curr_locator, param, ret, obj, ppos, llen, lllen, pppos, ppppos, llllen, cids, note_distance, return_data, lostItemId, lostItemList, lostItemData, otherLostPkeys, disambig, oldItemIds;
@ -2623,7 +2623,7 @@ CSL.getSpliceDelimiter = function (last_collapsed) {
return this.tmp.splice_delimiter; return this.tmp.splice_delimiter;
}; };
CSL.getCitationCluster = function (inputList, citationID) { CSL.getCitationCluster = function (inputList, citationID) {
var delimiter, result, objects, myparams, len, pos, item, last_collapsed, params, empties, composite, compie, myblobs, Item, llen, ppos, obj; var delimiter, result, objects, myparams, len, pos, item, last_collapsed, params, empties, composite, compie, myblobs, Item, llen, ppos, obj, preceding_item;
this.tmp.area = "citation"; this.tmp.area = "citation";
delimiter = ""; delimiter = "";
result = ""; result = "";
@ -2656,6 +2656,17 @@ CSL.getCitationCluster = function (inputList, citationID) {
if (item && item["author-only"]) { if (item && item["author-only"]) {
this.tmp.suppress_decorations = true; this.tmp.suppress_decorations = true;
} }
if (pos > 0) {
preceding_item = inputList[pos - 1][1];
if (preceding_item.suffix && pos > 0 && preceding_item.suffix.slice(-1) === ".") {
var spaceidx = params.splice_delimiter.indexOf(" ");
if (spaceidx > -1) {
params.splice_delimiter = params.splice_delimiter.slice(spaceidx);
} else {
params.splice_delimiter = "";
}
}
}
params.suppress_decorations = this.tmp.suppress_decorations; params.suppress_decorations = this.tmp.suppress_decorations;
params.have_collapsed = this.tmp.have_collapsed; params.have_collapsed = this.tmp.have_collapsed;
myparams.push(params); myparams.push(params);