From 3389e9b23a1873c1bb0af16eef7533aefd669701 Mon Sep 17 00:00:00 2001
From: Frank Bennett <biercenator@gmail.com>
Date: Thu, 16 Jan 2020 18:11:41 +0900
Subject: [PATCH] Bump version, update CHANGES, bundle as 1.2.31

---
 CHANGES.txt          | 10 ++++++++++
 citeproc.js          | 10 +++++++---
 citeproc_commonjs.js | 10 +++++++---
 fixtures/std         |  2 +-
 package.json         |  4 ++--
 src/load.js          |  2 +-
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4ea2cb141..08020bb02 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,13 @@
+=========================
+Changes in version 1.2.31
+=========================
+
+- Fix error in title-case treatment of text-case="title". At last!
+
+  https://github.com/Juris-M/citeproc-js/issues/120
+
+- Tweak behavior of is-numeric
+
 =========================
 Changes in version 1.2.30
 =========================
diff --git a/citeproc.js b/citeproc.js
index b8a1c9781..3e2be7293 100644
--- a/citeproc.js
+++ b/citeproc.js
@@ -59,7 +59,7 @@ Copyright (c) 2009-2019 Frank Bennett
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.30",
+    PROCESSOR_VERSION: "1.2.31",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -647,6 +647,7 @@ var CSL = {
         "number",
         "number-of-pages",
         "number-of-volumes",
+        "version",
         "volume",
         // "section", ??? add this?
         "supplement",
@@ -15075,7 +15076,10 @@ CSL.Node.text = {
 
                     // Deal with multi-fields and ordinary fields separately.
                     if (CSL.MULTI_FIELDS.indexOf(this.variables_real[0]) > -1
-                        || ["language-name", "language-name-original"].indexOf(this.variables_real[0]) > -1) {
+                        || this.variables_real[0].indexOf("-main") > -1
+                        || this.variables_real[0].indexOf("-sub") > -1
+                        || ["language-name", "language-name-original"].indexOf(this.variables_real[0]) > -1
+                       ) {
 
                         // multi-fields
                         // Initialize transform factory according to whether
@@ -15348,7 +15352,7 @@ CSL.Attributes["@is-numeric"] = function (state, arg) {
                 if (state.tmp.shadow_numbers[variable].numeric) {
                     return true;
                 }
-            } else if (["title", "locator-extra","version"].indexOf(variable) > -1) {
+            } else if (["title","version"].indexOf(variable) > -1) {
                 if (myitem[variable].slice(-1) === "" + parseInt(myitem[variable].slice(-1), 10)) {
                     return true;
                 }
diff --git a/citeproc_commonjs.js b/citeproc_commonjs.js
index b3ee00f40..21eeba7f6 100644
--- a/citeproc_commonjs.js
+++ b/citeproc_commonjs.js
@@ -59,7 +59,7 @@ Copyright (c) 2009-2019 Frank Bennett
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.30",
+    PROCESSOR_VERSION: "1.2.31",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {
@@ -647,6 +647,7 @@ var CSL = {
         "number",
         "number-of-pages",
         "number-of-volumes",
+        "version",
         "volume",
         // "section", ??? add this?
         "supplement",
@@ -15075,7 +15076,10 @@ CSL.Node.text = {
 
                     // Deal with multi-fields and ordinary fields separately.
                     if (CSL.MULTI_FIELDS.indexOf(this.variables_real[0]) > -1
-                        || ["language-name", "language-name-original"].indexOf(this.variables_real[0]) > -1) {
+                        || this.variables_real[0].indexOf("-main") > -1
+                        || this.variables_real[0].indexOf("-sub") > -1
+                        || ["language-name", "language-name-original"].indexOf(this.variables_real[0]) > -1
+                       ) {
 
                         // multi-fields
                         // Initialize transform factory according to whether
@@ -15348,7 +15352,7 @@ CSL.Attributes["@is-numeric"] = function (state, arg) {
                 if (state.tmp.shadow_numbers[variable].numeric) {
                     return true;
                 }
-            } else if (["title", "locator-extra","version"].indexOf(variable) > -1) {
+            } else if (["title","version"].indexOf(variable) > -1) {
                 if (myitem[variable].slice(-1) === "" + parseInt(myitem[variable].slice(-1), 10)) {
                     return true;
                 }
diff --git a/fixtures/std b/fixtures/std
index 8965cd70e..33d397394 160000
--- a/fixtures/std
+++ b/fixtures/std
@@ -1 +1 @@
-Subproject commit 8965cd70e9bd4309c663adc649c608b0bf3160e1
+Subproject commit 33d397394ce585c6f1a2570d8307ec6e875913a9
diff --git a/package.json b/package.json
index d7d323081..b026976d4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "citeproc",
-    "version": "2.2.30",
-    "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.2.30",
+    "version": "2.2.31",
+    "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.2.31",
     "main": "citeproc_commonjs.js",
     "repository": {
         "type": "git",
diff --git a/src/load.js b/src/load.js
index 075623ac4..c7f30719e 100644
--- a/src/load.js
+++ b/src/load.js
@@ -35,7 +35,7 @@
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.30",
+    PROCESSOR_VERSION: "1.2.31",
 
     error: function(str) { // default error function
         if ("undefined" === typeof Error) {