www

commit 2ee6886cf1b0257f8a10843e45ca76c0f9c801fb
parent 196b28cc667c4e18604702bbe9f973324a68ac52
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 17 Apr 2016 04:16:25 -0400

Update citeproc-js to 1.1.98

Diffstat:
M
chrome/content/zotero/xpcom/citeproc.js
 | 
10
+++++-----

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