From 73bc1b44bc7d54d0bfec4e070fd27f5efe024ff9 Mon Sep 17 00:00:00 2001 From: Frank Bennett Date: Sun, 16 Apr 2023 20:31:45 +0900 Subject: [PATCH] Bump package version --- citeproc.js | 12 ++++++++---- citeproc_commonjs.js | 12 ++++++++---- package.json | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/citeproc.js b/citeproc.js index 38ae69bc5..7e302fff5 100644 --- a/citeproc.js +++ b/citeproc.js @@ -23622,6 +23622,11 @@ CSL.Registry.NameReg = function (state) { set_keys = function (state, itemid, nameobj) { pkey = strip_periods(nameobj.family); + + if (state.opt["demote-non-dropping-particle"] === "never" && nameobj["non-dropping-particle"] && nameobj["family"]) { + pkey = `${pkey} ${nameobj["non-dropping-particle"]}`; + } + skey = strip_periods(nameobj.given); // Drop lowercase suffixes (such as et al.) from given name field // for disambiguation purposes. @@ -23833,11 +23838,10 @@ CSL.Registry.NameReg = function (state) { && pos !== 0) { return; } - + // A hack. Safe if the name object is used only here, for disambiguation purposes. - if (state.opt["demote-non-dropping-particle"] === "never" && nameobj["non-dropping-particle"] && nameobj["family"]) { - nameobj["family"] = nameobj["non-dropping-particle"] + " " + nameobj["family"]; - } + /* + */ //CSL.debug("INS"); set_keys(this.state, "" + item_id, nameobj); diff --git a/citeproc_commonjs.js b/citeproc_commonjs.js index 375170c65..42f0b5010 100644 --- a/citeproc_commonjs.js +++ b/citeproc_commonjs.js @@ -23622,6 +23622,11 @@ CSL.Registry.NameReg = function (state) { set_keys = function (state, itemid, nameobj) { pkey = strip_periods(nameobj.family); + + if (state.opt["demote-non-dropping-particle"] === "never" && nameobj["non-dropping-particle"] && nameobj["family"]) { + pkey = `${pkey} ${nameobj["non-dropping-particle"]}`; + } + skey = strip_periods(nameobj.given); // Drop lowercase suffixes (such as et al.) from given name field // for disambiguation purposes. @@ -23833,11 +23838,10 @@ CSL.Registry.NameReg = function (state) { && pos !== 0) { return; } - + // A hack. Safe if the name object is used only here, for disambiguation purposes. - if (state.opt["demote-non-dropping-particle"] === "never" && nameobj["non-dropping-particle"] && nameobj["family"]) { - nameobj["family"] = nameobj["non-dropping-particle"] + " " + nameobj["family"]; - } + /* + */ //CSL.debug("INS"); set_keys(this.state, "" + item_id, nameobj); diff --git a/package.json b/package.json index 231ea94ab..e39fbd7a9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "citeproc", - "version": "2.4.62", - "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.4.62", + "version": "2.4.63", + "description": "The citeproc-js citation formatting module, in CommonJS format. This version is based on citeproc-js 1.4.63", "main": "citeproc_commonjs.js", "repository": { "type": "git",