Ticket #1278: 09-reset-first-reference.patch

chrome/content/zotero/xpcom/csl.js

@@ -1120 +1120 @@
                                                                     exists = citationItem && citationItem.locator &&
                                                                         (citationItem.locatorType == variables[j]
                                                                          || (!citationItem.locatorType && variables[j] == "page"));
+                                                                } else if (attribute == "reset-first" ) {
+                                                                        // weird register adjustments here, not sure why
+                                                                        // it needs to be set this way, but this works, and
+                                                                        // every other arrangement didn't.
+                                                                        if ( !Zotero.CSL.Global.lastFirstRef[citationItem.itemID] || citationItem.thisRef - Zotero.CSL.Global.lastFirstRef[citationItem.itemID] < 0 ) {
+                                                                                Zotero.CSL.Global.lastFirstRef[citationItem.itemID] = citationItem.thisRef-1;
+                                                                        }
+                                                                        if ( citationItem.thisRef - Zotero.CSL.Global.lastFirstRef[citationItem.itemID] >= variables[j] ) {
+                                                                                Zotero.CSL.Global.lastFirstRef[citationItem.itemID] = citationItem.thisRef;
+                                                                                exists = true;
+                                                                        } else {
+                                                                                exists = false;
+                                                                        }
                                                                 } else if (attribute == "context") {
 
                                                                     if(variables[j] == "prefix-punctuation") {
-                                                                        exists = citationItem && citationItem.prefixPunctuation;
-                                                                    }
+                                                                                exists = citationItem && citationItem.prefixPunctuation;
+                                                                    } else if(variables[j] == "same-note") {
+                                                                                exists = citationItem && citationItem.distanceToLastRef == 0;
+                                                                        }
                                                                 } else {        // attribute == "position"
                                                                         if(variables[j] == "first") {
                                                                                 exists = !citationItem
@@ -1357 +1372 @@
         this.cleanXML = cleanXML;
         this.parseLocales = parseLocales;
         
+        /*
+         * Mutable register for tracking most recent full citation
+         * (for op cit, Bluebook statutory references)
+         *
+         */
+        this.lastFirstRef = new Object();
+                
         default xml namespace = "http://purl.org/net/xbiblio/csl"; with({});
         this.ns = "http://purl.org/net/xbiblio/csl";
         
@@ -1378 +1400 @@
          * initializes CSL interpreter
          */
         function init() {
+
                 if(!Zotero.CSL.Global._xmlLang) {
                         var prefix = "chrome://zotero/content/locale/csl/locales-";
                         var ext = ".xml";