From 4adad64b16bf5bc2acdb06e14f91ffd9c713d2e3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 19 Sep 2016 02:50:45 -0400 Subject: [PATCH 1/5] Update version --- install.rdf | 2 +- resource/config.js | 2 +- update.rdf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index 52c7f23fe..09cfa19aa 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.29.12.SOURCE + 4.0.29.13.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats diff --git a/resource/config.js b/resource/config.js index f013c5a6d..579f9b850 100644 --- a/resource/config.js +++ b/resource/config.js @@ -15,7 +15,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.29.12.SOURCE' + VERSION: '4.0.29.13.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/update.rdf b/update.rdf index 77b6435af..fbf9d5c25 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.29.12.SOURCE + 4.0.29.13.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384} From e8d0dc6e00536615ffc1356669e3ca92c8a506a5 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 19 Sep 2016 05:16:37 -0400 Subject: [PATCH 2/5] Update version --- install.rdf | 2 +- resource/config.js | 2 +- update.rdf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index 09cfa19aa..a115a4f0a 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.29.13.SOURCE + 4.0.29.14.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats diff --git a/resource/config.js b/resource/config.js index 579f9b850..81af16ee5 100644 --- a/resource/config.js +++ b/resource/config.js @@ -15,7 +15,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.29.13.SOURCE' + VERSION: '4.0.29.14.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/update.rdf b/update.rdf index fbf9d5c25..98cce0674 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.29.13.SOURCE + 4.0.29.14.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384} From 610dce7c1f7b90427003c138c15d19b41bbd5eda Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Sep 2016 18:34:24 -0400 Subject: [PATCH 3/5] Update citeproc-js to 1.1.131 --- chrome/content/zotero/xpcom/citeproc.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index 92da7b98e..c21d113ac 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -23,7 +23,7 @@ * respectively. */ var CSL = { - PROCESSOR_VERSION: "1.1.130", + PROCESSOR_VERSION: "1.1.131", CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_BOTTOM: 2, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, @@ -4657,7 +4657,6 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre, var c, i, ilen, j, jlen, k, klen, n, nlen, key, Item, item, noteCitations, textCitations, m, citationsInNote; this.debug = false; this.tmp.loadedItemIDs = {}; - citation = JSON.parse(JSON.stringify(citation)); this.tmp.citation_errors = []; var return_data = {"bibchange": false}; this.setCitationId(citation); From 015a13716f1b13c9cbb16f7c374cb1c3a14a4f9e Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 22 Sep 2016 00:19:02 -0400 Subject: [PATCH 4/5] Update citeproc-js to 1.1.133 --- chrome/content/zotero/xpcom/citeproc.js | 73 +++++++++++++------------ 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index c21d113ac..7a70efe01 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -23,7 +23,7 @@ * respectively. */ var CSL = { - PROCESSOR_VERSION: "1.1.131", + PROCESSOR_VERSION: "1.1.133", CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_BOTTOM: 2, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, @@ -238,42 +238,47 @@ var CSL = { elems.push(m[i]); } elems.push(splt[splt.length-1]) - var names = {}; - for (var i=1,ilen=elems.length;i -1) { - Item[key] = {raw: val}; - elems[i] = ""; - } else { - Item[key] = val; - } - } else if (CSL.NAME_VARIABLES.indexOf(key) > -1) { - if (!names[key]) { - names[key] = []; - } - var lst = val.split(/\s*\|\|\s*/); - if (lst.length === 1) { - names[key].push({literal:lst[0]}); - } else if (lst.length === 2) { - var name = {family:lst[0],given:lst[1]}; - CSL.parseParticles(name); - names[key].push(name); - } - elems[i] = ""; + for (var i=1,ilen=elems.length;i -1) { + Item[key] = {raw: val}; + } else if (CSL.NAME_VARIABLES.indexOf(key) > -1) { + if (!names[key]) { + names[key] = []; } + var lst = val.split(/\s*\|\|\s*/); + if (lst.length === 1) { + names[key].push({literal:lst[0]}); + } else if (lst.length === 2) { + var name = {family:lst[0],given:lst[1]}; + CSL.parseParticles(name); + names[key].push(name); + } + } else { + Item[key] = val; } - if (name === "type") { - Item.type = val; - } - Item.note = elems.join(""); + elems[i] = ""; } - for (var key in names) { - Item[key] = names[key]; + if (name === "type") { + Item.type = val; } + Item.note = elems.join(""); + } + for (var key in names) { + Item[key] = names[key]; } }, GENDERS: ["masculine", "feminine"], @@ -365,7 +370,7 @@ var CSL = { VIETNAMESE_SPECIALS: /[\u00c0-\u00c3\u00c8-\u00ca\u00cc\u00cd\u00d2-\u00d5\u00d9\u00da\u00dd\u00e0-\u00e3\u00e8-\u00ea\u00ec\u00ed\u00f2-\u00f5\u00f9\u00fa\u00fd\u0101\u0103\u0110\u0111\u0128\u0129\u0168\u0169\u01a0\u01a1\u01af\u01b0\u1ea0-\u1ef9]/, VIETNAMESE_NAMES: /^(?:(?:[.AaBbCcDdEeGgHhIiKkLlMmNnOoPpQqRrSsTtUuVvXxYy \u00c0-\u00c3\u00c8-\u00ca\u00cc\u00cd\u00d2-\u00d5\u00d9\u00da\u00dd\u00e0-\u00e3\u00e8-\u00ea\u00ec\u00ed\u00f2-\u00f5\u00f9\u00fa\u00fd\u0101\u0103\u0110\u0111\u0128\u0129\u0168\u0169\u01a0\u01a1\u01af\u01b0\u1ea0-\u1ef9]{2,6})(\s+|$))+$/, NOTE_FIELDS_REGEXP: /\{:(?:[\-_a-z]+|[A-Z]+):[^\}]+\}/g, - NOTE_FIELD_REGEXP: /\{:([\-_a-z]+|[A-Z]+):\s*([^\}]+)\}/, + NOTE_FIELD_REGEXP: /^([\-_a-z]+|[A-Z]+):\s*([^\}]+)$/, DISPLAY_CLASSES: ["block", "left-margin", "right-inline", "indent"], NAME_VARIABLES: [ "author", From b8b85f48535346c530e553935f6cb6c259c364e3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 22 Sep 2016 00:19:27 -0400 Subject: [PATCH 5/5] Update version --- install.rdf | 2 +- resource/config.js | 2 +- update.rdf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index a115a4f0a..f32ad0d4a 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.29.14.SOURCE + 4.0.29.15.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats diff --git a/resource/config.js b/resource/config.js index 81af16ee5..fb7f2ddd8 100644 --- a/resource/config.js +++ b/resource/config.js @@ -15,7 +15,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.29.14.SOURCE' + VERSION: '4.0.29.15.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/update.rdf b/update.rdf index 98cce0674..44b89cf77 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.29.14.SOURCE + 4.0.29.15.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384}