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

Update citeproc-js to 1.1.165

Browse Source
This commit is contained in:
Dan Stillman 2017-05-05 05:20:03 -04:00
parent 4ef39107f3
commit 7a51f5e3cc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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.160", PROCESSOR_VERSION: "1.1.165",
CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_TOP: 1,
CONDITION_LEVEL_BOTTOM: 2, CONDITION_LEVEL_BOTTOM: 2,
PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@ -8758,11 +8758,11 @@ CSL.NameOutput.prototype._runDisambigNames = function (lst, pos) {
} }
chk = this.state.tmp.disambig_settings.givens[pos][i]; chk = this.state.tmp.disambig_settings.givens[pos][i];
if ("undefined" === typeof chk) { if ("undefined" === typeof chk) {
myform = this.state.inheritOpt(this.name, "form", "name-form", "long"); myform = this.state.inheritOpt(this.name, "form", "name-form");
param = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, 0, myform, myinitials); param = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, 0, myform, myinitials);
this.state.tmp.disambig_settings.givens[pos].push(param); this.state.tmp.disambig_settings.givens[pos].push(param);
} }
myform = this.state.inheritOpt(this.name, "form", "name-form", "long"); myform = this.state.inheritOpt(this.name, "form", "name-form");
paramx = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, 0, myform, myinitials); paramx = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, 0, myform, myinitials);
if (this.state.tmp.disambig_request) { if (this.state.tmp.disambig_request) {
var val = this.state.tmp.disambig_settings.givens[pos][i]; var val = this.state.tmp.disambig_settings.givens[pos][i];
@ -8774,7 +8774,7 @@ CSL.NameOutput.prototype._runDisambigNames = function (lst, pos) {
} }
param = val; param = val;
if (this.state.opt["disambiguate-add-givenname"] && lst[i].given) { if (this.state.opt["disambiguate-add-givenname"] && lst[i].given) {
param = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, param, this.state.inheritOpt(this.name, "form", "name-form", "long"), this.state.inheritOpt(this.name, "initialize-with")); param = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, param, this.state.inheritOpt(this.name, "form", "name-form"), this.state.inheritOpt(this.name, "initialize-with"));
} }
} else { } else {
param = paramx; param = paramx;
@ -14873,7 +14873,7 @@ CSL.Output.Formatters = new function () {
this.title = title; this.title = title;
this["capitalize-first"] = capitalizeFirst; this["capitalize-first"] = capitalizeFirst;
this["capitalize-all"] = capitalizeAll; this["capitalize-all"] = capitalizeAll;
var rexStr = "(?:\u2018|\u2019|\u201C|\u201D| \"| \'|\"|\'|[-\/.,;?!:]|\\[|\\]|\\(|\\)|<span style=\"font-variant: small-caps;\">|<span class=\"no(?:case|decor)\">|<\/span>|<\/?(?:i|sc|b|sub|sup)>)"; var rexStr = "(?:\u2018|\u2019|\u201C|\u201D| \"| \'|\"|\'|[-\–\—\/.,;?!:]|\\[|\\]|\\(|\\)|<span style=\"font-variant: small-caps;\">|<span class=\"no(?:case|decor)\">|<\/span>|<\/?(?:i|sc|b|sub|sup)>)";
tagDoppel = new CSL.Doppeler(rexStr, function(str) { tagDoppel = new CSL.Doppeler(rexStr, function(str) {
return str.replace(/(<span)\s+(class=\"no(?:case|decor)\")[^>]*(>)/g, "$1 $2$3").replace(/(<span)\s+(style=\"font-variant:)\s*(small-caps);?(\")[^>]*(>)/g, "$1 $2 $3;$4$5"); return str.replace(/(<span)\s+(class=\"no(?:case|decor)\")[^>]*(>)/g, "$1 $2$3").replace(/(<span)\s+(style=\"font-variant:)\s*(small-caps);?(\")[^>]*(>)/g, "$1 $2 $3;$4$5");
}); });