Bump version, update CHANGES, bundle as 1.2.19

Juris-M · Jul 21, 2019 · 1f0d230 · 1f0d230
1 parent 8d20f3f
commit 1f0d230
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,11 @@
 Summary of changes to citeproc-js since version 1.2 release.
 
+=========================
+Changes in version 1.2.19
+=========================
+
+- Do not print secondary or tertiary language variants that match primary
+
 =========================
 Changes in version 1.2.18
 =========================

diff --git a/citeproc.js b/citeproc.js
@@ -59,7 +59,7 @@ Copyright (c) 2009-2019 Frank Bennett
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.17",
+    PROCESSOR_VERSION: "1.2.19",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -1206,7 +1206,8 @@ var CSL = {
         "prioritize_disambiguate_condition",
         "csl_reverse_lookup_support",
         "main_title_from_short_title",
-        "uppercase_subtitles"
+        "uppercase_subtitles",
+        "force_short_title_casing_alignment"
     ],
 
     TITLE_SPLIT_REGEXP: (function() {
@@ -17435,7 +17436,10 @@ CSL.Transform = function (state) {
                 primary_tok.strings.suffix = primary_tok.strings.suffix.replace(/[ .,]+$/,"");
                 state.output.append(primary, primary_tok);
                 state.tmp.probably_rendered_something = true;
-
+
+                if (primary === secondary) {
+                    secondary = false;
+                }
                 if (secondary) {
                     secondary_tok.strings.prefix = state.opt.citeAffixes[langPrefs][slot.secondary].prefix;
                     secondary_tok.strings.suffix = state.opt.citeAffixes[langPrefs][slot.secondary].suffix;
@@ -17464,6 +17468,10 @@ CSL.Transform = function (state) {
                     // Suppress supplementary multilingual info on subsequent
                     // partners of a parallel cite?
                 }
+                if (primary === tertiary) {
+                    tertiary = false;
+                }
+
                 if (tertiary) {
                     tertiary_tok.strings.prefix = state.opt.citeAffixes[langPrefs][slot.tertiary].prefix;
                     tertiary_tok.strings.suffix = state.opt.citeAffixes[langPrefs][slot.tertiary].suffix;

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.17",
+    PROCESSOR_VERSION: "1.2.19",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -1206,7 +1206,8 @@ var CSL = {
         "prioritize_disambiguate_condition",
         "csl_reverse_lookup_support",
         "main_title_from_short_title",
-        "uppercase_subtitles"
+        "uppercase_subtitles",
+        "force_short_title_casing_alignment"
     ],
 
     TITLE_SPLIT_REGEXP: (function() {
@@ -17435,7 +17436,10 @@ CSL.Transform = function (state) {
                 primary_tok.strings.suffix = primary_tok.strings.suffix.replace(/[ .,]+$/,"");
                 state.output.append(primary, primary_tok);
                 state.tmp.probably_rendered_something = true;
-
+
+                if (primary === secondary) {
+                    secondary = false;
+                }
                 if (secondary) {
                     secondary_tok.strings.prefix = state.opt.citeAffixes[langPrefs][slot.secondary].prefix;
                     secondary_tok.strings.suffix = state.opt.citeAffixes[langPrefs][slot.secondary].suffix;
@@ -17464,6 +17468,10 @@ CSL.Transform = function (state) {
                     // Suppress supplementary multilingual info on subsequent
                     // partners of a parallel cite?
                 }
+                if (primary === tertiary) {
+                    tertiary = false;
+                }
+
                 if (tertiary) {
                     tertiary_tok.strings.prefix = state.opt.citeAffixes[langPrefs][slot.tertiary].prefix;
                     tertiary_tok.strings.suffix = state.opt.citeAffixes[langPrefs][slot.tertiary].suffix;

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