Bump version, update CHANGES, bundle as 1.2.21

Juris-M · Jul 30, 2019 · 67d6c60 · 67d6c60
1 parent 51fc093
commit 67d6c60
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,14 @@
 Summary of changes to citeproc-js since version 1.2 release.
 
+=========================
+Changes in version 1.2.21
+=========================
+
+- Block implicit short title if "main" title is purely numeric:
+
+
+  https://forums.zotero.org/discussion/78458/incomplete-reference-title-in-text-citation
+
 =========================
 Changes in version 1.2.20
 =========================

diff --git a/citeproc.js b/citeproc.js
@@ -59,7 +59,7 @@ Copyright (c) 2009-2019 Frank Bennett
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.20",
+    PROCESSOR_VERSION: "1.2.21",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -778,12 +778,12 @@ var CSL = {
                             vals[title.subjoin] = splitTitle[1];
                             vals[title.sub] = splitTitle[2];
                             if (this.opt.development_extensions.implicit_short_title) {
-                                if (!Item["title-short"]) {
+                                if (!Item[title.short] && !vals[title.main].match(/^[\-\.[0-9]+$/)) {
                                     var punct = vals[title.subjoin].trim();
                                     if (["?", "!"].indexOf(punct) === -1) {
                                         punct = "";
                                     }
-                                    vals[title["short"]] = vals[title.main] + punct;
+                                    vals[title.short] = vals[title.main] + punct;
                                 }
                             }
                         } else {

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.20",
+    PROCESSOR_VERSION: "1.2.21",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -778,12 +778,12 @@ var CSL = {
                             vals[title.subjoin] = splitTitle[1];
                             vals[title.sub] = splitTitle[2];
                             if (this.opt.development_extensions.implicit_short_title) {
-                                if (!Item["title-short"]) {
+                                if (!Item[title.short] && !vals[title.main].match(/^[\-\.[0-9]+$/)) {
                                     var punct = vals[title.subjoin].trim();
                                     if (["?", "!"].indexOf(punct) === -1) {
                                         punct = "";
                                     }
-                                    vals[title["short"]] = vals[title.main] + punct;
+                                    vals[title.short] = vals[title.main] + punct;
                                 }
                             }
                         } else {

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