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

Update citeproc-js to 1.1.98

Browse source
This commit is contained in:
Dan Stillman 2016-04-17 04:16:25 -04:00
parent 196b28cc66
commit 2ee6886cf1
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

@ -34,7 +34,7 @@ if (!Array.indexOf) {
}; };
} }
var CSL = { var CSL = {
PROCESSOR_VERSION: "1.1.96", PROCESSOR_VERSION: "1.1.98",
CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_TOP: 1,
CONDITION_LEVEL_BOTTOM: 2, CONDITION_LEVEL_BOTTOM: 2,
PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@ -236,7 +236,7 @@ var CSL = {
} }
var lst = val.split(/\s*\|\|\s*/); var lst = val.split(/\s*\|\|\s*/);
if (lst.length === 1) { if (lst.length === 1) {
names[key].push({family:lst[0],isInstitution:true}); names[key].push({literal:lst[0]});
} else if (lst.length === 2) { } else if (lst.length === 2) {
var name = {family:lst[0],given:lst[1]}; var name = {family:lst[0],given:lst[1]};
CSL.parseParticles(name); CSL.parseParticles(name);
@ -1200,7 +1200,7 @@ CSL.parseXml = function(str) {
}); });
} }
function _getAttributes(elem) { function _getAttributes(elem) {
var m = elem.match(/([^\"= ]+)=\"[^\"]*\"/g); var m = elem.match(/([^\'\"= ]+)=(?:\"[^\"]*\"|\'[^\']*\')/g);
if (m) { if (m) {
for (var i=0,ilen=m.length;i<ilen;i++) { for (var i=0,ilen=m.length;i<ilen;i++) {
m[i] = m[i].replace(/=.*/, ""); m[i] = m[i].replace(/=.*/, "");
@ -1209,9 +1209,9 @@ CSL.parseXml = function(str) {
return m; return m;
} }
function _getAttribute(elem, attr) { function _getAttribute(elem, attr) {
var rex = RegExp('^.*[ ]+' + attr + '=\"([^\"]*)\".*$'); var rex = RegExp('^.*[ ]+' + attr + '=(\"(?:[^\"]*)\"|\'(?:[^\']*)\').*$');
var m = elem.match(rex); var m = elem.match(rex);
return m ? m[1] : null; return m ? m[1].slice(1, -1) : null;
} }
function _getTagName(elem) { function _getTagName(elem) {
var rex = RegExp("^<([^ />]+)"); var rex = RegExp("^<([^ />]+)");