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

Revert "Update to citeproc-js 1.0.258"

Browse source 
This reverts commit 5af1ef045c.
This commit is contained in:
Simon Kornblith 2012-01-12 18:53:17 -05:00
parent 9e1bd4a858
commit f873948740
1 changed files with 25 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,12 +57,6 @@ if (!Array.indexOf) {
}; };
} }
var CSL = { var CSL = {
NestedBraces: [
["(", "["],
[")", "]"]
],
checkNestedBraceOpen: new RegExp(".*\\("),
checkNestedBraceClose: new RegExp(".*\\)"),
LangPrefsMap: { LangPrefsMap: {
"title":"titles", "title":"titles",
"title-short":"titles", "title-short":"titles",
@ -111,8 +105,9 @@ var CSL = {
FINISH: 1, FINISH: 1,
POSITION_FIRST: 0, POSITION_FIRST: 0,
POSITION_SUBSEQUENT: 1, POSITION_SUBSEQUENT: 1,
POSITION_IBID: 2, POSITION_SUBSEQUENT_PARALLEL: 2,
POSITION_IBID_WITH_LOCATOR: 3, POSITION_IBID: 3,
POSITION_IBID_WITH_LOCATOR: 4,
MARK_TRAILING_NAMES: true, MARK_TRAILING_NAMES: true,
POSITION_TEST_VARS: ["position", "first-reference-note-number", "near-note"], POSITION_TEST_VARS: ["position", "first-reference-note-number", "near-note"],
AREAS: ["citation", "citation_sort", "bibliography", "bibliography_sort"], AREAS: ["citation", "citation_sort", "bibliography", "bibliography_sort"],
@ -812,12 +807,6 @@ CSL.Output.Queue.prototype.openLevel = function (token, ephemeral) {
} }
blob = new CSL.Blob(undefined, this.formats.value()[token], token); blob = new CSL.Blob(undefined, this.formats.value()[token], token);
} }
if (this.nestedBraces) {
blob.strings.prefix = blob.strings.prefix.replace(this.nestedBraces[0][0], this.nestedBraces[0][1]);
blob.strings.prefix = blob.strings.prefix.replace(this.nestedBraces[1][0], this.nestedBraces[1][1]);
blob.strings.suffix = blob.strings.suffix.replace(this.nestedBraces[0][0], this.nestedBraces[0][1]);
blob.strings.suffix = blob.strings.suffix.replace(this.nestedBraces[1][0], this.nestedBraces[1][1]);
}
curr = this.current.value(); curr = this.current.value();
curr.push(blob); curr.push(blob);
this.current.push(blob); this.current.push(blob);
@ -876,12 +865,6 @@ CSL.Output.Queue.prototype.append = function (str, tokname, notSerious, ignorePr
} }
} }
blob = new CSL.Blob(str, token); blob = new CSL.Blob(str, token);
if (this.nestedBraces) {
blob.strings.prefix = blob.strings.prefix.replace(this.nestedBraces[0][0], this.nestedBraces[0][1]);
blob.strings.prefix = blob.strings.prefix.replace(this.nestedBraces[1][0], this.nestedBraces[1][1]);
blob.strings.suffix = blob.strings.suffix.replace(this.nestedBraces[0][0], this.nestedBraces[0][1]);
blob.strings.suffix = blob.strings.suffix.replace(this.nestedBraces[1][0], this.nestedBraces[1][1]);
}
curr = this.current.value(); curr = this.current.value();
if ("undefined" === typeof curr && this.current.mystack.length === 0) { if ("undefined" === typeof curr && this.current.mystack.length === 0) {
this.current.mystack.push([]); this.current.mystack.push([]);
@ -914,7 +897,7 @@ CSL.Output.Queue.prototype.append = function (str, tokname, notSerious, ignorePr
}; };
CSL.Output.Queue.prototype.string = function (state, myblobs, blob) { CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
var i, ilen, j, jlen, b; var i, ilen, j, jlen, b;
var txt_esc = CSL.getSafeEscape(this.state); var txt_esc = CSL.getSafeEscape(this.state.opt.mode, this.state.tmp.area);
var blobs = myblobs.slice(); var blobs = myblobs.slice();
var ret = []; var ret = [];
if (blobs.length === 0) { if (blobs.length === 0) {
@ -953,7 +936,7 @@ CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
} }
} }
if (b && b.length) { if (b && b.length) {
b = txt_esc(blobjr.strings.prefix, state.tmp.nestedBraces) + b + txt_esc(blobjr.strings.suffix, state.tmp.nestedBraces); b = txt_esc(blobjr.strings.prefix) + b + txt_esc(blobjr.strings.suffix);
ret.push(b); ret.push(b);
if (state.tmp.count_offset_characters) { if (state.tmp.count_offset_characters) {
state.tmp.offset_characters += (blen + blobjr.strings.suffix.length + blobjr.strings.prefix.length); state.tmp.offset_characters += (blen + blobjr.strings.suffix.length + blobjr.strings.prefix.length);
@ -1003,7 +986,7 @@ CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
use_suffix = blob.strings.suffix; use_suffix = blob.strings.suffix;
if (b && b.length) { if (b && b.length) {
use_prefix = blob.strings.prefix; use_prefix = blob.strings.prefix;
b = txt_esc(use_prefix, state.tmp.nestedBraces) + b + txt_esc(use_suffix, state.tmp.nestedBraces); b = txt_esc(use_prefix) + b + txt_esc(use_suffix);
if (state.tmp.count_offset_characters) { if (state.tmp.count_offset_characters) {
state.tmp.offset_characters += (use_prefix.length + use_suffix.length); state.tmp.offset_characters += (use_prefix.length + use_suffix.length);
} }
@ -1056,7 +1039,7 @@ CSL.Output.Queue.prototype.clearlevel = function () {
}; };
CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, has_more) { CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, has_more) {
var state, ret, ret_last_char, use_delim, i, blob, pos, len, ppos, llen, pppos, lllen, res, str, params, txt_esc; var state, ret, ret_last_char, use_delim, i, blob, pos, len, ppos, llen, pppos, lllen, res, str, params, txt_esc;
txt_esc = CSL.getSafeEscape(this.state); txt_esc = CSL.getSafeEscape(this.state.opt.mode, this.state.tmp.area);
if (!delim) { if (!delim) {
delim = ""; delim = "";
} }
@ -1980,7 +1963,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.258"; this.processor_version = "1.0.255";
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();
@ -2536,7 +2519,6 @@ CSL.Engine.Opt = function () {
this.development_extensions.locator_label_parse = true; this.development_extensions.locator_label_parse = true;
this.development_extensions.raw_date_parsing = true; this.development_extensions.raw_date_parsing = true;
this.development_extensions.clean_up_csl_flaws = true; this.development_extensions.clean_up_csl_flaws = true;
this.development_extensions.flip_parentheses_to_braces = true;
this.gender = {}; this.gender = {};
this['cite-lang-prefs'] = { this['cite-lang-prefs'] = {
persons:['orig'], persons:['orig'],
@ -3259,7 +3241,6 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
} }
var citations; var citations;
if (this.opt.update_mode === CSL.POSITION) { if (this.opt.update_mode === CSL.POSITION) {
var citationsInNote = {};
for (i = 0; i < 2; i += 1) { for (i = 0; i < 2; i += 1) {
citations = [textCitations, noteCitations][i]; citations = [textCitations, noteCitations][i];
var first_ref = {}; var first_ref = {};
@ -3269,11 +3250,6 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
if (!onecitation.properties.noteIndex) { if (!onecitation.properties.noteIndex) {
onecitation.properties.noteIndex = 0; onecitation.properties.noteIndex = 0;
} }
if (!citationsInNote[onecitation.properties.noteIndex]) {
citationsInNote[onecitation.properties.noteIndex] = 1;
} else {
citationsInNote[onecitation.properties.noteIndex] += 1;
}
for (k = 0, klen = citations[j].sortedItems.length; k < klen; k += 1) { for (k = 0, klen = citations[j].sortedItems.length; k < klen; k += 1) {
item = citations[j].sortedItems[k]; item = citations[j].sortedItems[k];
if (flag === CSL.PREVIEW) { if (flag === CSL.PREVIEW) {
@ -3304,9 +3280,7 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
var items = citations[(j - 1)].sortedItems; var items = citations[(j - 1)].sortedItems;
var useme = false; var useme = false;
if ((citations[(j - 1)].sortedItems[0][1].id == item[1].id && citations[j - 1].properties.noteIndex >= (citations[j].properties.noteIndex - 1)) || citations[(j - 1)].sortedItems[0][1].id == this.registry.registry[item[1].id].parallel) { if ((citations[(j - 1)].sortedItems[0][1].id == item[1].id && citations[j - 1].properties.noteIndex >= (citations[j].properties.noteIndex - 1)) || citations[(j - 1)].sortedItems[0][1].id == this.registry.registry[item[1].id].parallel) {
if (citationsInNote[citations[j - 1].properties.noteIndex] === 1) { useme = true;
useme = true;
}
} }
for (n = 0, nlen = items.slice(1).length; n < nlen; n += 1) { for (n = 0, nlen = items.slice(1).length; n < nlen; n += 1) {
var itmp = items.slice(1)[n]; var itmp = items.slice(1)[n];
@ -3371,7 +3345,11 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
} }
} }
if (suprame) { if (suprame) {
item[1].position = CSL.POSITION_SUBSEQUENT; if (this.registry.registry[item[1].id].parallel) {
item[1].position = CSL.POSITION_SUBSEQUENT_PARALLEL;
} else {
item[1].position = CSL.POSITION_SUBSEQUENT;
}
if (first_ref[item[1].id] != onecitation.properties.noteIndex) { if (first_ref[item[1].id] != onecitation.properties.noteIndex) {
item[1]["first-reference-note-number"] = first_ref[item[1].id]; item[1]["first-reference-note-number"] = first_ref[item[1].id];
} }
@ -3549,8 +3527,7 @@ CSL.getSpliceDelimiter = function (last_collapsed, pos) {
CSL.getCitationCluster = function (inputList, citationID) { CSL.getCitationCluster = function (inputList, citationID) {
var result, objects, myparams, len, pos, item, last_collapsed, params, empties, composite, compie, myblobs, Item, llen, ppos, obj, preceding_item, txt_esc, error_object; var result, objects, myparams, len, pos, item, last_collapsed, params, empties, composite, compie, myblobs, Item, llen, ppos, obj, preceding_item, txt_esc, error_object;
this.tmp.last_primary_names_string = false; this.tmp.last_primary_names_string = false;
this.tmp.nestedBraces = false; txt_esc = CSL.Output.Formats[this.opt.mode].text_escape;
txt_esc = CSL.getSafeEscape(this);
this.tmp.area = "citation"; this.tmp.area = "citation";
result = ""; result = "";
objects = []; objects = [];
@ -3563,50 +3540,6 @@ CSL.getCitationCluster = function (inputList, citationID) {
this.registry.citationreg.citationById[citationID].properties.backref_index = false; this.registry.citationreg.citationById[citationID].properties.backref_index = false;
this.registry.citationreg.citationById[citationID].properties.backref_citation = false; this.registry.citationreg.citationById[citationID].properties.backref_citation = false;
} }
if (this.opt.xclass === "note") {
var parasets = [];
var lastTitle = false;
var lastPosition = false;
var lastID = false;
for (var i=0, ilen = inputList.length; i < ilen; i += 1) {
var type = inputList[i][0].type;
var title = inputList[i][0].title;
var position = inputList[i][1].position;
var id = inputList[i][0].id;
if (title && type === "legal_case" && id !== lastID && position) {
if (title !== lastTitle || parasets.length === 0) {
var lst = [];
parasets.push(lst);
}
lst.push(inputList[i][1]);
}
lastTitle = title;
lastPosition = position;
lastID = id;
}
for (var i=0, ilen=parasets.length; i < ilen; i += 1) {
var lst = parasets[i];
if (lst.length < 2) {
continue;
}
var locatorInLastPosition = lst.slice(-1)[0].locator;
if (locatorInLastPosition) {
for (var j=0, jlen=lst.length - 1; j < jlen; j += 1) {
if (lst[j].locator) {
locatorInLastPosition = false;
}
}
}
if (locatorInLastPosition) {
lst[0].locator = locatorInLastPosition;
delete lst.slice(-1)[0].locator;
lst[0].label = lst.slice(-1)[0].label;
if (lst.slice(-1)[0].label) {
delete lst.slice(-1)[0].label;
}
}
}
}
myparams = []; myparams = [];
len = inputList.length; len = inputList.length;
for (pos = 0; pos < len; pos += 1) { for (pos = 0; pos < len; pos += 1) {
@ -3756,7 +3689,6 @@ CSL.getCitationCluster = function (inputList, citationID) {
&& this.tmp.last_chr === use_layout_suffix.slice(0, 1)) { && this.tmp.last_chr === use_layout_suffix.slice(0, 1)) {
use_layout_suffix = use_layout_suffix.slice(1); use_layout_suffix = use_layout_suffix.slice(1);
} }
this.output.nestedBraces = false;
result = txt_esc(this.citation.opt.layout_prefix) + result + txt_esc(use_layout_suffix); result = txt_esc(this.citation.opt.layout_prefix) + result + txt_esc(use_layout_suffix);
if (!this.tmp.suppress_decorations) { if (!this.tmp.suppress_decorations) {
len = this.citation.opt.layout_decorations.length; len = this.citation.opt.layout_decorations.length;
@ -3832,15 +3764,6 @@ CSL.citeStart = function (Item, item) {
} }
this.tmp.shadow_numbers = {}; this.tmp.shadow_numbers = {};
this.tmp.first_name_string = false; this.tmp.first_name_string = false;
if (this.opt.development_extensions.flip_parentheses_to_braces && item && item.prefix) {
var openBrace = CSL.checkNestedBraceOpen.exec(item.prefix);
var closeBrace = CSL.checkNestedBraceClose.exec(item.prefix);
if (openBrace) {
if (!closeBrace || closeBrace[0].length < openBrace[0].length) {
this.output.nestedBraces = CSL.NestedBraces;
}
}
}
}; };
CSL.citeEnd = function (Item, item) { CSL.citeEnd = function (Item, item) {
if (this.tmp.disambig_restore) { if (this.tmp.disambig_restore) {
@ -3854,15 +3777,6 @@ CSL.citeEnd = function (Item, item) {
this.tmp.cut_var = false; this.tmp.cut_var = false;
this.tmp.disambig_request = false; this.tmp.disambig_request = false;
this.tmp.cite_locales.push(this.tmp.last_cite_locale); this.tmp.cite_locales.push(this.tmp.last_cite_locale);
if (this.opt.development_extensions.flip_parentheses_to_braces && item && item.suffix) {
var openBrace = CSL.checkNestedBraceOpen.exec(item.suffix);
var closeBrace = CSL.checkNestedBraceClose.exec(item.suffix);
if (closeBrace) {
if (!openBrace || openBrace[0].length < closeBrace[0].length) {
this.output.nestedBraces = false;
}
}
}
}; };
CSL.Node = {}; CSL.Node = {};
CSL.Node.bibliography = { CSL.Node.bibliography = {
@ -7927,6 +7841,8 @@ CSL.Attributes["@position"] = function (state, arg) {
for (var i = 0, ilen = lst.length; i < ilen; i += 1) { for (var i = 0, ilen = lst.length; i < ilen; i += 1) {
if (lst[i] === "first") { if (lst[i] === "first") {
tryposition = CSL.POSITION_FIRST; tryposition = CSL.POSITION_FIRST;
} else if (lst[i] === "subsequent-parallel") {
tryposition = CSL.POSITION_SUBSEQUENT_PARALLEL;
} else if (lst[i] === "subsequent") { } else if (lst[i] === "subsequent") {
tryposition = CSL.POSITION_SUBSEQUENT; tryposition = CSL.POSITION_SUBSEQUENT;
} else if (lst[i] === "ibid") { } else if (lst[i] === "ibid") {
@ -9007,7 +8923,7 @@ CSL.Blob = function (str, token, levelname) {
var len, pos, key; var len, pos, key;
this.levelname = levelname; this.levelname = levelname;
if (token) { if (token) {
this.strings = {"prefix":"","suffix":""}; this.strings = {};
for (key in token.strings) { for (key in token.strings) {
if (token.strings.hasOwnProperty(key)) { if (token.strings.hasOwnProperty(key)) {
this.strings[key] = token.strings[key]; this.strings[key] = token.strings[key];
@ -9593,7 +9509,7 @@ CSL.Util.substituteEnd = function (state, target) {
author_substitute = new CSL.Token("text", CSL.SINGLETON); author_substitute = new CSL.Token("text", CSL.SINGLETON);
func = function (state, Item) { func = function (state, Item) {
var i, ilen; var i, ilen;
var text_esc = CSL.getSafeEscape(state); var text_esc = CSL.getSafeEscape(state.opt.mode, state.tmp.area);
var printing = !state.tmp.suppress_decorations; var printing = !state.tmp.suppress_decorations;
if (printing && state.tmp.area === "bibliography") { if (printing && state.tmp.area === "bibliography") {
if (!state.tmp.rendered_name) { if (!state.tmp.rendered_name) {
@ -10087,7 +10003,7 @@ CSL.Util.FlipFlopper = function (state) {
this.okReverseHash = hashes[4]; this.okReverseHash = hashes[4];
}; };
CSL.Util.FlipFlopper.prototype.init = function (str, blob) { CSL.Util.FlipFlopper.prototype.init = function (str, blob) {
this.txt_esc = CSL.getSafeEscape(this.state); this.txt_esc = CSL.getSafeEscape(this.state.opt.mode, this.state.tmp.area);
str = this._normalizeString(str); str = this._normalizeString(str);
if (!blob) { if (!blob) {
this.strs = this.getSplitStrings(str); this.strs = this.getSplitStrings(str);
@ -10314,9 +10230,9 @@ CSL.Util.FlipFlopper.prototype.addFlipFlop = function (blob, fun) {
return newdecor; return newdecor;
}; };
CSL.Output.Formatters = {}; CSL.Output.Formatters = {};
CSL.getSafeEscape = function(state) { CSL.getSafeEscape = function(outputModeOpt, outputArea) {
if (["bibliography", "citation"].indexOf(state.tmp.area) > -1) { if (["bibliography", "citation"].indexOf(outputArea) > -1) {
return CSL.Output.Formats[state.opt.mode].text_escape; return CSL.Output.Formats[outputModeOpt].text_escape;
} else { } else {
return function (txt) { return txt; }; return function (txt) { return txt; };
} }
@ -10388,7 +10304,7 @@ CSL.Output.Formatters.title = function (state, string) {
lowerCaseVariant = words[pos].toLowerCase(); lowerCaseVariant = words[pos].toLowerCase();
var totallyskip = false; var totallyskip = false;
if (!isAllUpperCase || (words.length === 1 && words[pos].length < 4)) { if (!isAllUpperCase || (words.length === 1 && words[pos].length < 4)) {
if (words[pos] !== lowerCaseVariant) { if (words[pos] === upperCaseVariant) {
totallyskip = true; totallyskip = true;
} }
} }
@ -11680,3 +11596,4 @@ CSL.Node.generate = {
} }
} }
}; };