www

commit a48a60a2303cd8a9d1be63709e132a3b285a514f
parent fdac7c450fbc5a681c8737e3b8d1734287a96d7b
Author: Simon Kornblith <simon@simonster.com>
Date:   Fri, 15 Jun 2012 10:48:43 -0400

Update to citeproc-js 1.0.342

Diffstat:
M
chrome/content/zotero/xpcom/citeproc.js
 | 
42
+++++++++++++++++++-----------------------

1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
@@ -57,6 +57,7 @@ if (!Array.indexOf) {
     };
 }
 var CSL = {
+    PROCESSOR_VERSION: "1.0.342",
     STATUTE_SUBDIV_GROUPED_REGEX: /((?:^| )(?:art|ch|Ch|subch|p|pp|para|subpara|pt|r|sec|subsec|Sec|sch|tit)\.)/g,
     STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|ch|Ch|subch|p|pp|para|subpara|pt|r|sec|subsec|Sec|sch|tit)\.)/,
     STATUTE_SUBDIV_STRINGS: {
@@ -2204,7 +2205,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.339";
+    this.processor_version = CSL.PROCESSOR_VERSION;
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -8113,6 +8114,10 @@ CSL.Node.text = {
                                             if (!this.decorations.length || this.decorations[0][0] !== "@" + this.variables[0]) {
                                                 this.decorations = [["@" + this.variables[0], "true"]].concat(this.decorations);
                                             }
+                                        } else {
+                                            if (this.decorations.length && this.decorations[0][0] === "@" + this.variables[0]) {
+                                                this.decorations = this.decorations.slice(1);
+                                            }
                                         }
                                         state.output.append(value, this, false, false, true);
                                     }
@@ -9362,7 +9367,7 @@ CSL.Transform = function (state) {
         }
         return function (state, Item, item, usedOrig) {
             var primary, secondary, tertiary, primary_tok, group_tok, key;
-            if (!variables[0]) {
+            if (!variables[0] || (!Item[variables[0]] && !Item[alternative_varname])) {
                 return null;
             }
 		    var slot = {primary:false, secondary:false, tertiary:false};
@@ -11404,19 +11409,17 @@ CSL.Output.Formatters.sentence = function (state, string) {
     return CSL.Output.Formatters.undoppelString(str);
 };
 CSL.Output.Formatters["capitalize-all"] = function (state, string) {
-    var str, strings, len, pos;
-    str = CSL.Output.Formatters.doppelString(string, CSL.TAG_ESCAPE);
-    strings = str.string.split(" ");
-    len = strings.length;
-    for (pos = 0; pos < len; pos += 1) {
-        if (strings[pos].length > 1) {
+    var str = CSL.Output.Formatters.doppelString(string, CSL.TAG_ESCAPE);
+    var strings = str.string.split(" ");
+    for (var i = 0, ilen = strings.length; i < ilen; i += 1) {
+        if (strings[i].length > 1) {
 			if (state.opt.development_extensions.allow_force_lowercase) {
-				strings[pos] = strings[pos].slice(0, 1).toUpperCase() + strings[pos].substr(1).toLowerCase();
+				strings[i] = strings[i].slice(0, 1).toUpperCase() + strings[i].substr(1).toLowerCase();
 			} else {
-				strings[pos] = strings[pos].slice(0, 1).toUpperCase() + strings[pos].substr(1);
+				strings[i] = strings[i].slice(0, 1).toUpperCase() + strings[i].substr(1);
 			}
-        } else if (strings[pos].length === 1) {
-            strings[pos] = strings[pos].toUpperCase();
+        } else if (strings[i].length === 1) {
+            strings[i] = strings[i].toUpperCase();
         }
     }
     str.string = strings.join(" ");
@@ -11964,18 +11967,11 @@ CSL.Registry.prototype.renumber = function () {
     for (pos = 0; pos < len; pos += 1) {
         item = this.reflist[pos];
         item.seq = (pos + 1);
-        var hasTaints = false;
-        for (var key in this.state.tmp.taintedItemIDs) {
-            hasTaints = true;
-            break;
+        if (this.state.opt.update_mode === CSL.NUMERIC && item.seq != this.oldseq[item.id]) {
+            this.state.tmp.taintedItemIDs[item.id] = true;
         }
-        if (hasTaints && item.seq != this.oldseq[item.id]) {
-            if (this.state.opt.update_mode === CSL.NUMERIC) {
-                this.state.tmp.taintedItemIDs[item.id] = true;
-            }
-            if (this.state.opt.bib_mode === CSL.NUMERIC) {
-                this.return_data.bibchange = true;
-            }
+        if (this.state.opt.bib_mode === CSL.NUMERIC && item.seq != this.oldseq[item.id]) {
+            this.return_data.bibchange = true;
         }
     }
     if (this.state.opt.citation_number_sort_direction === CSL.DESCENDING