Bump version, update CHANGES, bundle as 1.2.30

Juris-M · Dec 18, 2019 · 1aa49dd · 1aa49dd
1 parent 978981a
commit 1aa49dd
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,11 @@
+=========================
+Changes in version 1.2.30
+=========================
+
+- Accommodate citations with no items in author-only mode.
+
+  Report by Alf Eaton: https://github.com/Juris-M/citeproc-js/issues/127
+
 =========================
 Changes in version 1.2.29
 =========================

diff --git a/citeproc.js b/citeproc.js
@@ -59,7 +59,7 @@ Copyright (c) 2009-2019 Frank Bennett
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.29",
+    PROCESSOR_VERSION: "1.2.30",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -6907,7 +6907,7 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
 
     // attach the sorted list to the citation item
     citation.sortedItems = sortedItems;
-    
+
     // build reconstituted citations list in current document order
     var citationByIndex = [];
     var citationById = {};
@@ -7235,10 +7235,15 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
                             if (prevCitation.properties.mode === "author-only" && j > 1) {
                                 old_last_id_offset = 2;
                             }
-                            oldlastid =  citations[j - old_last_id_offset].sortedItems.slice(-1)[0][1].id;
-                            oldlastxloc =  citations[j - old_last_id_offset].sortedItems.slice(-1)[0][1]["locator-extra"];
-                            if (prevCitation.sortedItems[0].slice(-1)[0].legislation_id) {
-                                oldlastid = prevCitation.sortedItems[0].slice(-1)[0].legislation_id;
+                            var adjusted_offset = (j - old_last_id_offset);
+                            if (citations[adjusted_offset].sortedItems.length) {
+                                oldlastid =  citations[adjusted_offset].sortedItems.slice(-1)[0][1].id;
+                                oldlastxloc =  citations[j - old_last_id_offset].sortedItems.slice(-1)[0][1]["locator-extra"];
+                            }
+                            if (prevCitation.sortedItems.length) {
+                                if (prevCitation.sortedItems[0].slice(-1)[0].legislation_id) {
+                                    oldlastid = prevCitation.sortedItems[0].slice(-1)[0].legislation_id;
+                                }
                             }
                         }
                         if (j > 0 && k === 0 && prevCitation.properties.noteIndex !== thisCitation.properties.noteIndex) {

diff --git a/citeproc_commonjs.js b/citeproc_commonjs.js
@@ -59,7 +59,7 @@ Copyright (c) 2009-2019 Frank Bennett
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.29",
+    PROCESSOR_VERSION: "1.2.30",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -6907,7 +6907,7 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
 
     // attach the sorted list to the citation item
     citation.sortedItems = sortedItems;
-    
+
     // build reconstituted citations list in current document order
     var citationByIndex = [];
     var citationById = {};
@@ -7235,10 +7235,15 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
                             if (prevCitation.properties.mode === "author-only" && j > 1) {
                                 old_last_id_offset = 2;
                             }
-                            oldlastid =  citations[j - old_last_id_offset].sortedItems.slice(-1)[0][1].id;
-                            oldlastxloc =  citations[j - old_last_id_offset].sortedItems.slice(-1)[0][1]["locator-extra"];
-                            if (prevCitation.sortedItems[0].slice(-1)[0].legislation_id) {
-                                oldlastid = prevCitation.sortedItems[0].slice(-1)[0].legislation_id;
+                            var adjusted_offset = (j - old_last_id_offset);
+                            if (citations[adjusted_offset].sortedItems.length) {
+                                oldlastid =  citations[adjusted_offset].sortedItems.slice(-1)[0][1].id;
+                                oldlastxloc =  citations[j - old_last_id_offset].sortedItems.slice(-1)[0][1]["locator-extra"];
+                            }
+                            if (prevCitation.sortedItems.length) {
+                                if (prevCitation.sortedItems[0].slice(-1)[0].legislation_id) {
+                                    oldlastid = prevCitation.sortedItems[0].slice(-1)[0].legislation_id;
+                                }
                             }
                         }
                         if (j > 0 && k === 0 && prevCitation.properties.noteIndex !== thisCitation.properties.noteIndex) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "citeproc",
-    "version": "2.2.29",
-    "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.2.29",
+    "version": "2.2.30",
+    "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.2.30",
     "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.29",
+    PROCESSOR_VERSION: "1.2.30",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {