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

Update to citeproc-js 1.0.471

Browse Source
This commit is contained in:
Simon Kornblith 2013-07-22 01:45:25 -04:00
parent c722ec888f
commit 67ad94c45f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ if (!Array.indexOf) {
}; };
} }
var CSL = { var CSL = {
PROCESSOR_VERSION: "1.0.470", PROCESSOR_VERSION: "1.0.471",
CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_TOP: 1,
CONDITION_LEVEL_BOTTOM: 2, CONDITION_LEVEL_BOTTOM: 2,
PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@ -2860,7 +2860,7 @@ CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
if (blob && (blob.decorations.length || blob.strings.suffix || blob.strings.prefix)) { if (blob && (blob.decorations.length || blob.strings.suffix || blob.strings.prefix)) {
span_split = ret.length; span_split = ret.length;
} }
var blobs_start = state.output.renderBlobs(ret.slice(0, span_split), blob_delimiter, true); var blobs_start = state.output.renderBlobs(ret.slice(0, span_split), blob_delimiter, true, blob);
if (blobs_start && blob && (blob.decorations.length || blob.strings.suffix || blob.strings.prefix)) { if (blobs_start && blob && (blob.decorations.length || blob.strings.suffix || blob.strings.prefix)) {
if (!state.tmp.suppress_decorations) { if (!state.tmp.suppress_decorations) {
for (i = 0, ilen = blob.decorations.length; i < ilen; i += 1) { for (i = 0, ilen = blob.decorations.length; i < ilen; i += 1) {
@ -2925,7 +2925,7 @@ CSL.Output.Queue.prototype.clearlevel = function () {
blob.blobs.pop(); blob.blobs.pop();
} }
}; };
CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, in_cite) { CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, in_cite, parent) {
var state, ret, ret_last_char, use_delim, i, blob, pos, len, ppos, llen, pppos, lllen, res, str, params, txt_esc; var state, ret, ret_last_char, use_delim, i, blob, pos, len, ppos, llen, pppos, lllen, res, str, params, txt_esc;
txt_esc = CSL.getSafeEscape(this.state); txt_esc = CSL.getSafeEscape(this.state);
if (!delim) { if (!delim) {
@ -2936,6 +2936,11 @@ CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, in_cite) {
ret_last_char = []; ret_last_char = [];
use_delim = ""; use_delim = "";
len = blobs.length; len = blobs.length;
if (this.state.tmp.area === "citation" && !this.state.tmp.just_looking && len === 1 && typeof blobs[0] === "object" && parent) {
blobs[0].strings.prefix = parent.strings.prefix + blobs[0].strings.prefix;
blobs[0].strings.suffix = blobs[0].strings.suffix + parent.strings.suffix;
return blobs[0];
}
var start = true; var start = true;
for (pos = 0; pos < len; pos += 1) { for (pos = 0; pos < len; pos += 1) {
if (blobs[pos].checkNext) { if (blobs[pos].checkNext) {