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

Update citeproc-js to 1.1.137

Browse source
This commit is contained in:
Dan Stillman 2016-10-06 01:33:03 -04:00
parent db2fc7d0ba
commit c477d482bf
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@
* <http://www.gnu.org/licenses/> respectively. * <http://www.gnu.org/licenses/> respectively.
*/ */
var CSL = { var CSL = {
PROCESSOR_VERSION: "1.1.136", PROCESSOR_VERSION: "1.1.137",
CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_TOP: 1,
CONDITION_LEVEL_BOTTOM: 2, CONDITION_LEVEL_BOTTOM: 2,
PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@ -126,7 +126,8 @@ var CSL = {
"hearing": true, "hearing": true,
"gazette": true, "gazette": true,
"report": true, "report": true,
"regulation": true "regulation": true,
"standard": true
}, },
NestedBraces: [ NestedBraces: [
["(", "["], ["(", "["],
@ -227,7 +228,7 @@ var CSL = {
} }
return lst.join("-"); return lst.join("-");
}, },
parseNoteFieldHacks: function(Item, allowDateOverride) { parseNoteFieldHacks: function(Item, validFieldsForType, allowDateOverride) {
if ("string" !== typeof Item.note) return; if ("string" !== typeof Item.note) return;
var elems = []; var elems = [];
var lines = Item.note.split('\n'); var lines = Item.note.split('\n');
@ -254,6 +255,7 @@ var CSL = {
} }
} }
lines = lines.join('\n').split('\n'); lines = lines.join('\n').split('\n');
var offset = 0;
var names = {}; var names = {};
for (var i=0,ilen=lines.length;i<ilen;i++) { for (var i=0,ilen=lines.length;i<ilen;i++) {
var line = lines[i]; var line = lines[i];
@ -264,6 +266,7 @@ var CSL = {
if (i === 0) { if (i === 0) {
continue; continue;
} else { } else {
offset = i;
break; break;
} }
} }
@ -275,7 +278,9 @@ var CSL = {
} else if (CSL.DATE_VARIABLES.indexOf(key) > -1) { } else if (CSL.DATE_VARIABLES.indexOf(key) > -1) {
if (allowDateOverride) { if (allowDateOverride) {
Item[key] = {raw: val}; Item[key] = {raw: val};
lines[i] = ""; if (!validFieldsForType || (validFieldsForType[key] && val.match(/^[0-9]{4}(?:-[0-9]{1,2}(?:-[0-9]{1,2})*)*$/))) {
lines[i] = "";
}
} }
} else if (!Item[key]) { } else if (!Item[key]) {
if (CSL.NAME_VARIABLES.indexOf(key) > -1) { if (CSL.NAME_VARIABLES.indexOf(key) > -1) {
@ -293,13 +298,25 @@ var CSL = {
} else { } else {
Item[key] = val; Item[key] = val;
} }
lines[i] = ""; if (!validFieldsForType || validFieldsForType[key]) {
lines[i] = "";
}
} }
} }
for (var key in names) { for (var key in names) {
Item[key] = names[key]; Item[key] = names[key];
} }
Item.note = lines.join("").trim(); if (validFieldsForType) {
if (lines[offset].trim()) {
lines[offset] = '\n' + lines[offset]
}
for (var i=offset-1;i>-1;i--) {
if (!lines[i].trim()) {
lines = lines.slice(0, i).concat(lines.slice(i + 1));
}
}
}
Item.note = lines.join("\n").trim();
}, },
GENDERS: ["masculine", "feminine"], GENDERS: ["masculine", "feminine"],
ERROR_NO_RENDERED_FORM: 1, ERROR_NO_RENDERED_FORM: 1,
@ -2840,7 +2857,7 @@ CSL.Engine.prototype.retrieveItem = function (id) {
} }
} }
if (this.opt.development_extensions.field_hack && Item.note) { if (this.opt.development_extensions.field_hack && Item.note) {
CSL.parseNoteFieldHacks(Item, this.opt.development_extensions.allow_field_hack_date_override); CSL.parseNoteFieldHacks(Item, false, this.opt.development_extensions.allow_field_hack_date_override);
} }
for (var i = 1, ilen = CSL.DATE_VARIABLES.length; i < ilen; i += 1) { for (var i = 1, ilen = CSL.DATE_VARIABLES.length; i < ilen; i += 1) {
var dateobj = Item[CSL.DATE_VARIABLES[i]]; var dateobj = Item[CSL.DATE_VARIABLES[i]];
@ -6978,9 +6995,6 @@ CSL.Node.group = {
state.buildTokenLists(myNodes[i], state.juris[jurisdiction][myName]); state.buildTokenLists(myNodes[i], state.juris[jurisdiction][myName]);
state.configureTokenList(state.juris[jurisdiction][myName]); state.configureTokenList(state.juris[jurisdiction][myName]);
} }
if (macroCount < Object.keys(state.juris[jurisdiction].types).length) {
throw "CSL ERROR: Incomplete jurisdiction style module for: " + jurisdiction;
}
} }
} }
for (var i=0,ilen=jurisdictionList.length;i<ilen;i++) { for (var i=0,ilen=jurisdictionList.length;i<ilen;i++) {