From 55ee55ed7b7090b1e587339f16d0e96bd66a7be3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 2 Nov 2016 02:20:49 -0400 Subject: [PATCH 1/2] Update version and submodules --- install.rdf | 2 +- resource/config.js | 2 +- resource/schema/repotime.txt | 2 +- styles | 2 +- translators | 2 +- update.rdf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install.rdf b/install.rdf index 8812ebe910..d86a5cf7ca 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.29.15.SOURCE + 4.0.29.16.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 fb7f2ddd8f..b900f94d97 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.15.SOURCE' + VERSION: '4.0.29.16.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index 92a72e807b..1cbf96b101 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2016-10-01 04:05:00 +2016-10-23 15:30:00 diff --git a/styles b/styles index 942da8d316..37b89da237 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 942da8d31679e83ff51b15e8fadddcdffdef34fc +Subproject commit 37b89da2373093ca8baf062f34b9b1d0952c543e diff --git a/translators b/translators index 4273554afc..79486040d4 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit 4273554afc20fe593b30faa6196edac9e755a7fa +Subproject commit 79486040d42c9d273eb45012b2296d90be8008de diff --git a/update.rdf b/update.rdf index 44b89cf770..dd49b11306 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.29.15.SOURCE + 4.0.29.16.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384} From 6e21bb4b5722741d67dabd479b7c50542f1659e3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 3 Nov 2016 10:11:54 -0400 Subject: [PATCH 2/2] Update citeproc-js to 1.1.139 --- chrome/content/zotero/xpcom/citeproc.js | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index 868b3bcc3f..5c6b7b1353 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.138", + PROCESSOR_VERSION: "1.1.139", CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_BOTTOM: 2, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, @@ -2967,21 +2967,13 @@ CSL.Engine.prototype.setOpt = function (token, name, value) { } }; CSL.Engine.prototype.inheritOpt = function (token, attrname, parentname, defaultValue) { - if (parentname === "name-form") { - } if ("undefined" !== typeof token.strings[attrname]) { - if (parentname === "name-form") { - } return token.strings[attrname]; } else { var parentValue = this[this.tmp.root].opt.inheritedAttributes[parentname ? parentname : attrname]; if ("undefined" !== typeof parentValue) { - if (parentname === "name-form") { - } return parentValue; } else { - if (parentname === "name-form") { - } return defaultValue; } } @@ -5921,7 +5913,7 @@ CSL.Engine.prototype.setCitationId = function (citation, force) { while (true) { direction = 0; if (!this.registry.citationreg.citationById[id]) { - citation.citationID = id.toString(32); + citation.citationID = "a" + id.toString(32); break; } else if (!direction && id < 50000000000000) { direction = 1; @@ -8564,11 +8556,11 @@ CSL.NameOutput.prototype._runDisambigNames = function (lst, pos) { } chk = this.state.tmp.disambig_settings.givens[pos][i]; if ("undefined" === typeof chk) { - myform = this.state.inheritOpt(this.name, "form", "name-form"); + myform = this.state.inheritOpt(this.name, "form", "name-form", "long"); param = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, 0, myform, myinitials); this.state.tmp.disambig_settings.givens[pos].push(param); } - myform = this.state.inheritOpt(this.name, "form", "name-form"); + myform = this.state.inheritOpt(this.name, "form", "name-form", "long"); paramx = this.state.registry.namereg.evalname("" + this.Item.id, lst[i], i, 0, myform, myinitials); if (this.state.tmp.disambig_request) { var val = this.state.tmp.disambig_settings.givens[pos][i]; @@ -8580,7 +8572,7 @@ CSL.NameOutput.prototype._runDisambigNames = function (lst, pos) { } param = val; 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"), 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", "long"), this.state.inheritOpt(this.name, "initialize-with")); } } else { param = paramx; @@ -13991,7 +13983,11 @@ CSL.Util.outputNumericField = function(state, varname, itemID) { } } if (num.collapsible) { - var blob = new CSL.NumericBlob(num.particle, parseInt(num.value, 10), numStyling, itemID); + if (num.value.match(/^[0-9]+$/)) { + var blob = new CSL.NumericBlob(num.particle, parseInt(num.value, 10), numStyling, itemID); + } else { + var blob = new CSL.NumericBlob(num.particle, num.value, numStyling, itemID); + } if ("undefined" === typeof blob.gender) { blob.gender = state.locale[state.opt.lang]["noun-genders"][varname]; }