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

update to citeproc-js 1.0.140

Browse source
This commit is contained in:
Simon Kornblith 2011-04-01 16:29:46 +00:00
parent 4825e5b3ed
commit 6f32fa2067
1 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ var CSL = {
CITE_FIELDS: ["first-reference-note-number", "locator"], CITE_FIELDS: ["first-reference-note-number", "locator"],
MINIMAL_NAME_FIELDS: ["literal", "family"], MINIMAL_NAME_FIELDS: ["literal", "family"],
SWAPPING_PUNCTUATION: [".", "!", "?", ":",",",";"], SWAPPING_PUNCTUATION: [".", "!", "?", ":",",",";"],
TERMINAL_PUNCTUATION: [".", "!", "?", ":", " "], TERMINAL_PUNCTUATION: [":", ".", "!", "?", " "],
SPLICE_PUNCTUATION: [".", "!", "?", ":", ";", ","], SPLICE_PUNCTUATION: [".", "!", "?", ":", ";", ","],
NONE: 0, NONE: 0,
NUMERIC: 1, NUMERIC: 1,
@ -436,21 +436,23 @@ CSL_E4X.prototype.insertChildNodeAfter = function (parent,node,pos,datexml) {
CSL_E4X.prototype.addInstitutionNodes = function(myxml) { CSL_E4X.prototype.addInstitutionNodes = function(myxml) {
var institution_long, institution_short, name_part, children, node, xml; var institution_long, institution_short, name_part, children, node, xml;
default xml namespace = "http://purl.org/net/xbiblio/csl"; with({}); default xml namespace = "http://purl.org/net/xbiblio/csl"; with({});
institution_long = <institution
institution-parts="long"
delimiter=", "
substitute-use-first="1"
use-last="1"/>
institution_part = <institution-part name="long"/>;
for each (node in myxml..names) { for each (node in myxml..names) {
if ("xml" == typeof node && node.elements("name").length() > 0) { if ("xml" == typeof node && node.elements("name").length() > 0) {
if (!node.institution.toString()) { if (!node.institution.toString()) {
institution_long = <institution
institution-parts="long"
substitute-use-first="1"
use-last="1"/>
institution_part = <institution-part name="long"/>;
node.name += institution_long; node.name += institution_long;
for each (var attr in CSL.INSTITUTION_KEYS) { for each (var attr in CSL.INSTITUTION_KEYS) {
if (node.name.@[attr].toString()) { if (node.name.@[attr].toString()) {
node.institution.@[attr] = node.name.@[attr].toString(); node.institution.@[attr] = node.name.@[attr].toString();
} }
} }
if (node.name.@and.toString()) {
institution_long.@and = "text";
}
node.institution[0].appendChild(institution_part) node.institution[0].appendChild(institution_part)
for each (var namepartnode in node.name['name-part']) { for each (var namepartnode in node.name['name-part']) {
if (namepartnode.@name.toString() === 'family') { if (namepartnode.@name.toString() === 'family') {
@ -951,7 +953,7 @@ CSL.Output.Queue.adjustPunctuation = function (state, myblobs, stk, finish) {
if (suffix) { if (suffix) {
if (blob && if (blob &&
TERMS.indexOf(myblobs.slice(-1)) > -1 && TERMS.indexOf(myblobs.slice(-1)) > -1 &&
TERMS.indexOf(suffix) > -1 && TERMS.slice(1).indexOf(suffix) > -1 &&
blob.strings.suffix !== " ") { blob.strings.suffix !== " ") {
blob.strings.suffix = blob.strings.suffix.slice(1); blob.strings.suffix = blob.strings.suffix.slice(1);
} }
@ -1049,7 +1051,7 @@ CSL.Output.Queue.adjustPunctuation = function (state, myblobs, stk, finish) {
if (i === (myblobs.length - 1)) { if (i === (myblobs.length - 1)) {
if (suffix) { if (suffix) {
if (doblob.strings.suffix && if (doblob.strings.suffix &&
(TERMS.indexOf(suffix) > -1 && (TERMS.slice(1).indexOf(suffix) > -1 &&
TERMS.indexOf(doblob.strings.suffix.slice(-1)) > -1)) { TERMS.indexOf(doblob.strings.suffix.slice(-1)) > -1)) {
blob.strings.suffix = blob.strings.suffix.slice(1); blob.strings.suffix = blob.strings.suffix.slice(1);
} }
@ -1777,7 +1779,7 @@ CSL.DateParser = function (txt) {
}; };
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.138"; this.processor_version = "1.0.140";
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();
@ -3474,7 +3476,9 @@ CSL.Node.date = {
state.tmp.donesies = []; state.tmp.donesies = [];
state.tmp.dateparts = []; state.tmp.dateparts = [];
dp = []; dp = [];
if (this.variables.length) { if (this.variables.length
&& !(state.tmp.just_looking
&& this.variables[0] !== "issued")) {
state.parallel.StartVariable(this.variables[0]); state.parallel.StartVariable(this.variables[0]);
date_obj = Item[this.variables[0]]; date_obj = Item[this.variables[0]];
if ("undefined" === typeof date_obj) { if ("undefined" === typeof date_obj) {
@ -3563,6 +3567,9 @@ CSL.Node["date-part"] = {
} }
state.build.date_parts.push(this.strings.name); state.build.date_parts.push(this.strings.name);
func = function (state, Item) { func = function (state, Item) {
if (!state.tmp.date_object) {
return;
}
first_date = true; first_date = true;
value = ""; value = "";
value_end = ""; value_end = "";
@ -5555,6 +5562,10 @@ CSL.Attributes["@variable"] = function (state, arg) {
variable = "journalAbbreviation"; variable = "journalAbbreviation";
} }
} }
if (variable === "year-suffix") {
output = true;
break;
}
if (CSL.DATE_VARIABLES.indexOf(variable) > -1) { if (CSL.DATE_VARIABLES.indexOf(variable) > -1) {
if (Item[variable] && Item[variable].raw) { if (Item[variable] && Item[variable].raw) {
output = true; output = true;
@ -8311,6 +8322,15 @@ CSL.Output.Formatters.title = function (state, string) {
if (words[pos].length !== 0 && (words[pos].length !== 1 || !/\s+/.test(words[pos]))) { if (words[pos].length !== 0 && (words[pos].length !== 1 || !/\s+/.test(words[pos]))) {
upperCaseVariant = words[pos].toUpperCase(); upperCaseVariant = words[pos].toUpperCase();
lowerCaseVariant = words[pos].toLowerCase(); lowerCaseVariant = words[pos].toLowerCase();
var totallyskip = false;
if (!isUpperCase || (words.length === 1 && words[pos].length < 4)) {
for (var j = 0, jlen = lowerCaseVariant.length; j < jlen; j += 1) {
if (lowerCaseVariant[j] !== upperCaseVariant[j]
&& words[pos][j] === upperCaseVariant[j]) {
totallyskip = true;
}
}
}
if (isUpperCase || words[pos] === lowerCaseVariant) { if (isUpperCase || words[pos] === lowerCaseVariant) {
skip = false; skip = false;
len = CSL.SKIP_WORDS.length; len = CSL.SKIP_WORDS.length;
@ -8331,10 +8351,12 @@ CSL.Output.Formatters.title = function (state, string) {
} else { } else {
aftercolon = false; aftercolon = false;
} }
if (skip && notfirst && notlast && (firstword || aftercolon)) { if (!totallyskip) {
words[pos] = lowerCaseVariant; if (skip && notfirst && notlast && (firstword || aftercolon)) {
} else { words[pos] = lowerCaseVariant;
words[pos] = upperCaseVariant.slice(0, 1) + lowerCaseVariant.substr(1); } else {
words[pos] = upperCaseVariant.slice(0, 1) + lowerCaseVariant.substr(1);
}
} }
} }
previousWordIndex = pos; previousWordIndex = pos;