diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index ea92eeb2e..039a7a20a 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -253,7 +253,7 @@ var CSL = { "delimiter" ], PARALLEL_MATCH_VARS: ["container-title"], - PARALLEL_TYPES: ["bill","gazette","legislation","legal_case","treaty","article-magazine","article-journal"], + PARALLEL_TYPES: ["bill","gazette","regulation","legislation","legal_case","treaty","article-magazine","article-journal"], PARALLEL_COLLAPSING_MID_VARSET: ["volume", "issue", "container-title", "section", "collection-number"], LOOSE: 0, STRICT: 1, @@ -9882,7 +9882,7 @@ CSL.Transform = function (state) { } } } - if (!value && altvar && Item[altvar] && use_field) { + if (!value && Item.type !== 'legal_case' && altvar && Item[altvar] && use_field) { value = Item[altvar]; } if (!value) { @@ -13224,6 +13224,7 @@ CSL.Disambiguation.prototype.disExtraText = function () { if (this.modeindex === this.modes.length - 1) { var base = this.lists[this.listpos][0]; for (var i = 0, ilen = this.lists[this.listpos][1].length; i < ilen; i += 1) { + this.state.tmp.taintedItemIDs[this.lists[this.listpos][1][i].id] = true; this.state.registry.registerAmbigToken(this.akey, "" + this.lists[this.listpos][1][i].id, base); } this.lists[this.listpos] = [this.betterbase, []];