suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update citeproc-js to 1.1.167

Browse Source
This commit is contained in:
Dan Stillman 2017-05-19 04:51:20 -04:00
parent 74fe4b31f9
commit cf125435fb
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chrome/content/zotero/xpcom/citeproc.js
View File

@ -23,7 +23,7 @@
* <http://www.gnu.org/licenses/> respectively. * <http://www.gnu.org/licenses/> respectively.
*/ */
var CSL = { var CSL = {
PROCESSOR_VERSION: "1.1.165", PROCESSOR_VERSION: "1.1.167",
CONDITION_LEVEL_TOP: 1, CONDITION_LEVEL_TOP: 1,
CONDITION_LEVEL_BOTTOM: 2, CONDITION_LEVEL_BOTTOM: 2,
PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@ -3796,6 +3796,10 @@ CSL.Output.Queue.prototype.append = function (str, tokname, notSerious, ignorePr
this.state.parallel.AppendBlobPointer(curr); this.state.parallel.AppendBlobPointer(curr);
} }
if ("string" === typeof str) { if ("string" === typeof str) {
if ("string" === typeof blob.blobs && [':', '!', '?', '.', ',', ';'].indexOf(blob.blobs.slice(0, 1)) > -1) {
blob.strings.prefix = blob.strings.prefix + blob.blobs.slice(0, 1);
blob.blobs = blob.blobs.slice(1);
}
if (blob.strings["text-case"]) { if (blob.strings["text-case"]) {
blob.blobs = CSL.Output.Formatters[blob.strings["text-case"]](this.state, str); blob.blobs = CSL.Output.Formatters[blob.strings["text-case"]](this.state, str);
} }
@ -14689,7 +14693,7 @@ CSL.Util.FlipFlopper = function(state) {
} }
return false; return false;
} }
function _undoppelToQueue(blob, doppel) { function _undoppelToQueue(blob, doppel, leadingSpace) {
var TOP = blob; var TOP = blob;
var firstString = true; var firstString = true;
var tagReg = new _TagReg(blob); var tagReg = new _TagReg(blob);
@ -14767,7 +14771,11 @@ CSL.Util.FlipFlopper = function(state) {
}; };
var stack = new Stack(blob); var stack = new Stack(blob);
if (doppel.strings.length) { if (doppel.strings.length) {
stack.addStyling(doppel.strings[0]); var str = doppel.strings[0];
if (leadingSpace) {
str = " " + str;
}
stack.addStyling(str);
} }
for (var i=0,ilen=doppel.tags.length;i<ilen;i++) { for (var i=0,ilen=doppel.tags.length;i<ilen;i++) {
var tag = doppel.tags[i]; var tag = doppel.tags[i];
@ -14783,7 +14791,12 @@ CSL.Util.FlipFlopper = function(state) {
} }
} }
function processTags(blob) { function processTags(blob) {
var str = " " + blob.blobs; var str = blob.blobs;
var leadingSpace = false;
if (str.slice(0, 1) === " " && !str.match(/^\s+[\'\"]/)) {
leadingSpace = true;
}
var str = " " + str;
var doppel = _doppelString(str); var doppel = _doppelString(str);
if (doppel.tags.length === 0) return; if (doppel.tags.length === 0) return;
var quoteFormSeen = false; var quoteFormSeen = false;
@ -14862,7 +14875,7 @@ CSL.Util.FlipFlopper = function(state) {
doppel.strings[i] += tag.slice(0, 1); doppel.strings[i] += tag.slice(0, 1);
} }
} }
_undoppelToQueue(blob, doppel); _undoppelToQueue(blob, doppel, leadingSpace);
} }
} }
CSL.Output.Formatters = new function () { CSL.Output.Formatters = new function () {