From 7f0c8f3a4d6ddaf165f643e046212fcc0c4fa23c Mon Sep 17 00:00:00 2001 From: Frank Bennett Date: Thu, 21 Jun 2012 19:11:22 +0900 Subject: [PATCH] Update citeproc-js to version 1.0.349 --- chrome/content/zotero/xpcom/citeproc.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index f4b611d0d..0abbf84d0 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -57,7 +57,7 @@ if (!Array.indexOf) { }; } var CSL = { - PROCESSOR_VERSION: "1.0.348", + PROCESSOR_VERSION: "1.0.349", STATUTE_SUBDIV_GROUPED_REGEX: /((?:^| )(?:art|ch|Ch|subch|p|pp|para|subpara|pt|r|sec|subsec|Sec|sch|tit)\.)/g, STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|ch|Ch|subch|p|pp|para|subpara|pt|r|sec|subsec|Sec|sch|tit)\.)/, STATUTE_SUBDIV_STRINGS: { @@ -6719,8 +6719,11 @@ CSL.NameOutput.prototype._isRomanesque = function (name) { if (!ret && name.given && name.given.match(CSL.STARTSWITH_ROMANESQUE_REGEXP)) { ret = 1; } - if (ret && name.multi && name.multi.main) { + if (ret == 2 && name.multi && name.multi.main) { var top_locale = name.multi.main.slice(0, 2); + if (!top_locale && this.Item.language) { + top_locale = this.Item.language.slice(0, 2); + } if (["ja", "zh"].indexOf(top_locale) > -1) { ret = 1; }