mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upgrade citeproc-js to version 1.0.323

Browse source
This commit is contained in:
Frank 2012-04-17 03:32:29 +00:00 • committed by Simon Kornblith
parent 4df9472bd3
commit 051cd3ad30
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chrome/content/zotero/xpcom/citeproc.js
View file

@ -2174,7 +2174,7 @@ CSL.DateParser = function () {
}; };
CSL.Engine = function (sys, style, lang, forceLang) { CSL.Engine = function (sys, style, lang, forceLang) {
var attrs, langspec, localexml, locale; var attrs, langspec, localexml, locale;
this.processor_version = "1.0.322"; this.processor_version = "1.0.323";
this.csl_version = "1.0"; this.csl_version = "1.0";
this.sys = sys; this.sys = sys;
this.sys.xml = new CSL.System.Xml.Parsing(); this.sys.xml = new CSL.System.Xml.Parsing();
@ -2614,16 +2614,19 @@ CSL.Engine.prototype.remapSectionVariable = function (inputList) {
&& ["bill","gazette","legislation"].indexOf(Item.type) > -1 && ["bill","gazette","legislation"].indexOf(Item.type) > -1
&& this.opt.development_extensions.static_statute_locator) { && this.opt.development_extensions.static_statute_locator) {
var value = "" + Item.section; var value = "" + Item.section;
var old_label = item.label; var later_label = item.label;
item.label = "section";
if (value) { if (value) {
var splt = value.split(/\s+/); var splt = value.split(/\s+/);
if (CSL.STATUTE_SUBDIV_STRINGS[splt[0]]) { if (CSL.STATUTE_SUBDIV_STRINGS[splt[0]]) {
item.label = CSL.STATUTE_SUBDIV_STRINGS[splt[0]]; item.label = CSL.STATUTE_SUBDIV_STRINGS[splt[0]];
} else { } else {
value = "sec. " + value; item.label = "section";
value = "s. " + value;
} }
} }
if (!later_label) {
later_label = item.label;
}
var m = value.match(CSL.STATUTE_SUBDIV_GROUPED_REGEX); var m = value.match(CSL.STATUTE_SUBDIV_GROUPED_REGEX);
item.section_label_count = m.length; item.section_label_count = m.length;
var locator = ""; var locator = "";
@ -2631,10 +2634,10 @@ CSL.Engine.prototype.remapSectionVariable = function (inputList) {
if (item.locator) { if (item.locator) {
locator = item.locator; locator = item.locator;
var firstword = item.locator.split(/\s/)[0]; var firstword = item.locator.split(/\s/)[0];
if (item.label === old_label && firstword && firstword.match(/^[0-9]/)) { if (item.label === later_label && firstword && firstword.match(/^[0-9]/)) {
labelstr = " " + CSL.STATUTE_SUBDIV_STRINGS_REVERSE[old_label]; labelstr = " " + CSL.STATUTE_SUBDIV_STRINGS_REVERSE[later_label];
} else if (item.label !== old_label && firstword && firstword.match(/^[0-9]/)) { } else if (item.label !== later_label && firstword && firstword.match(/^[0-9]/)) {
labelstr = " " + CSL.STATUTE_SUBDIV_STRINGS_REVERSE[old_label] + " "; labelstr = " " + CSL.STATUTE_SUBDIV_STRINGS_REVERSE[later_label] + " ";
} else if (CSL.STATUTE_SUBDIV_STRINGS[firstword]) { } else if (CSL.STATUTE_SUBDIV_STRINGS[firstword]) {
labelstr = " "; labelstr = " ";
} }