Bump version, update CHANGES, release as 1.2.10

Juris-M · Jun 20, 2019 · 1ea011b · 1ea011b
1 parent 5cf9cec
commit 1ea011b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,13 @@
 Summary of changes to citeproc-js since version 1.2 release.
 
+=========================
+Changes in version 1.2.10
+=========================
+
+- Avoid crash under some obscure disambiguation conditions.
+
+  https://forums.zotero.org/discussion/77849/report-id-1635808036
+
 ========================
 Changes in version 1.2.9
 ========================

diff --git a/citeproc.js b/citeproc.js
@@ -23,7 +23,7 @@ Copyright (c) 2009-2019 Frank Bennett
     <http://www.gnu.org/licenses/> respectively.
 */
 var CSL = {
-    PROCESSOR_VERSION: "1.2.9",
+    PROCESSOR_VERSION: "1.2.10",
     LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"),
     STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/,
     STATUTE_SUBDIV_PLAIN_REGEX_FRONT: /(?:^\s*[.,;]*\s*(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/,
@@ -17729,6 +17729,9 @@ CSL.Disambiguation.prototype.captureStepToBase = function() {
     if (this.state.citation.opt["givenname-disambiguation-rule"] === "by-cite"
         && this.base.givens && this.base.givens.length) {
         if ("undefined" !== typeof this.base.givens[this.gnameset][this.gname]) {
+            if (this.betterbase.givens.length < this.base.givens.length) {
+                this.betterbase.givens = JSON.parse(JSON.stringify(this.base.givens));
+            }
             this.betterbase.givens[this.gnameset][this.gname] = this.base.givens[this.gnameset][this.gname];
         }
     }

diff --git a/citeproc_commonjs.js b/citeproc_commonjs.js
@@ -23,7 +23,7 @@ Copyright (c) 2009-2019 Frank Bennett
     <http://www.gnu.org/licenses/> respectively.
 */
 var CSL = {
-    PROCESSOR_VERSION: "1.2.9",
+    PROCESSOR_VERSION: "1.2.10",
     LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"),
     STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/,
     STATUTE_SUBDIV_PLAIN_REGEX_FRONT: /(?:^\s*[.,;]*\s*(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/,
@@ -17729,6 +17729,9 @@ CSL.Disambiguation.prototype.captureStepToBase = function() {
     if (this.state.citation.opt["givenname-disambiguation-rule"] === "by-cite"
         && this.base.givens && this.base.givens.length) {
         if ("undefined" !== typeof this.base.givens[this.gnameset][this.gname]) {
+            if (this.betterbase.givens.length < this.base.givens.length) {
+                this.betterbase.givens = JSON.parse(JSON.stringify(this.base.givens));
+            }
             this.betterbase.givens[this.gnameset][this.gname] = this.base.givens[this.gnameset][this.gname];
         }
     }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "citeproc",
-    "version": "2.2.9",
-    "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.2.9",
+    "version": "2.2.10",
+    "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.2.10",
     "main": "citeproc_commonjs.js",
     "repository": {
         "type": "git",

diff --git a/src/load.js b/src/load.js
@@ -35,7 +35,7 @@
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.9",
+    PROCESSOR_VERSION: "1.2.10",
 
     LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"),