Upgrade citeproc-js to version 1.0.303
This commit is contained in:
Frank
Simon Kornblith
parent
92a7ebee4c
commit
6de53ad37c
1 changed files with 67 additions and 55 deletions
|
|
@ -1138,7 +1138,7 @@ CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
|
||||||
ret = ret.concat(addtoret);
|
ret = ret.concat(addtoret);
|
||||||
}
|
}
|
||||||
if (blobjr.strings.first_blob) {
|
if (blobjr.strings.first_blob) {
|
||||||
state.registry.registry[state.tmp.count_offset_characters].offset = state.tmp.offset_characters;
|
state.registry.registry[blobjr.strings.first_blob].offset = state.tmp.offset_characters;
|
||||||
state.tmp.count_offset_characters = false;
|
state.tmp.count_offset_characters = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2156,7 +2156,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.302";
|
this.processor_version = "1.0.303";
|
||||||
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();
|
||||||
|
|
@ -7302,45 +7302,53 @@ CSL.Node.number = {
|
||||||
varname = this.variables[0];
|
varname = this.variables[0];
|
||||||
state.parallel.StartVariable(this.variables[0]);
|
state.parallel.StartVariable(this.variables[0]);
|
||||||
state.parallel.AppendToVariable(Item[this.variables[0]]);
|
state.parallel.AppendToVariable(Item[this.variables[0]]);
|
||||||
var node = this;
|
if (this.text_case_normal) {
|
||||||
if (!state.tmp.shadow_numbers[varname]
|
var value = Item[this.variables[0]];
|
||||||
|| (state.tmp.shadow_numbers[varname].values.length
|
if (value) {
|
||||||
&& state.tmp.shadow_numbers[varname].values[0][2] === false)) {
|
value = value.replace("\\", "");
|
||||||
if (varname === "locator") {
|
state.output.append(value, this)
|
||||||
state.processNumber(node, item, varname);
|
|
||||||
} else {
|
|
||||||
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 = ""
|
|
||||||
if (state.opt["page-range-format"]
|
|
||||||
&& !this.strings.prefix && !this.strings.suffix
|
|
||||||
&& !this.strings.form) {
|
|
||||||
for (var i = 0, ilen = values.length; i < ilen; i += 1) {
|
|
||||||
newstr += values[i][1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (newstr && !newstr.match(/^[-.\u20130-9]+$/)) {
|
|
||||||
state.output.append(newstr, this);
|
|
||||||
} else {
|
} else {
|
||||||
if (values.length) {
|
var node = this;
|
||||||
state.output.openLevel("empty");
|
if (!state.tmp.shadow_numbers[varname]
|
||||||
for (var i = 0, ilen = values.length; i < ilen; i += 1) {
|
|| (state.tmp.shadow_numbers[varname].values.length
|
||||||
var blob = new CSL[values[i][0]](values[i][1], values[i][2], Item.id);
|
&& state.tmp.shadow_numbers[varname].values[0][2] === false)) {
|
||||||
if (i > 0) {
|
if (varname === "locator") {
|
||||||
blob.strings.prefix = blob.strings.prefix.replace(/^\s*/, "");
|
state.processNumber(node, item, varname);
|
||||||
}
|
} else {
|
||||||
if (i < values.length - 1) {
|
state.processNumber(node, Item, varname);
|
||||||
blob.strings.suffix = blob.strings.suffix.replace(/\s*$/, "");
|
}
|
||||||
}
|
}
|
||||||
state.output.append(blob, "literal", false, false, true);
|
if (varname === "locator") {
|
||||||
|
state.tmp.done_vars.push("locator");
|
||||||
|
}
|
||||||
|
var values = state.tmp.shadow_numbers[varname].values;
|
||||||
|
var blob;
|
||||||
|
var newstr = ""
|
||||||
|
if (state.opt["page-range-format"]
|
||||||
|
&& !this.strings.prefix && !this.strings.suffix
|
||||||
|
&& !this.strings.form) {
|
||||||
|
for (var i = 0, ilen = values.length; i < ilen; i += 1) {
|
||||||
|
newstr += values[i][1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (newstr && !newstr.match(/^[-.\u20130-9]+$/)) {
|
||||||
|
state.output.append(newstr, this);
|
||||||
|
} else {
|
||||||
|
if (values.length) {
|
||||||
|
state.output.openLevel("empty");
|
||||||
|
for (var i = 0, ilen = values.length; i < ilen; i += 1) {
|
||||||
|
var blob = new CSL[values[i][0]](values[i][1], values[i][2], Item.id);
|
||||||
|
if (i > 0) {
|
||||||
|
blob.strings.prefix = blob.strings.prefix.replace(/^\s*/, "");
|
||||||
|
}
|
||||||
|
if (i < values.length - 1) {
|
||||||
|
blob.strings.suffix = blob.strings.suffix.replace(/\s*$/, "");
|
||||||
|
}
|
||||||
|
state.output.append(blob, "literal", false, false, true);
|
||||||
|
}
|
||||||
|
state.output.closeLevel("empty");
|
||||||
}
|
}
|
||||||
state.output.closeLevel("empty");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
state.parallel.CloseVariable("number");
|
state.parallel.CloseVariable("number");
|
||||||
|
|
@ -8430,27 +8438,31 @@ CSL.Attributes["@page-range-format"] = function (state, arg) {
|
||||||
};
|
};
|
||||||
CSL.Attributes["@text-case"] = function (state, arg) {
|
CSL.Attributes["@text-case"] = function (state, arg) {
|
||||||
var func = function (state, Item) {
|
var func = function (state, Item) {
|
||||||
this.strings["text-case"] = arg;
|
if (arg === "normal") {
|
||||||
if (arg === "title") {
|
this.text_case_normal = true;
|
||||||
var m = false;
|
} else {
|
||||||
var default_locale = state.opt["default-locale"][0].slice(0, 2);
|
this.strings["text-case"] = arg;
|
||||||
if (Item.jurisdiction) {
|
if (arg === "title") {
|
||||||
this.strings["text-case"] = "passthrough";
|
var m = false;
|
||||||
} else if (Item.language) {
|
var default_locale = state.opt["default-locale"][0].slice(0, 2);
|
||||||
m = Item.language.match(/^\s*([A-Za-z]{2})(?:$|-| )/);
|
if (Item.jurisdiction) {
|
||||||
if (!m) {
|
|
||||||
this.strings["text-case"] = "passthrough";
|
this.strings["text-case"] = "passthrough";
|
||||||
} else if (m[1].toLowerCase() !== "en") {
|
} else if (Item.language) {
|
||||||
this.strings["text-case"] = "passthrough";
|
m = Item.language.match(/^\s*([A-Za-z]{2})(?:$|-| )/);
|
||||||
for (var i = 0, ilen = state.opt.english_locale_escapes.length; i < ilen; i += 1) {
|
if (!m) {
|
||||||
var escaper = state.opt.english_locale_escapes[i];
|
this.strings["text-case"] = "passthrough";
|
||||||
if (m[1].slice(0, escaper.length).toLowerCase() === escaper) {
|
} else if (m[1].toLowerCase() !== "en") {
|
||||||
this.strings["text-case"] = arg;
|
this.strings["text-case"] = "passthrough";
|
||||||
|
for (var i = 0, ilen = state.opt.english_locale_escapes.length; i < ilen; i += 1) {
|
||||||
|
var escaper = state.opt.english_locale_escapes[i];
|
||||||
|
if (m[1].slice(0, escaper.length).toLowerCase() === escaper) {
|
||||||
|
this.strings["text-case"] = arg;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (default_locale !== "en") {
|
||||||
|
this.strings["text-case"] = "passthrough";
|
||||||
}
|
}
|
||||||
} else if (default_locale !== "en") {
|
|
||||||
this.strings["text-case"] = "passthrough";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue