Skip to content

Commit

Permalink
Update citeproc-js to 1.1.190
Browse files Browse the repository at this point in the history
  • Loading branch information
@dstillman
dstillman committed Feb 28, 2018
1 parent 7210653 commit 153ed72
Showing 1 changed file with 86 additions and 27 deletions.
113 changes: 86 additions & 27 deletions chrome/content/zotero/xpcom/citeproc.js
View file
Expand Up @@ -24,13 +24,14 @@
*/

var CSL = {
PROCESSOR_VERSION: "1.1.186",
PROCESSOR_VERSION: "1.1.190",
CONDITION_LEVEL_TOP: 1,
CONDITION_LEVEL_BOTTOM: 2,
PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"),
STATUTE_SUBDIV_GROUPED_REGEX: /((?:^| )(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/g,
STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/,
STATUTE_SUBDIV_PLAIN_REGEX_FRONT: /(?:^\s*[.,;]*\s*(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/,
STATUTE_SUBDIV_STRINGS: {
"art.": "article",
"bk.": "book",
Expand Down Expand Up @@ -921,6 +922,8 @@ var CSL = {
var testres;
if (state.tmp.group_context.tip.condition.test === "empty-label") {
testres = !termtxt;
} else if (state.tmp.group_context.tip.condition.test === "empty-label-no-decor") {
testres = !termtxt || termtxt.indexOf("%s") > -1;
} else if (state.tmp.group_context.tip.condition.test === "comma-safe") {
var empty = !termtxt;
var alpha = termtxt.slice(0,1).match(CSL.ALL_ROMANESQUE_REGEXP);
Expand Down Expand Up @@ -3134,7 +3137,7 @@ CSL.Engine.prototype.remapSectionVariable = function (inputList) {
if (["bill","gazette","legislation","regulation","treaty"].indexOf(Item.type) > -1) {
if (item.locator) {
item.locator = item.locator.trim();
var m = item.locator.match(CSL.STATUTE_SUBDIV_PLAIN_REGEX);
var m = item.locator.match(CSL.STATUTE_SUBDIV_PLAIN_REGEX_FRONT);
if (!m) {
if (item.label) {
item.locator = CSL.STATUTE_SUBDIV_STRINGS_REVERSE[item.label] + " " + item.locator;
Expand All @@ -3146,7 +3149,7 @@ CSL.Engine.prototype.remapSectionVariable = function (inputList) {
var sectionMasterLabel = null;
if (Item.section) {
Item.section = Item.section.trim();
var m = Item.section.match(CSL.STATUTE_SUBDIV_PLAIN_REGEX);
var m = Item.section.match(CSL.STATUTE_SUBDIV_PLAIN_REGEX_FRONT);
if (!m) {
Item.section = "sec. " + Item.section;
sectionMasterLabel = "sec.";
Expand Down Expand Up @@ -7147,6 +7150,11 @@ CSL.Node.group = {
state.tmp.group_context.tip.label_form = this.strings.label_form_override;
}
}
if (this.strings.label_capitalize_if_first_override) {
if (!state.tmp.group_context.tip.label_capitalize_if_first) {
state.tmp.group_context.tip.label_capitalize_if_first = this.strings.label_capitalize_if_first_override;
}
}
if (this.realGroup) {
var condition = false;
var force_suppress = false;
Expand All @@ -7157,6 +7165,10 @@ CSL.Node.group = {
if (!label_form) {
label_form = this.strings.label_form_override;
}
var label_capitalize_if_first = state.tmp.group_context.tip.label_capitalize_if_first;
if (!label_capitalize_if_first) {
label_capitalize_if_first = this.strings.label_capitalize_if_first;
}
if (state.tmp.group_context.tip.condition) {
condition = state.tmp.group_context.tip.condition;
force_suppress = state.tmp.group_context.tip.force_suppress;
Expand All @@ -7175,12 +7187,14 @@ CSL.Node.group = {
done_vars = [];
}
state.tmp.group_context.push({
old_term_predecessor: state.tmp.term_predecessor,
term_intended: false,
variable_attempt: false,
variable_success: false,
variable_success_parent: state.tmp.group_context.tip.variable_success,
output_tip: state.output.current.tip,
label_form: label_form,
label_capitalize_if_first: label_capitalize_if_first,
parallel_conditions: this.strings.set_parallel_condition,
condition: condition,
force_suppress: force_suppress,
Expand Down Expand Up @@ -7320,6 +7334,7 @@ CSL.Node.group = {
state.parallel.parallel_conditional_blobs_list.push(parallel_condition_object);
}
} else {
state.tmp.term_predecessor = flags.old_term_predecessor;
state.tmp.group_context.tip.variable_attempt = flags.variable_attempt;
if (flags.force_suppress && !state.tmp.group_context.tip.condition) {
state.tmp.group_context.tip.variable_attempt = true;
Expand Down Expand Up @@ -7723,6 +7738,11 @@ CSL.Node.label = {
}
CSL.UPDATE_GROUP_CONTEXT_CONDITION(state, termtxt);
if (termtxt.indexOf("%s") === -1) {
if (this.strings.capitalize_if_first) {
if (!state.tmp.term_predecessor && !(state.opt["class"] === "in-text" && state.tmp.area === "citation")) {
termtxt = CSL.Output.Formatters["capitalize-first"](state, termtxt);
}
}
state.output.append(termtxt, this);
}
if (item && this.strings.term === "locator") {
Expand Down Expand Up @@ -10016,6 +10036,7 @@ CSL.evaluateLabel = function (node, state, Item, item) {
if (!state.tmp.shadow_numbers[node.strings.term].labelForm
&& !state.tmp.shadow_numbers[node.strings.term].labelDecorations) {
state.tmp.shadow_numbers[node.strings.term].labelForm = node.strings.form;
state.tmp.shadow_numbers[node.strings.term].labelCapitalizeIfFirst = node.strings.capitalize_if_first;
state.tmp.shadow_numbers[node.strings.term].labelDecorations = node.decorations.slice();
}
if (["locator", "number", "page"].indexOf(node.strings.term) > -1 && state.tmp.shadow_numbers[node.strings.term].label) {
Expand All @@ -10031,10 +10052,17 @@ CSL.evaluateLabel = function (node, state, Item, item) {
};
CSL.castLabel = function (state, node, term, plural, mode) {
var label_form = node.strings.form;
var label_capitalize_if_first = node.strings.capitalize_if_first;
if (state.tmp.group_context.tip.label_form && label_form !== "static") {
label_form = state.tmp.group_context.tip.label_form;
}
if (state.tmp.group_context.tip.label_capitalize_if_first) {
label_capitalize_if_first = state.tmp.group_context.tip.label_capitalize_if_first;
}
var ret = state.getTerm(term, label_form, plural, false, mode, node.default_locale);
if (label_capitalize_if_first) {
ret = CSL.Output.Formatters["capitalize-first"](state, ret);
}
if (state.tmp.strip_periods) {
ret = ret.replace(/\./g, "");
} else {
Expand Down Expand Up @@ -10331,10 +10359,6 @@ CSL.Node.number = {
state.tmp.renders_collection_number = true;
}
var value = Item[this.variables[0]];
var form = "long";
if (this.strings.label_form_override) {
form = this.strings.label_form_override;
}
var node = this;
if (state.tmp.group_context.tip.force_suppress) {
return false;
Expand Down Expand Up @@ -10634,7 +10658,6 @@ CSL.Node.text = {
if (item && item[this.variables[0]]) {
state.processNumber(this, item, this.variables[0], Item.type);
CSL.Util.outputNumericField(state, this.variables[0], Item.id);
state.output.append(value, this, false, false, true);
if (["locator", "locator-extra"].indexOf(this.variables_real[0]) > -1
&& !state.tmp.just_looking) {
state.tmp.done_vars.push(this.variables_real[0]);
Expand Down Expand Up @@ -11449,6 +11472,12 @@ CSL.Attributes["@gender"] = function (state, arg) {
CSL.Attributes["@cslid"] = function (state, arg) {
this.cslid = parseInt(arg, 10);
};
CSL.Attributes["@capitalize-if-first"] = function (state, arg) {
this.strings.capitalize_if_first_override = arg;
};
CSL.Attributes["@label-capitalize-if-first"] = function (state, arg) {
this.strings.label_capitalize_if_first_override = arg;
};
CSL.Attributes["@label-form"] = function (state, arg) {
this.strings.label_form_override = arg;
};
Expand Down Expand Up @@ -13875,7 +13904,7 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type)
label = "var:"+variable;
}
if (label) {
var m = label.match(/(\s*)([^\s]*)(\s*)/);
var m = label.match(/(\s*)([^\s]+)(\s*)/);
info.label = m[2];
info.origLabel = origLabel;
info.labelSuffix = m[3] ? m[3] : "";
Expand Down Expand Up @@ -13908,9 +13937,9 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type)
defaultLabel = defaultLabel ? defaultLabel : "";
str = normalizeFieldValue(str, defaultLabel);
var elems = [];
var m = str.match(/(,\s+|\s*\\*[\-\u2013]+\s*|\s*&\s*)/g);
var m = str.match(/(;\s+|,\s+|\s*\\*[\-\u2013]+\s*|\s*&\s*)/g);
if (m) {
var lst = str.split(/(?:,\s+|\s*\\*[\-\u2013]+\s*|\s*&\s*)/);
var lst = str.split(/(?:;\s+|,\s+|\s*\\*[\-\u2013]+\s*|\s*&\s*)/);
for (var i=0,ilen=lst.length-1; i<ilen; i++) {
elems.push(lst[i]);
elems.push(m[i]);
Expand All @@ -13928,36 +13957,52 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type)
if (m) {
var lst = elems[i].split(/(?:(?:^| )(?:[a-z]|[a-z][a-z]|[a-z][a-z][a-z]|[a-z][a-z][a-z][a-z])\. *)/);
for (var j=lst.length-1;j>0;j--) {
if (lst[j-1] && (!lst[j].match(/^[0-9]+([-,:a-zA-Z]*)$/) || !lst[j-1].match(/^[0-9]+([-,:a-zA-Z]*)$/))) {
if (lst[j-1] && (!lst[j].match(/^[0-9]+([-;,:a-zA-Z]*)$/) || !lst[j-1].match(/^[0-9]+([-;,:a-zA-Z]*)$/))) {
lst[j-1] = lst[j-1] + m[j-1] + lst[j];
lst = lst.slice(0,j).concat(lst.slice(j+1))
m = m.slice(0,j-1).concat(m.slice(j))
}
}
if (m.length > 0 && i === 0) {
if (m.length > 0) {
var slug = m[0].trim();
if (!CSL.STATUTE_SUBDIV_STRINGS[slug]
var notAlabel = !CSL.STATUTE_SUBDIV_STRINGS[slug]
|| !me.getTerm(CSL.STATUTE_SUBDIV_STRINGS[slug])
|| (["locator", "number"].indexOf(variable) === -1 && CSL.STATUTE_SUBDIV_STRINGS[slug] !== variable)) {
m = m.slice(1);
lst[0] = lst[0] + " " + slug + " " + lst[1];
lst = lst.slice(0,1).concat(lst.slice(2))
|| (["locator", "number"].indexOf(variable) === -1 && CSL.STATUTE_SUBDIV_STRINGS[slug] !== variable);
if (notAlabel) {
if (i === 0) {
m = m.slice(1);
lst[0] = lst[0] + " " + slug + " " + lst[1];
lst = lst.slice(0,1).concat(lst.slice(2))
}
} else {
origLabel = slug;
}
}
for (var j=0,jlen=lst.length; j<jlen; j++) {
if (lst[j] || j === (lst.length-1)) {
var filteredOrigLabel;
label = m[j-1] ? m[j-1] : label;
var origLabel = j > 1 ? m[j-1] : "";
if (origLabel === label.trim()) {
filteredOrigLabel = "";
} else {
filteredOrigLabel = origLabel;
}
var str = lst[j] ? lst[j].trim() : "";
if (j === (lst.length-1)) {
values.push(composeNumberInfo(origLabel, label, str, elems[i+1]));
values.push(composeNumberInfo(filteredOrigLabel, label, str, elems[i+1]));
} else {
values.push(composeNumberInfo(origLabel, label, str));
values.push(composeNumberInfo(filteredOrigLabel, label, str));
}
}
}
} else {
values.push(composeNumberInfo(origLabel, label, elems[i], elems[i+1]));
var filteredOrigLabel;
if (origLabel === label.trim()) {
filteredOrigLabel = "";
} else {
filteredOrigLabel = origLabel;
}
values.push(composeNumberInfo(filteredOrigLabel, label, elems[i], elems[i+1]));
}
}
return values;
Expand Down Expand Up @@ -13991,8 +14036,12 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type)
currentLabelInfo.collapsible = false;
}
var isCollapsible = currentLabelInfo.collapsible;
if (!isCollapsible && i>0 && val.match(/^[ivxlcmIVXLCM]+$/) && values[i-1].value.match(/^[ivxlcmIVXLCM]+$/)) {
isCollapsible = true;
if (!isCollapsible) {
if (i>0 && val.match(/^[ivxlcmIVXLCM]+$/) && values[i-1].value.match(/^[ivxlcmIVXLCM]+$/)) {
isCollapsible = true;
} else if (i>0 && val.match(/^[0-9]+(?:\s|$)/) && values[i-1].value.match(/^[0-9]+(?:\s|$)/)) {
isCollapsible = true;
}
}
for (var j=currentLabelInfo.pos,jlen=values.length; j<jlen; j++) {
if (currentLabelInfo.label === values[j].label && currentLabelInfo.count > 1 && isCollapsible) {
Expand Down Expand Up @@ -14052,7 +14101,6 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type)
var origLabel = values[i].origLabel ? values[i].origLabel : "";
values[i].value = (origLabel + values[i].value).trim();
if (values[i].label !== values[0].label) {
values[i].label = "";
}
}
}
Expand Down Expand Up @@ -14123,12 +14171,18 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable, type)
}
function checkPage(variable, val) {
return variable === "page"
|| (variable === "locator" && (["p."].indexOf(val.label) > -1));
|| (variable === "locator" && (["p."].indexOf(val.label) > -1 || ["p."].indexOf(val.origLabel) > -1));
}
function checkTerm(variable, val) {
var ret = true;
if (variable === "locator") {
ret = !!me.getTerm(CSL.STATUTE_SUBDIV_STRINGS[val.label]);
var label;
if (val.origLabel) {
label = val.origLabel;
} else {
label = val.label;
}
ret = !!me.getTerm(CSL.STATUTE_SUBDIV_STRINGS[label]);
}
return ret;
}
Expand Down Expand Up @@ -14280,6 +14334,7 @@ CSL.Util.outputNumericField = function(state, varname, itemID) {
} else {
embeddedLabelForm = "short";
}
var labelCapitalizeIfFirst = state.tmp.shadow_numbers[varname].labelCapitalizeIfFirst;
var labelDecorations = state.tmp.shadow_numbers[varname].labelDecorations;
var lastLabelName = null;
for (var i=0,ilen=nums.length;i<ilen;i++) {
Expand All @@ -14298,6 +14353,9 @@ CSL.Util.outputNumericField = function(state, varname, itemID) {
} else {
label = state.getTerm(labelName, embeddedLabelForm, num.plural);
}
if (labelCapitalizeIfFirst) {
label = CSL.Output.Formatters["capitalize-first"](state, label);
}
}
}
var labelPlaceholderPos = -1;
Expand Down Expand Up @@ -14349,6 +14407,7 @@ CSL.Util.outputNumericField = function(state, varname, itemID) {
}
}
lastLabelName === labelName;
state.tmp.term_predecessor = true;
}
state.output.closeLevel();
}
Expand Down

0 comments on commit 153ed72

Please sign in to comment.