counter.js working again with namespacing

diff --git a/developer/authored/Manuscript.copy/Core/utility.js b/developer/authored/Manuscript.copy/Core/utility.js
index d6f2ddd..87a452f 100644 (file)
--- a/developer/authored/Manuscript.copy/Core/utility.js
+++ b/developer/authored/Manuscript.copy/Core/utility.js
@@ -22,6 +22,7 @@ window.RT.debug = {
 */  
 
   active_tokens: new Set([
+    'scroll'
   ]),
 
   log: function(token, message) {

diff --git a/developer/authored/Manuscript.copy/Element/counter.js b/developer/authored/Manuscript.copy/Element/counter.js
index b4b0485..edc39ef 100644 (file)
--- a/developer/authored/Manuscript.copy/Element/counter.js
+++ b/developer/authored/Manuscript.copy/Element/counter.js
@@ -1,9 +1,10 @@
 window.RT = window.RT || {};
+window.RT.Counter = window.RT.Counter || {};
 
-window.RT.dict_counter = {};
+window.RT.dict_instance = {};
 window.RT.dict_snapshot = {};
 
-function clone_counter_state(state) {
+function clone_state(state) {
   return {
     counter: state.counter,
     stack: [...state.stack], 
@@ -16,8 +17,8 @@ function clone_counter_state(state) {
   };
 }
 
-window.RT.counter_do_count = function (root_node) {
-  window.RT.dict_counter = {}; 
+window.RT.Counter.parse_and_count = function (root_node) {
+  window.RT.dict_instance = {}; 
   window.RT.dict_snapshot = {}; 
 
   function to_roman(num) {
@@ -99,7 +100,7 @@ window.RT.counter_do_count = function (root_node) {
     const tag = node.tagName.toLowerCase();
     let pushed_name = null;
 
-    if (tag === 'RT·Counter··make') {
+    if (tag === 'RT·Counter·make'.toLowerCase()) {
       const name = node.getAttribute('counter');
       if (name) {
         const style = node.getAttribute('style') || 'Natural';
@@ -107,7 +108,7 @@ window.RT.counter_do_count = function (root_node) {
         
         let first_step_int = parse_first_step(on_first_step_str, style, name);
         
-        window.RT.dict_counter[name] = {
+        window.RT.dict_instance[name] = {
           counter: name,
           stack: [0], 
           empty: [true], 
@@ -119,17 +120,17 @@ window.RT.counter_do_count = function (root_node) {
           count: ''
         };
       }
-    } else if (tag === 'RT·Counter··indent') {
+    } else if (tag === 'RT·Counter·indent'.toLowerCase()) {
       const name = node.getAttribute('counter');
-      if (name && window.RT.dict_counter[name]) {
-        window.RT.dict_counter[name].stack.push(0);
-        window.RT.dict_counter[name].empty.push(true);
+      if (name && window.RT.dict_instance[name]) {
+        window.RT.dict_instance[name].stack.push(0);
+        window.RT.dict_instance[name].empty.push(true);
         pushed_name = name;
       }
-    } else if (tag === 'RT·Counter··step') {
+    } else if (tag === 'RT·Counter·step'.toLowerCase()) {
       const name = node.getAttribute('counter');
-      if (name && window.RT.dict_counter[name]) {
-        const state = window.RT.dict_counter[name];
+      if (name && window.RT.dict_instance[name]) {
+        const state = window.RT.dict_instance[name];
         const depth = state.stack.length - 1;
         
         if (state.empty[depth]) {
@@ -150,18 +151,18 @@ window.RT.counter_do_count = function (root_node) {
         
         state.count = count_str;
       }
-    } else if (tag === 'RT·Counter··snapshot') {
+    } else if (tag === 'RT·Counter·snapshot'.toLowerCase()) {
       const counter_name = node.getAttribute('counter');
       const snapshot_name = node.getAttribute('snapshot');
       
-      if (counter_name && snapshot_name && window.RT.dict_counter[counter_name]) {
-        const state = window.RT.dict_counter[counter_name];
+      if (counter_name && snapshot_name && window.RT.dict_instance[counter_name]) {
+        const state = window.RT.dict_instance[counter_name];
         const depth = state.stack.length - 1;
 
         if (state.empty[depth]) {
-             console.error(`RT-Style Layout Error: Attempted to snapshot an empty counter '${counter_name}' at snapshot '${snapshot_name}'. A person must use <RT·Counter··step> before taking a snapshot.`);
+             console.error(`RT-Style Layout Error: Attempted to snapshot an empty counter '${counter_name}' at snapshot '${snapshot_name}'. A person must use <RT·Counter·step> before taking a snapshot.`);
         } else {
-             window.RT.dict_snapshot[snapshot_name] = clone_counter_state(state);
+             window.RT.dict_snapshot[snapshot_name] = clone_state(state);
         }
       }
     }
@@ -173,20 +174,20 @@ window.RT.counter_do_count = function (root_node) {
     }
 
     if (pushed_name) {
-      window.RT.dict_counter[pushed_name].stack.pop();
-      window.RT.dict_counter[pushed_name].empty.pop();
+      window.RT.dict_instance[pushed_name].stack.pop();
+      window.RT.dict_instance[pushed_name].empty.pop();
     }
   }
 
   walk(root_node);
 };
 
-window.RT.counter_do_snapshot = function (root_node) {
+window.RT.Counter.do_snapshot = function (root_node) {
   return;
 };
 
-window.RT.counter_do_read = function (root_node) {
-  const reads = root_node.querySelectorAll('RT·Counter··read');
+window.RT.Counter.read = function (root_node) {
+  const reads = root_node.querySelectorAll('RT·Counter·read');
   for (let i = 0; i < reads.length; i++) {
     const snapshot_name = reads[i].getAttribute('snapshot');
     const key = reads[i].getAttribute('key') || 'count'; 
@@ -196,7 +197,7 @@ window.RT.counter_do_read = function (root_node) {
       reads[i].innerHTML = (value !== undefined) ? value : `[Missing key: ${key}]`;
     } else {
       reads[i].innerHTML = `[Unknown snapshot: ${snapshot_name}]`;
-      console.error(`RT-Style Layout Error: <RT·Counter··read> failed. No snapshot named '${snapshot_name}' found in the dictionary.`);
+      console.error(`RT-Style Layout Error: <RT·Counter·read> failed. No snapshot named '${snapshot_name}' found in the dictionary.`);
     }
   }
 };

diff --git a/developer/authored/Manuscript.copy/Layout/article_tech_ref.js b/developer/authored/Manuscript.copy/Layout/article_tech_ref.js
index 0a7ee04..2bd381d 100644 (file)
--- a/developer/authored/Manuscript.copy/Layout/article_tech_ref.js
+++ b/developer/authored/Manuscript.copy/Layout/article_tech_ref.js
@@ -133,9 +133,9 @@ apply_style_rule('body, html, RT·article' ,{ overflowAnchor: "none !important"
     if(RT.theme) RT.theme();     
     if(RT.endnote) RT.endnote();
     
-    if(RT.counter_do_count){
-      RT.counter_do_count(document.body);
-      if(RT.counter_do_read) RT.counter_do_read(document.body);
+    if(RT.Counter.parse_and_count){
+      RT.Counter.parse_and_count(document.body);
+      if(RT.Counter.read) RT.Counter.read(document.body);
     }
     
     if(RT.title) RT.title();