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

Upgrade citeproc-js to version 1.0.309

Browse source
This commit is contained in:
Frank 2012-03-25 07:27:57 +08:00 committed by Simon Kornblith
parent c9e6fc3f1b
commit b4fc74dc93
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1710,9 +1710,10 @@ CSL.expandMacro = function (macro_key_token) {
this.build.macro_stack.push(mkey);
}
var hasDate = false;
var macroid = false;
macro_nodes = this.sys.xml.getNodesByName(this.cslXml, 'macro', mkey);
var macroid = this.sys.xml.getAttributeValue(macro_nodes,'cslid');
if (macro_nodes.length) {
macroid = this.sys.xml.getAttributeValue(macro_nodes[0],'cslid');
hasDate = this.sys.xml.getAttributeValue(macro_nodes[0], "macro-has-date");
}
if (hasDate) {
@ -2158,7 +2159,7 @@ CSL.DateParser = function () {
};
CSL.Engine = function (sys, style, lang, forceLang) {
var attrs, langspec, localexml, locale;
this.processor_version = "1.0.308";
this.processor_version = "1.0.309";
this.csl_version = "1.0";
this.sys = sys;
this.sys.xml = new CSL.System.Xml.Parsing();
@ -6727,7 +6728,6 @@ CSL.NameOutput.prototype.getStaticOrder = function (name, refresh) {
}
CSL.NameOutput.prototype._splitInstitution = function (value, v, i) {
var ret = {};
value.literal = this.state.transform.quashCheck(value.literal);
var splitInstitution = value.literal.replace(/\s*\|\s*/g, "|");
splitInstitution = splitInstitution.split("|");
if (this.institution.strings.form === "short" && this.state.sys.getAbbreviation) {
@ -6737,6 +6737,7 @@ CSL.NameOutput.prototype._splitInstitution = function (value, v, i) {
jurisdiction = this.state.transform.loadAbbreviation(jurisdiction, "institution-entire", str);
if (this.state.transform.abbrevs[jurisdiction]["institution-entire"][str]) {
var splitLst = this.state.transform.abbrevs[jurisdiction]["institution-entire"][str];
splitLst = this.state.transform.quashCheck(splitLst);
var splitSplitLst = splitLst.split(/>>[0-9]{4}>>/);
var m = splitLst.match(/>>([0-9]{4})>>/);
splitLst = splitSplitLst.pop();