Bump version, update CHANGES, bundle as 1.1.153

Juris-M · Feb 11, 2017 · dd645cb · dd645cb
1 parent 2874397
commit dd645cb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,12 @@
 Summary of changes to citeproc-js since version 1.0.0 release.
 
+==========================
+Changes in version 1.1.153
+==========================
+
+- Permit abbreviation loading via a getAbbreviation() function
+  that does not return a value. Should now be backward-compatible.
+
 ==========================
 Changes in version 1.1.152
 ==========================

diff --git a/citeproc.js b/citeproc.js
@@ -23,7 +23,7 @@
  *     <http://www.gnu.org/licenses/> respectively.
  */
 var CSL = {
-    PROCESSOR_VERSION: "1.1.152",
+    PROCESSOR_VERSION: "1.1.153",
     CONDITION_LEVEL_TOP: 1,
     CONDITION_LEVEL_BOTTOM: 2,
     PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@@ -12359,9 +12359,12 @@ CSL.Transform = function (state) {
             return jurisdiction;
         }
         if (state.sys.getAbbreviation) {
-            return state.sys.getAbbreviation(state.opt.styleID, state.transform.abbrevs, jurisdiction, category, orig, itemType, true);
+            jurisdiction = state.sys.getAbbreviation(state.opt.styleID, state.transform.abbrevs, jurisdiction, category, orig, itemType, true);
+            if (!jurisdiction) {
+                jurisdiction = "default";
+            }
         }
-        return "default";        
+        return jurisdiction;
     }
     this.loadAbbreviation = loadAbbreviation;
     function publisherCheck (tok, Item, primary, myabbrev_family) {

diff --git a/citeproc_with_e4x.js b/citeproc_with_e4x.js
@@ -23,7 +23,7 @@
  *     <http://www.gnu.org/licenses/> respectively.
  */
 var CSL = {
-    PROCESSOR_VERSION: "1.1.152",
+    PROCESSOR_VERSION: "1.1.153",
     CONDITION_LEVEL_TOP: 1,
     CONDITION_LEVEL_BOTTOM: 2,
     PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@@ -12360,9 +12360,12 @@ CSL.Transform = function (state) {
             return jurisdiction;
         }
         if (state.sys.getAbbreviation) {
-            return state.sys.getAbbreviation(state.opt.styleID, state.transform.abbrevs, jurisdiction, category, orig, itemType, true);
+            jurisdiction = state.sys.getAbbreviation(state.opt.styleID, state.transform.abbrevs, jurisdiction, category, orig, itemType, true);
+            if (!jurisdiction) {
+                jurisdiction = "default";
+            }
         }
-        return "default";        
+        return jurisdiction;
     }
     this.loadAbbreviation = loadAbbreviation;
     function publisherCheck (tok, Item, primary, myabbrev_family) {

diff --git a/src/load.js b/src/load.js
@@ -33,7 +33,7 @@
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.1.152",
+    PROCESSOR_VERSION: "1.1.153",
 
     CONDITION_LEVEL_TOP: 1,