From 01f3223cd3d1312f1b3d5397727093c761e11a9a Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Feb 2012 08:28:43 +0800 Subject: [PATCH] Upgrade citeproc-js to version 1.0.288 --- chrome/content/zotero/xpcom/citeproc.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index f18303030..a9e1761b2 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -2149,7 +2149,7 @@ CSL.DateParser = function () { }; CSL.Engine = function (sys, style, lang, forceLang) { var attrs, langspec, localexml, locale; - this.processor_version = "1.0.287"; + this.processor_version = "1.0.288"; this.csl_version = "1.0"; this.sys = sys; this.sys.xml = new CSL.System.Xml.Parsing(); @@ -2948,6 +2948,7 @@ CSL.Engine.prototype.restoreProcessorState = function (citations) { } else { this.registry = new CSL.Registry(this); this.tmp = new CSL.Engine.Tmp(); + this.disambiguate = new CSL.Disambiguation(this); } return ret; }; @@ -7284,6 +7285,9 @@ CSL.Node.number = { state.processNumber(node, Item, varname); } } + if (varname === "locator") { + state.tmp.done_vars.push("locator"); + } var values = state.tmp.shadow_numbers[varname].values; var blob; var newstr = "" @@ -10190,7 +10194,7 @@ CSL.Engine.prototype.processNumber = function (node, ItemObject, variable) { CSL.Util.PageRangeMangler = {}; CSL.Util.PageRangeMangler.getFunction = function (state) { var rangerex, pos, len, stringify, listify, expand, minimize, minimize_internal, chicago, lst, m, b, e, ret, begin, end, ret_func, ppos, llen; - var range_delimiter = state.getTerm("range-delimiter"); + var range_delimiter = state.getTerm("page-range-delimiter"); rangerex = /([a-zA-Z]*)([0-9]+)\s*-\s*([a-zA-Z]*)([0-9]+)/; stringify = function (lst) { len = lst.length; @@ -10200,7 +10204,7 @@ CSL.Util.PageRangeMangler.getFunction = function (state) { } } var ret = lst.join(""); - ret = ret.replace(/([0-9])\-/, "$1\u2013", "g").replace(/\-([0-9])/, "\u2013$1", "g") + ret = ret.replace(/([0-9])\-/, "$1"+state.getTerm("page-range-delimiter"), "g").replace(/\-([0-9])/, state.getTerm("page-range-delimiter")+"$1", "g") return ret; }; listify = function (str, hyphens) {