From 6981df1eaf294eb6d0d7ca6bdab7e92732c0ab42 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Sat, 4 Jun 2011 00:47:02 +0000 Subject: [PATCH] update to citeproc-js 1.0.177 --- chrome/content/zotero/xpcom/citeproc.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index b51feccf1a..d60553e791 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -138,8 +138,6 @@ var CSL = { PREFIX_PUNCTUATION: /[.;:]\s*$/, SUFFIX_PUNCTUATION: /^\s*[.;:,\(\)]/, NUMBER_REGEXP: /(?:^\d+|\d+$)/, - QUOTED_REGEXP_START: /^"/, - QUOTED_REGEXP_END: /^"$/, NAME_INITIAL_REGEXP: /^([A-Z\u0080-\u017f\u0400-\u042f])([a-zA-Z\u0080-\u017f\u0400-\u052f]*|)/, ROMANESQUE_REGEXP: /[a-zA-Z\u0080-\u017f\u0400-\u052f\u0386-\u03fb\u1f00-\u1ffe]/, ROMANESQUE_NOT_REGEXP: /[^a-zA-Z\u0080-\u017f\u0400-\u052f\u0386-\u03fb\u1f00-\u1ffe]/g, @@ -1879,7 +1877,7 @@ CSL.DateParser = function () { }; CSL.Engine = function (sys, style, lang, forceLang) { var attrs, langspec, localexml, locale; - this.processor_version = "1.0.176"; + this.processor_version = "1.0.177"; this.csl_version = "1.0"; this.sys = sys; this.sys.xml = new CSL.System.Xml.Parsing(); @@ -6876,10 +6874,10 @@ CSL.Attributes["@is-numeric"] = function (state, arg) { not_numeric_type = CSL.NUMERIC_VARIABLES.indexOf(variable) === -1; val = Item[variable]; if (typeof val === "number") { - val = val.toString(); + val = "" + val; } if (not_numeric_type) { - if (Item[variable] && ("" + Item[variable]).match(/[0-9]$/)) { + if (val && val.match(/[0-9]$/)) { ret.push(true); } else { ret.push(false); @@ -6888,7 +6886,7 @@ CSL.Attributes["@is-numeric"] = function (state, arg) { ret.push(false); } else if (typeof val !== "string") { ret.push(false); - } else if (val.match(CSL.QUOTED_REGEXP_START) && val.match(CSL.QUOTED_REGEXP_END)) { + } else if (val.slice(0, 1) === '"' && val.slice(-1) === '"') { ret.push(false); } else if (val.match(CSL.NUMBER_REGEXP)) { ret.push(true);