From fc352c5022d58a4312e58db29d623f0e7b39f60c Mon Sep 17 00:00:00 2001 From: Frank Bennett Date: Sat, 25 May 2019 07:48:02 +0900 Subject: [PATCH] Bump version, update CHANGES, bundle as 1.2.5 --- CHANGES.txt | 6 ++++++ citeproc.js | 4 ++-- citeproc_commonjs.js | 4 ++-- src/load.js | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 770ea5972..f51f673f6 100644 --- 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.5 +======================== + +- Convert number to string before string operation + ======================== Changes in version 1.2.4 ======================== diff --git a/citeproc.js b/citeproc.js index 2d901937c..c35115438 100644 --- a/citeproc.js +++ b/citeproc.js @@ -23,7 +23,7 @@ Copyright (c) 2009-2019 Frank Bennett respectively. */ var CSL = { - PROCESSOR_VERSION: "1.2.3", + PROCESSOR_VERSION: "1.2.5", LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"), STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/, STATUTE_SUBDIV_PLAIN_REGEX_FRONT: /(?:^\s*[.,;]*\s*(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/, @@ -14701,7 +14701,7 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable) { var lst = str.split(/(?:;\s+|,\s+|\s*\\*[\-\u2013]+\s*|\s*&\s*)/); var recombine = false; for (var i in lst) { - if (lst[i].replace(/^[a-z]\.\s+/, "").match(/[^\s0-9ivxlcmIVXLCM]/)) { + if (("" + lst[i]).replace(/^[a-z]\.\s+/, "").match(/[^\s0-9ivxlcmIVXLCM]/)) { break; } } diff --git a/citeproc_commonjs.js b/citeproc_commonjs.js index aec48f2ff..ea3a9f488 100644 --- a/citeproc_commonjs.js +++ b/citeproc_commonjs.js @@ -23,7 +23,7 @@ Copyright (c) 2009-2019 Frank Bennett respectively. */ var CSL = { - PROCESSOR_VERSION: "1.2.3", + PROCESSOR_VERSION: "1.2.5", LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"), STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/, STATUTE_SUBDIV_PLAIN_REGEX_FRONT: /(?:^\s*[.,;]*\s*(?:art|bk|ch|subch|col|fig|fol|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\. *)/, @@ -14701,7 +14701,7 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable) { var lst = str.split(/(?:;\s+|,\s+|\s*\\*[\-\u2013]+\s*|\s*&\s*)/); var recombine = false; for (var i in lst) { - if (lst[i].replace(/^[a-z]\.\s+/, "").match(/[^\s0-9ivxlcmIVXLCM]/)) { + if (("" + lst[i]).replace(/^[a-z]\.\s+/, "").match(/[^\s0-9ivxlcmIVXLCM]/)) { break; } } diff --git a/src/load.js b/src/load.js index c067cbe8f..e4561ec22 100644 --- a/src/load.js +++ b/src/load.js @@ -35,7 +35,7 @@ var CSL = { - PROCESSOR_VERSION: "1.2.4", + PROCESSOR_VERSION: "1.2.5", LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"),