object_number, replaces object_cite_number in code

1 files changed, 209 insertions, 209 deletions

diff --git a/src/sdp/meta/metadoc_from_src.d b/src/sdp/meta/metadoc_from_src.d
index ba85b68..fab23e3 100644
--- a/src/sdp/meta/metadoc_from_src.d
+++ b/src/sdp/meta/metadoc_from_src.d
@@ -274,7 +274,7 @@ template SiSUdocAbstraction() {
       "blurb"    : 0,
     ];
     auto obj_type_status = flags_type_init;
-    string[string] obj_cite_number_poem = [
+    string[string] object_number_poem = [
       "start" : "",
       "end"   : ""
     ];
@@ -332,9 +332,9 @@ template SiSUdocAbstraction() {
     comp_obj_heading_.typeinfo.is_a              = "heading";
     comp_obj_heading_.text                       = "Table of Contents";
     comp_obj_heading_.node.ocn                   = 0;
-    comp_obj_heading_.node.obj_cite_number       = "";
-    comp_obj_heading_.misc.obj_cite_number_off   = "";
-    comp_obj_heading_.misc.obj_cite_number_type  = 0;
+    comp_obj_heading_.node.object_number         = "";
+    comp_obj_heading_.misc.object_number_off     = "";
+    comp_obj_heading_.misc.object_number_type    = 0;
     comp_obj_heading_.tags.segment_anchor_tag    = "toc";
     comp_obj_heading_.node.marked_up_level       = "1";
     comp_obj_heading_.node.heading_lev_markup    = 4;
@@ -473,9 +473,9 @@ template SiSUdocAbstraction() {
               comp_obj_heading_.typeinfo.is_a              = "heading";
               comp_obj_heading_.text                       = "Glossary";
               comp_obj_heading_.node.ocn                   = 0;
-              comp_obj_heading_.node.obj_cite_number       = "";
-              comp_obj_heading_.misc.obj_cite_number_off   = "";
-              comp_obj_heading_.misc.obj_cite_number_type  = 0;
+              comp_obj_heading_.node.object_number         = "";
+              comp_obj_heading_.misc.object_number_off     = "";
+              comp_obj_heading_.misc.object_number_type    = 0;
               comp_obj_heading_.tags.segment_anchor_tag    = "_part_glossary";
               comp_obj_heading_.node.marked_up_level       = "B";
               comp_obj_heading_.node.heading_lev_markup    = 1;
@@ -492,9 +492,9 @@ template SiSUdocAbstraction() {
               comp_obj_heading_.typeinfo.is_a              = "heading";
               comp_obj_heading_.text                       = "Glossary";
               comp_obj_heading_.node.ocn                   = 0;
-              comp_obj_heading_.node.obj_cite_number       = "";
-              comp_obj_heading_.misc.obj_cite_number_off   = "";
-              comp_obj_heading_.misc.obj_cite_number_type  = 0;
+              comp_obj_heading_.node.object_number         = "";
+              comp_obj_heading_.misc.object_number_off     = "";
+              comp_obj_heading_.misc.object_number_type    = 0;
               comp_obj_heading_.tags.segment_anchor_tag    = "glossary";
               comp_obj_heading_.node.marked_up_level       = "1";
               comp_obj_heading_.node.heading_lev_markup    = 4;
@@ -514,9 +514,9 @@ template SiSUdocAbstraction() {
               comp_obj_para.typeinfo.is_a             = "glossary";
               comp_obj_para.text                      = line.to!string.strip;
               comp_obj_para.node.ocn                  = 0;
-              comp_obj_para.node.obj_cite_number      = "";
-              comp_obj_para.misc.obj_cite_number_off  = "";
-              comp_obj_para.misc.obj_cite_number_type = 0;
+              comp_obj_para.node.object_number        = "";
+              comp_obj_para.misc.object_number_off    = "";
+              comp_obj_para.misc.object_number_type   = 0;
               comp_obj_para.attrib.indent_hang        = indent["hang_position"];
               comp_obj_para.attrib.indent_base        = indent["base_position"];
               comp_obj_para.attrib.bullet             = bullet;
@@ -584,9 +584,9 @@ template SiSUdocAbstraction() {
               comp_obj_heading_.typeinfo.is_a              = "heading";
               comp_obj_heading_.text                       = "Blurb";
               comp_obj_heading_.node.ocn                   = 0;
-              comp_obj_heading_.node.obj_cite_number       = "";
-              comp_obj_heading_.misc.obj_cite_number_off   = "";
-              comp_obj_heading_.misc.obj_cite_number_type  = 0;
+              comp_obj_heading_.node.object_number         = "";
+              comp_obj_heading_.misc.object_number_off     = "";
+              comp_obj_heading_.misc.object_number_type    = 0;
               comp_obj_heading_.tags.segment_anchor_tag    = "_part_blurb";
               comp_obj_heading_.node.marked_up_level       = "B";
               comp_obj_heading_.node.heading_lev_markup    = 1;
@@ -603,9 +603,9 @@ template SiSUdocAbstraction() {
               comp_obj_heading_.typeinfo.is_a              = "heading";
               comp_obj_heading_.text                       = "Blurb";
               comp_obj_heading_.node.ocn                   = 0;
-              comp_obj_heading_.node.obj_cite_number       = "";
-              comp_obj_heading_.misc.obj_cite_number_off   = "";
-              comp_obj_heading_.misc.obj_cite_number_type  = 0;
+              comp_obj_heading_.node.object_number         = "";
+              comp_obj_heading_.misc.object_number_off     = "";
+              comp_obj_heading_.misc.object_number_type    = 0;
               comp_obj_heading_.tags.segment_anchor_tag    = "blurb";
               comp_obj_heading_.node.marked_up_level       = "1";
               comp_obj_heading_.node.heading_lev_markup    = 4;
@@ -625,9 +625,9 @@ template SiSUdocAbstraction() {
               comp_obj_heading_.typeinfo.is_a              = "heading";
               comp_obj_heading_.text                       = line.to!string;
               comp_obj_heading_.node.ocn                   = 0;
-              comp_obj_heading_.node.obj_cite_number       = "";
-              comp_obj_heading_.misc.obj_cite_number_off   = "";
-              comp_obj_heading_.misc.obj_cite_number_type  = 0;
+              comp_obj_heading_.node.object_number         = "";
+              comp_obj_heading_.misc.object_number_off     = "";
+              comp_obj_heading_.misc.object_number_type    = 0;
               comp_obj_heading_.tags.segment_anchor_tag    = "blurb";
               comp_obj_heading_.node.marked_up_level       = an_object["lev"].to!string;
               comp_obj_heading_.node.heading_lev_markup    = an_object["lev_markup_number"].to!int;    // make int, remove need to conv
@@ -644,9 +644,9 @@ template SiSUdocAbstraction() {
               comp_obj_para.typeinfo.is_a             = "blurb";
               comp_obj_para.text                      = munge.url_links(line.to!string.strip).replaceFirst(rgx.para_attribs, "");
               comp_obj_para.node.ocn                  = 0;
-              comp_obj_para.node.obj_cite_number      = "";
-              comp_obj_para.misc.obj_cite_number_off  = "";
-              comp_obj_para.misc.obj_cite_number_type = 0;
+              comp_obj_para.node.object_number        = "";
+              comp_obj_para.misc.object_number_off    = "";
+              comp_obj_para.misc.object_number_type   = 0;
               comp_obj_para.attrib.indent_hang        = indent["hang_position"];
               comp_obj_para.attrib.indent_base        = indent["base_position"];
               comp_obj_para.has.inline_links          = true;
@@ -687,7 +687,7 @@ template SiSUdocAbstraction() {
           continue;
         } else if (obj_type_status["poem"] == TriState.on) {
           /+ within block object: poem +/
-          _poem_block_(line, an_object, obj_type_status, cntr, obj_cite_number_poem, conf_make_meta);
+          _poem_block_(line, an_object, obj_type_status, cntr, object_number_poem, conf_make_meta);
           continue;
         } else if (obj_type_status["table"] == TriState.on) {
           /+ within block object: table +/
@@ -706,9 +706,9 @@ template SiSUdocAbstraction() {
               /+ poem to verse exceptions! +/
               object_reset(an_object);
               processing.remove("verse");
-              obj_cite_number_poem["start"] = obj_cite_digits.on.to!string;
+              object_number_poem["start"] = obj_cite_digits.on.to!string;
             }
-            _start_block_(line, obj_type_status, obj_cite_number_poem);
+            _start_block_(line, obj_type_status, object_number_poem);
             continue;
           } else if (!line.empty) {
             /+ line not empty +/
@@ -824,7 +824,7 @@ template SiSUdocAbstraction() {
               comp_obj_heading,
               cntr,
               obj_type_status,
-              obj_cite_number_poem,
+              object_number_poem,
               conf_make_meta,
             );
           } else {
@@ -960,10 +960,10 @@ template SiSUdocAbstraction() {
               comp_obj_para.typeinfo.is_a                            = "para";
               comp_obj_para.text                                     = an_object["substantive"].to!string.strip;
               comp_obj_para.node.ocn                                 = obj_cite_digits.digit;
-              comp_obj_para.node.obj_cite_number                     = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-              comp_obj_para.misc.obj_cite_number_off                 = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-              comp_obj_para.misc.obj_cite_number_bkidx               = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-              comp_obj_para.misc.obj_cite_number_type                = obj_cite_digits.type;
+              comp_obj_para.node.object_number                       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+              comp_obj_para.misc.object_number_off                   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+              comp_obj_para.misc.object_number_bkidx                 = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+              comp_obj_para.misc.object_number_type                  = obj_cite_digits.type;
               comp_obj_para.attrib.indent_hang                       = indent["hang_position"];
               comp_obj_para.attrib.indent_base                       = indent["base_position"];
               comp_obj_para.attrib.bullet                            = bullet;
@@ -1059,9 +1059,9 @@ template SiSUdocAbstraction() {
       comp_obj_heading_.typeinfo.is_a              = "heading";
       comp_obj_heading_.text                       = "(skip) there is no Glossary section";
       comp_obj_heading_.node.ocn                   = 0;
-      comp_obj_heading_.node.obj_cite_number       = "";
-      comp_obj_heading_.misc.obj_cite_number_off   = "";
-      comp_obj_heading_.misc.obj_cite_number_type  = 0;
+      comp_obj_heading_.node.object_number         = "";
+      comp_obj_heading_.misc.object_number_off     = "";
+      comp_obj_heading_.misc.object_number_type    = 0;
       comp_obj_heading_.node.marked_up_level       = "B";
       comp_obj_heading_.node.heading_lev_markup    = 1;
       comp_obj_heading_.node.heading_lev_collapsed = 1;
@@ -1088,9 +1088,9 @@ template SiSUdocAbstraction() {
       comp_obj_heading_.typeinfo.is_a              = "heading";
       comp_obj_heading_.text                       = "Bibliography";
       comp_obj_heading_.node.ocn                   = 0;
-      comp_obj_heading_.node.obj_cite_number       = "";
-      comp_obj_heading_.misc.obj_cite_number_off   = "";
-      comp_obj_heading_.misc.obj_cite_number_type  = 0;
+      comp_obj_heading_.node.object_number         = "";
+      comp_obj_heading_.misc.object_number_off     = "";
+      comp_obj_heading_.misc.object_number_type    = 0;
       comp_obj_heading_.tags.segment_anchor_tag    = "_part_bibliography";
       comp_obj_heading_.node.marked_up_level       = "B";
       comp_obj_heading_.node.heading_lev_markup    = 1;
@@ -1105,9 +1105,9 @@ template SiSUdocAbstraction() {
       comp_obj_heading_.typeinfo.is_a              = "heading";
       comp_obj_heading_.text                       = "Bibliography";
       comp_obj_heading_.node.ocn                   = 0;
-      comp_obj_heading_.node.obj_cite_number       = "";
-      comp_obj_heading_.misc.obj_cite_number_off   = "";
-      comp_obj_heading_.misc.obj_cite_number_type  = 0;
+      comp_obj_heading_.node.object_number         = "";
+      comp_obj_heading_.misc.object_number_off     = "";
+      comp_obj_heading_.misc.object_number_type    = 0;
       comp_obj_heading_.tags.segment_anchor_tag    = "bibliography";
       comp_obj_heading_.node.marked_up_level       = "1";
       comp_obj_heading_.node.heading_lev_markup    = 4;
@@ -1124,9 +1124,9 @@ template SiSUdocAbstraction() {
       comp_obj_heading_.typeinfo.is_a              = "heading";
       comp_obj_heading_.text                       = "(skip) there is no Bibliography";
       comp_obj_heading_.node.ocn                   = 0;
-      comp_obj_heading_.node.obj_cite_number       = "";
-      comp_obj_heading_.misc.obj_cite_number_off   = "";
-      comp_obj_heading_.misc.obj_cite_number_type  = 0;
+      comp_obj_heading_.node.object_number         = "";
+      comp_obj_heading_.misc.object_number_off     = "";
+      comp_obj_heading_.misc.object_number_type    = 0;
       comp_obj_heading_.node.marked_up_level       = "B";
       comp_obj_heading_.node.heading_lev_markup    = 1;
       comp_obj_heading_.node.heading_lev_collapsed = 1;
@@ -1157,9 +1157,9 @@ template SiSUdocAbstraction() {
       comp_obj_para.typeinfo.is_a             = "bibliography";
       comp_obj_para.text                      = out_.to!string.strip;
       comp_obj_para.node.ocn                  = 0;
-      comp_obj_para.node.obj_cite_number      = "";
-      comp_obj_para.misc.obj_cite_number_off  = "";
-      comp_obj_para.misc.obj_cite_number_type = 0;
+      comp_obj_para.node.object_number        = "";
+      comp_obj_para.misc.object_number_off    = "";
+      comp_obj_para.misc.object_number_type   = 0;
       comp_obj_para.attrib.indent_hang        = 0;
       comp_obj_para.attrib.indent_base        = 1;
       comp_obj_para.attrib.bullet             = bullet;
@@ -1195,9 +1195,9 @@ template SiSUdocAbstraction() {
       comp_obj_heading_.typeinfo.is_a              = "heading";
       comp_obj_heading_.text                       = "(skip) there is no Blurb section";
       comp_obj_heading_.node.ocn                   = 0;
-      comp_obj_para.node.obj_cite_number           = "";
-      comp_obj_para.misc.obj_cite_number_off       = "";
-      comp_obj_para.misc.obj_cite_number_type      = 0;
+      comp_obj_para.node.object_number             = "";
+      comp_obj_para.misc.object_number_off         = "";
+      comp_obj_para.misc.object_number_type        = 0;
       comp_obj_heading_.tags.segment_anchor_tag    = "";
       comp_obj_heading_.node.marked_up_level       = "B";
       comp_obj_heading_.node.heading_lev_markup    = 1;
@@ -1221,9 +1221,9 @@ template SiSUdocAbstraction() {
     comp_obj_toc.typeinfo.is_of            = "para";
     comp_obj_toc.typeinfo.is_a             = "toc";
     comp_obj_toc.node.ocn                  = 0;
-    comp_obj_toc.node.obj_cite_number      = "";
-    comp_obj_toc.misc.obj_cite_number_off  = "";
-    comp_obj_toc.misc.obj_cite_number_type = 0;
+    comp_obj_toc.node.object_number        = "";
+    comp_obj_toc.misc.object_number_off    = "";
+    comp_obj_toc.misc.object_number_type   = 0;
     comp_obj_toc.attrib.indent_hang        = indent["hang_position"];
     comp_obj_toc.attrib.indent_base        = indent["base_position"];
     comp_obj_toc.attrib.bullet             = false;
@@ -1471,8 +1471,8 @@ template SiSUdocAbstraction() {
             "Title OCN should be 1 not: " ~ obj.node.ocn.to!string); // bug introduced 0.18.1
           +/
           obj.node.ocn = 1;
-          obj.node.obj_cite_number = "1";
-          obj.misc.obj_cite_number_type = OCNtype.ocn;
+          obj.node.object_number = "1";
+          obj.misc.object_number_type = OCNtype.ocn;
         }
         /+ dom structure (marked up & collapsed) +/
         if ((opt_action.html)
@@ -1594,7 +1594,7 @@ template SiSUdocAbstraction() {
           }
           obj_cite_digits = ocn_emit(OCNstatus.on);
           obj.node.ocn = obj_cite_digits.digit;
-          obj.node.obj_cite_number = obj_cite_digits.on.to!string;
+          obj.node.object_number = obj_cite_digits.on.to!string;
           if (obj.node.heading_lev_markup <= 4) {
             segnames_0_4 ~= obj.tags.segment_anchor_tag;
             if (obj.node.heading_lev_markup == 4) {
@@ -1630,7 +1630,7 @@ template SiSUdocAbstraction() {
           }
           obj_cite_digits = ocn_emit(OCNstatus.on);
           obj.node.ocn = obj_cite_digits.digit;
-          obj.node.obj_cite_number = obj_cite_digits.on.to!string;
+          obj.node.object_number = obj_cite_digits.on.to!string;
           if (obj.node.heading_lev_markup <= 4) {
             segnames_0_4 ~= obj.tags.segment_anchor_tag;
             if (obj.node.heading_lev_markup == 4) {
@@ -1657,7 +1657,7 @@ template SiSUdocAbstraction() {
         } else if (obj.typeinfo.is_a == "glossary") {
           obj_cite_digits = ocn_emit(OCNstatus.on);
           obj.node.ocn = obj_cite_digits.digit;
-          obj.node.obj_cite_number = obj_cite_digits.on.to!string;
+          obj.node.object_number = obj_cite_digits.on.to!string;
         }
       }
     }
@@ -1670,7 +1670,7 @@ template SiSUdocAbstraction() {
           }
           obj_cite_digits = ocn_emit(OCNstatus.on);
           obj.node.ocn = obj_cite_digits.digit;
-          obj.node.obj_cite_number = obj_cite_digits.on.to!string; // check
+          obj.node.object_number = obj_cite_digits.on.to!string; // check
           if (obj.node.heading_lev_markup <= 4) {
             segnames_0_4 ~= obj.tags.segment_anchor_tag;
             if (obj.node.heading_lev_markup == 4) {
@@ -1697,7 +1697,7 @@ template SiSUdocAbstraction() {
         } else if (obj.typeinfo.is_a == "bibliography") {
           obj_cite_digits = ocn_emit(OCNstatus.on);
           obj.node.ocn = obj_cite_digits.on;
-          obj.node.obj_cite_number = obj_cite_digits.on.to!string;
+          obj.node.object_number = obj_cite_digits.on.to!string;
         }
       }
     }
@@ -1715,7 +1715,7 @@ template SiSUdocAbstraction() {
           }
           obj_cite_digits = ocn_emit(OCNstatus.on);
           obj.node.ocn = obj_cite_digits.on;
-          obj.node.obj_cite_number = obj_cite_digits.on.to!string;
+          obj.node.object_number = obj_cite_digits.on.to!string;
           if (obj.node.heading_lev_markup <= 4) {
             segnames_0_4 ~= obj.tags.segment_anchor_tag;
             if (obj.node.heading_lev_markup == 4) {
@@ -1742,8 +1742,8 @@ template SiSUdocAbstraction() {
         } else if (obj.typeinfo.is_a == "bookindex") {
           obj_cite_digits = ocn_emit(OCNstatus.bkidx);
           obj.node.ocn = obj_cite_digits.digit;
-          obj.misc.obj_cite_number_bkidx = obj_cite_digits.bkidx.to!string;
-          obj.misc.obj_cite_number_type = OCNtype.bkidx;
+          obj.misc.object_number_bkidx = obj_cite_digits.bkidx.to!string;
+          obj.misc.object_number_type = OCNtype.bkidx;
         }
       }
       /+ seg +/
@@ -1755,7 +1755,7 @@ template SiSUdocAbstraction() {
             writeln(obj.text);
           }
           obj.node.ocn = ++ocn_;
-          obj.node.obj_cite_number = obj.node.ocn.to!string;
+          obj.node.object_number = obj.node.ocn.to!string;
           if (obj.node.heading_lev_markup <= 4) {
             segnames_0_4 ~= obj.tags.segment_anchor_tag;
             if (obj.node.heading_lev_markup == 4) {
@@ -1781,8 +1781,8 @@ template SiSUdocAbstraction() {
           obj = obj_heading_ancestors(obj, lv_ancestors_txt);
         } else if (obj.typeinfo.is_a == "bookindex") {
           ocn_bidx_ = ++ocn_bkidx_;
-          obj.misc.obj_cite_number_bkidx = ocn_bidx_.to!string; // FIX need to distinguish from regular ocn
-          obj.misc.obj_cite_number_type = OCNtype.bkidx;
+          obj.misc.object_number_bkidx = ocn_bidx_.to!string; // FIX need to distinguish from regular ocn
+          obj.misc.object_number_type = OCNtype.bkidx;
         }
       }
       /+ TODO assert failure, reinstate
@@ -1799,7 +1799,7 @@ template SiSUdocAbstraction() {
           }
           obj_cite_digits = ocn_emit(OCNstatus.on);
           obj.node.ocn = obj_cite_digits.on;
-          obj.node.obj_cite_number = obj_cite_digits.on.to!string;
+          obj.node.object_number = obj_cite_digits.on.to!string;
           if (obj.node.heading_lev_markup <= 4) {
             segnames_0_4 ~= obj.tags.segment_anchor_tag;
             if (obj.node.heading_lev_markup == 4) {
@@ -1825,8 +1825,8 @@ template SiSUdocAbstraction() {
           obj = obj_heading_ancestors(obj, lv_ancestors_txt);
         } else if (obj.typeinfo.is_a == "blurb") {
           obj_cite_digits = ocn_emit(OCNstatus.off);
-          obj.misc.obj_cite_number_off  = obj_cite_digits.off.to!string;
-          obj.misc.obj_cite_number_type = OCNtype.non;
+          obj.misc.object_number_off  = obj_cite_digits.off.to!string;
+          obj.misc.object_number_type = OCNtype.non;
         }
       }
     }
@@ -1842,9 +1842,9 @@ template SiSUdocAbstraction() {
     comp_obj_heading_.typeinfo.is_of             = "para";
     comp_obj_heading_.typeinfo.is_a              = "heading";
     comp_obj_heading_.node.ocn                   = 0;
-    comp_obj_para.node.obj_cite_number           = "";
-    comp_obj_para.misc.obj_cite_number_off       = "";
-    comp_obj_para.misc.obj_cite_number_type      = 0;
+    comp_obj_para.node.object_number             = "";
+    comp_obj_para.misc.object_number_off         = "";
+    comp_obj_para.misc.object_number_type        = 0;
     comp_obj_heading_.tags.segment_anchor_tag    = "";
     comp_obj_heading_.node.marked_up_level       = "";
     comp_obj_heading_.node.heading_lev_markup    = 9;
@@ -1982,16 +1982,16 @@ template SiSUdocAbstraction() {
     }
     static auto rgx = Rgx();
     if ((!line.empty) && (obj_type_status["ocn_status_off_for_multiple_objects"] == TriState.off)) {
-      /+ not multi-line object, check whether obj_cite_number is on or turned off +/
-      if (line.matchFirst(rgx.obj_cite_number_block_marks)) {
-        /+ switch off obj_cite_number +/
-        if (line.matchFirst(rgx.obj_cite_number_off_block)) {
+      /+ not multi-line object, check whether object_number is on or turned off +/
+      if (line.matchFirst(rgx.object_number_block_marks)) {
+        /+ switch off object_number +/
+        if (line.matchFirst(rgx.object_number_off_block)) {
           obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.on;
           debug(ocnoff) {
             writeln(line);
           }
         }
-        if (line.matchFirst(rgx.obj_cite_number_off_block_dh)) {
+        if (line.matchFirst(rgx.object_number_off_block_dh)) {
           obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.closing;
           debug(ocnoff) {
             writeln(line);
@@ -1999,9 +1999,9 @@ template SiSUdocAbstraction() {
         }
       } else {
         if (obj_type_status["ocn_status_off_for_multiple_objects"] == TriState.off) {
-          if (line.matchFirst(rgx.obj_cite_number_off)) {
+          if (line.matchFirst(rgx.object_number_off)) {
             obj_type_status["ocn_status"] = OCNstatus.off;
-          } else if (line.matchFirst(rgx.obj_cite_number_off_dh)) {
+          } else if (line.matchFirst(rgx.object_number_off_dh)) {
             obj_type_status["ocn_status"] = OCNstatus.closing;
           } else {
             obj_type_status["ocn_status"] = OCNstatus.on;
@@ -2012,7 +2012,7 @@ template SiSUdocAbstraction() {
         }
       }
     } else if ((!line.empty) && (obj_type_status["ocn_status_off_for_multiple_objects"] > TriState.off)) {
-      if (line.matchFirst(rgx.obj_cite_number_off_block_close)) {
+      if (line.matchFirst(rgx.object_number_off_block_close)) {
         obj_type_status["ocn_status_off_for_multiple_objects"] = TriState.off;
         obj_type_status["ocn_status"]                          = OCNstatus.on;
         debug(ocnoff) {
@@ -2071,12 +2071,12 @@ template SiSUdocAbstraction() {
   void _start_block_(L,T,N)(
                L line,
     return ref T obj_type_status,
-    return ref N obj_cite_number_poem
+    return ref N object_number_poem
   ) {
     debug(asserts) {
       static assert(is(typeof(line)                 == char[]));
       static assert(is(typeof(obj_type_status)      == int[string]));
-      static assert(is(typeof(obj_cite_number_poem) == string[string]));
+      static assert(is(typeof(object_number_poem) == string[string]));
     }
     static auto rgx = Rgx();
     string code_block_syntax = "";
@@ -2102,7 +2102,7 @@ template SiSUdocAbstraction() {
           line
         );
       }
-      obj_cite_number_poem["start"] = obj_cite_digits.on.to!string;
+      object_number_poem["start"] = obj_cite_digits.on.to!string;
       obj_type_status["blocks"]     = TriState.on;
       obj_type_status["verse_new"]  = State.on;
       obj_type_status["poem"]       = TriState.on;
@@ -2181,7 +2181,7 @@ template SiSUdocAbstraction() {
           line
         );
       }
-      obj_cite_number_poem["start"] = obj_cite_digits.on.to!string;
+      object_number_poem["start"] = obj_cite_digits.on.to!string;
       obj_type_status["blocks"]    = TriState.on;
       obj_type_status["verse_new"] = State.on;
       obj_type_status["poem"]      = TriState.on;
@@ -2368,7 +2368,7 @@ template SiSUdocAbstraction() {
     return ref O   an_object,
     return ref T   obj_type_status,
     return ref C   cntr,
-               N   obj_cite_number_poem,
+               N   object_number_poem,
                CMM conf_make_meta,
   ) {
     debug(asserts) {
@@ -2376,7 +2376,7 @@ template SiSUdocAbstraction() {
       static assert(is(typeof(an_object)            == string[string]));
       static assert(is(typeof(obj_type_status)      == int[string]));
       static assert(is(typeof(cntr)                 == int));
-      static assert(is(typeof(obj_cite_number_poem) == string[string]));
+      static assert(is(typeof(object_number_poem) == string[string]));
     }
     static auto rgx = Rgx();
     if (obj_type_status["curly_poem"] == TriState.on) {
@@ -2419,10 +2419,10 @@ template SiSUdocAbstraction() {
             comp_obj_block.typeinfo.is_of             = "block";
             comp_obj_block.typeinfo.is_a              = "verse";
             comp_obj_block.node.ocn                   = obj_cite_digits.on;
-            comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-            comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-            comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-            comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+            comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+            comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+            comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+            comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
             comp_obj_block.text                       = an_object["substantive"];
             comp_obj_block.has.inline_notes_reg       = substantive_obj_misc_tuple[sObj.notes_reg];
             comp_obj_block.has.inline_notes_star      = substantive_obj_misc_tuple[sObj.notes_star];
@@ -2433,7 +2433,7 @@ template SiSUdocAbstraction() {
           processing.remove("verse");
           ++cntr;
         }
-        obj_cite_number_poem["end"]   = obj_cite_digits.on.to!string;
+        object_number_poem["end"]   = obj_cite_digits.on.to!string;
         obj_type_status["blocks"]     = TriState.closing;
         obj_type_status["poem"]       = TriState.closing;
         obj_type_status["curly_poem"] = TriState.off;
@@ -2477,10 +2477,10 @@ template SiSUdocAbstraction() {
           comp_obj_block.typeinfo.is_of             = "block";
           comp_obj_block.typeinfo.is_a              = "verse";
           comp_obj_block.node.ocn                   = obj_cite_digits.on;
-          comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-          comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-          comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-          comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+          comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+          comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+          comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+          comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
           comp_obj_block.text                       = an_object["substantive"];
           comp_obj_block.has.inline_notes_reg       = substantive_obj_misc_tuple[sObj.notes_reg];
           comp_obj_block.has.inline_notes_star      = substantive_obj_misc_tuple[sObj.notes_star];
@@ -2520,16 +2520,16 @@ template SiSUdocAbstraction() {
           comp_obj_block.typeinfo.is_of             = "block";
           comp_obj_block.typeinfo.is_a              = "verse";
           comp_obj_block.node.ocn                   = obj_cite_digits.on;
-          comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-          comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-          comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-          comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+          comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+          comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+          comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+          comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
           comp_obj_block.text                       = an_object["substantive"];
           comp_obj_block.has.inline_notes_reg       = substantive_obj_misc_tuple[sObj.notes_reg];
           comp_obj_block.has.inline_notes_star      = substantive_obj_misc_tuple[sObj.notes_star];
           comp_obj_block.has.inline_links           = substantive_obj_misc_tuple[sObj.links];
           the_document_body_section                 ~= comp_obj_block;
-          obj_cite_number_poem["end"]               = obj_cite_digits.on.to!string;
+          object_number_poem["end"]               = obj_cite_digits.on.to!string;
           object_reset(an_object);
           processing.remove("verse");
           ++cntr;
@@ -2578,10 +2578,10 @@ template SiSUdocAbstraction() {
           comp_obj_block.typeinfo.is_of             = "block";
           comp_obj_block.typeinfo.is_a              = "verse";
           comp_obj_block.node.ocn                   = obj_cite_digits.on;
-          comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-          comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-          comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-          comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+          comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+          comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+          comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+          comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
           comp_obj_block.text                       = an_object["substantive"];
           comp_obj_block.has.inline_notes_reg       = substantive_obj_misc_tuple[sObj.notes_reg];
           comp_obj_block.has.inline_notes_star      = substantive_obj_misc_tuple[sObj.notes_star];
@@ -2874,10 +2874,10 @@ template SiSUdocAbstraction() {
         = obj_im.obj_inline_markup_and_anchor_tags_and_misc(an_object, "body_nugget", conf_make_meta);
       an_object["substantive"]                  = substantive_obj_misc_tuple[sObj.content];
       comp_obj_block.node.ocn                   = obj_cite_digits.on;
-      comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-      comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-      comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-      comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+      comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+      comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+      comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+      comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
       comp_obj_block                            = table_instructions(comp_obj_block, an_object["table_head"]);
       comp_obj_block                            = table_substantive_munge_special(comp_obj_block, an_object["substantive"]);
       the_document_body_section                 ~= comp_obj_block;
@@ -2895,7 +2895,7 @@ template SiSUdocAbstraction() {
     return ref ObjGenericComposite      _comp_obj_heading,
     return ref int                      cntr,
     return ref int[string]              obj_type_status,
-    string[string]                      obj_cite_number_poem,
+    string[string]                      object_number_poem,
     CMM                                 conf_make_meta,
   ) {
     assert(
@@ -2938,10 +2938,10 @@ template SiSUdocAbstraction() {
       comp_obj_block.typeinfo.is_of             = "block";
       comp_obj_block.typeinfo.is_a              = "quote";
       comp_obj_block.node.ocn                   = obj_cite_digits.on;
-      comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-      comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-      comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-      comp_obj_block.misc.obj_cite_number_type  = obj_cite_digit_type;
+      comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+      comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+      comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+      comp_obj_block.misc.object_number_type    = obj_cite_digit_type;
       comp_obj_block.text                       = an_object["substantive"];
       comp_obj_block.has.inline_notes_reg       = substantive_obj_misc_tuple[sObj.notes_reg];
       comp_obj_block.has.inline_notes_star      = substantive_obj_misc_tuple[sObj.notes_star];
@@ -2982,10 +2982,10 @@ template SiSUdocAbstraction() {
       comp_obj_block.typeinfo.is_of             = "block";
       comp_obj_block.typeinfo.is_a              = "group";
       comp_obj_block.node.ocn                   = obj_cite_digits.on;
-      comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-      comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-      comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-      comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+      comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+      comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+      comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+      comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
       comp_obj_block.text                       = an_object["substantive"];
       comp_obj_block.has.inline_notes_reg       = substantive_obj_misc_tuple[sObj.notes_reg];
       comp_obj_block.has.inline_notes_star      = substantive_obj_misc_tuple[sObj.notes_star];
@@ -3025,10 +3025,10 @@ template SiSUdocAbstraction() {
       comp_obj_block.typeinfo.is_of             = "block";
       comp_obj_block.typeinfo.is_a              = "block";
       comp_obj_block.node.ocn                   = obj_cite_digits.on;
-      comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-      comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-      comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-      comp_obj_block.misc.obj_cite_number_type  = obj_cite_digit_type;
+      comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+      comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+      comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+      comp_obj_block.misc.object_number_type    = obj_cite_digit_type;
       comp_obj_block.text                       = an_object["substantive"];
       comp_obj_block.has.inline_notes_reg       = substantive_obj_misc_tuple[sObj.notes_reg];
       comp_obj_block.has.inline_notes_star      = substantive_obj_misc_tuple[sObj.notes_star];
@@ -3064,10 +3064,10 @@ template SiSUdocAbstraction() {
       comp_obj_poem_ocn.typeinfo.is_of             = "block";
       comp_obj_poem_ocn.typeinfo.is_a              = "poem";
       comp_obj_poem_ocn.node.ocn                   = obj_cite_digits.on;
-      comp_obj_poem_ocn.node.obj_cite_number       = (obj_cite_number_poem["start"] ~ "..." ~ obj_cite_number_poem["end"]);
-      comp_obj_poem_ocn.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string; //
-      comp_obj_poem_ocn.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; //
-      comp_obj_poem_ocn.misc.obj_cite_number_type  = obj_cite_digits.type;
+      comp_obj_poem_ocn.node.object_number         = (object_number_poem["start"] ~ "..." ~ object_number_poem["end"]);
+      comp_obj_poem_ocn.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string; //
+      comp_obj_poem_ocn.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; //
+      comp_obj_poem_ocn.misc.object_number_type    = obj_cite_digits.type;
       comp_obj_poem_ocn.text                        = "";
       the_document_body_section                     ~= comp_obj_poem_ocn;
       obj_type_status["blocks"]                     = TriState.off;
@@ -3104,10 +3104,10 @@ template SiSUdocAbstraction() {
       comp_obj_code.typeinfo.is_of              = "block";
       comp_obj_code.typeinfo.is_a               = "code";
       comp_obj_code.node.ocn                    = obj_cite_digits.on;
-      comp_obj_code.node.obj_cite_number        = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-      comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-      comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-      comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+      comp_obj_code.node.object_number          = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+      comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+      comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+      comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
       comp_obj_code.text                        = an_object["substantive"];
       comp_obj_code.has.inline_notes_reg        = substantive_obj_misc_tuple[sObj.notes_reg];
       comp_obj_code.has.inline_notes_star       = substantive_obj_misc_tuple[sObj.notes_star];
@@ -3144,10 +3144,10 @@ template SiSUdocAbstraction() {
       an_object["substantive"]                  = substantive_obj_misc_tuple[sObj.content];
       comp_obj_block                            = comp_obj_block.init;
       comp_obj_block.node.ocn                   = obj_cite_digits.on;
-      comp_obj_block.node.obj_cite_number       = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-      comp_obj_block.misc.obj_cite_number_off   = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-      comp_obj_block.misc.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
-      comp_obj_block.misc.obj_cite_number_type  = obj_cite_digits.type;
+      comp_obj_block.node.object_number         = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+      comp_obj_block.misc.object_number_off     = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+      comp_obj_block.misc.object_number_bkidx   = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string;
+      comp_obj_block.misc.object_number_type    = obj_cite_digits.type;
       comp_obj_block = table_instructions(comp_obj_block, an_object["table_head"]);
       comp_obj_block = table_substantive_munge(comp_obj_block, an_object["substantive"]);
       the_document_body_section                 ~= comp_obj_block;
@@ -4082,7 +4082,7 @@ template SiSUdocAbstraction() {
     body {
       obj_txt["munge"]=(obj_txt_in)
        .replaceFirst(rgx.heading, "")
-       .replaceFirst(rgx.obj_cite_number_off_all, "")
+       .replaceFirst(rgx.object_number_off_all, "")
        .strip;
       auto t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers);
       debug(munge) {
@@ -4104,7 +4104,7 @@ template SiSUdocAbstraction() {
     body {
       obj_txt["munge"]=(obj_txt_in)
         .replaceFirst(rgx.para_attribs, "")
-        .replaceFirst(rgx.obj_cite_number_off_all, "");
+        .replaceFirst(rgx.object_number_off_all, "");
       auto t = object_notes_and_links_(obj_txt["munge"]);
       debug(munge) {
         writeln(__LINE__);
@@ -4345,9 +4345,9 @@ template SiSUdocAbstraction() {
         comp_obj_toc.typeinfo.is_of             = "para";
         comp_obj_toc.typeinfo.is_a              = "toc";
         comp_obj_toc.node.ocn                   = 0;
-        comp_obj_toc.node.obj_cite_number       = "";
-        comp_obj_toc.misc.obj_cite_number_off   = "";
-        comp_obj_toc.misc.obj_cite_number_type  = 0;
+        comp_obj_toc.node.object_number         = "";
+        comp_obj_toc.misc.object_number_off     = "";
+        comp_obj_toc.misc.object_number_type    = 0;
         comp_obj_toc.attrib.indent_hang         = indent["hang_position"];
         comp_obj_toc.attrib.indent_base         = indent["base_position"];
         comp_obj_toc.attrib.bullet              = false;
@@ -4365,9 +4365,9 @@ template SiSUdocAbstraction() {
         comp_obj_toc.typeinfo.is_of             = "para";
         comp_obj_toc.typeinfo.is_a              = "toc";
         comp_obj_toc.node.ocn                   = 0;
-        comp_obj_toc.node.obj_cite_number       = "";
-        comp_obj_toc.misc.obj_cite_number_off   = "";
-        comp_obj_toc.misc.obj_cite_number_type  = 0;
+        comp_obj_toc.node.object_number         = "";
+        comp_obj_toc.misc.object_number_off     = "";
+        comp_obj_toc.misc.object_number_type    = 0;
         comp_obj_toc.attrib.indent_hang         = indent["hang_position"];
         comp_obj_toc.attrib.indent_base         = indent["base_position"];
         comp_obj_toc.attrib.bullet              = false;
@@ -4381,9 +4381,9 @@ template SiSUdocAbstraction() {
       comp_obj_toc.typeinfo.is_of               = "para";
       comp_obj_toc.typeinfo.is_a                = "toc";
       comp_obj_toc.node.ocn                     = 0;
-      comp_obj_toc.node.obj_cite_number         = "";
-      comp_obj_toc.misc.obj_cite_number_off     = "";
-      comp_obj_toc.misc.obj_cite_number_type    = 0;
+      comp_obj_toc.node.object_number           = "";
+      comp_obj_toc.misc.object_number_off       = "";
+      comp_obj_toc.misc.object_number_type      = 0;
       comp_obj_toc.attrib.bullet                = false;
       comp_obj_toc.has.inline_links             = true;
       switch (obj_["lev_markup_number"].to!int) {
@@ -4712,7 +4712,7 @@ template SiSUdocAbstraction() {
           writeln(_obj_attrib["json"]);
           writeln(
             "is: ", oa_j["is"].str(),
-            "; obj_cite_number: ", oa_j["obj_cite_number"].integer()
+            "; object_number: ", oa_j["object_number"].integer()
           );
         }
       }
@@ -4893,7 +4893,7 @@ template SiSUdocAbstraction() {
         (oa_j.type == JSON_TYPE.OBJECT)
       );
       if (obj_is_ == "heading") {
-        oa_j.object["obj_cite_number"] = _comp_obj_heading.node.ocn;
+        oa_j.object["object_number"] = _comp_obj_heading.node.ocn;
         oa_j.object["lev_markup_number"] = _comp_obj_heading.node.heading_lev_markup;
         oa_j.object["lev_collapsed_number"] = _comp_obj_heading.node.heading_lev_collapsed;
         oa_j.object["heading_ptr"]
@@ -4901,7 +4901,7 @@ template SiSUdocAbstraction() {
         oa_j.object["doc_object_ptr"]
           = _comp_obj_heading.ptr.doc_object;
       }
-      oa_j.object["parent_obj_cite_number"] = _comp_obj_heading.node.parent_ocn;
+      oa_j.object["parent_object_number"] = _comp_obj_heading.node.parent_ocn;
       oa_j.object["parent_lev_markup_number"] = _comp_obj_heading.node.parent_lev_markup;
       _obj_attrib = oa_j.toString();
       return _obj_attrib;
@@ -4910,8 +4910,8 @@ template SiSUdocAbstraction() {
   /+ +/
   struct BookIndexNuggetHash {
     string main_term, sub_term, sub_term_bits;
-    int obj_cite_number_offset, obj_cite_number_endpoint;
-    string[] obj_cite_numbers;
+    int object_number_offset, object_number_endpoint;
+    string[] object_numbers;
     string[][string][string] bi;
     string[][string][string] hash_nugget;
     string[] bi_main_terms_split_arr;
@@ -4943,41 +4943,41 @@ template SiSUdocAbstraction() {
           auto bi_main_term_and_rest
             = bi_main_terms_content.split(rgx.bi_main_term_plus_rest_split);
           if (auto m = bi_main_term_and_rest[0].match(
-            rgx.bi_term_and_obj_cite_numbers_match)
+            rgx.bi_term_and_object_numbers_match)
           ) {
             main_term = m.captures[1].strip;
-            obj_cite_number_offset = m.captures[2].to!int;
-            obj_cite_number_endpoint=(obj_cite_digits.on + obj_cite_number_offset);
-            obj_cite_numbers ~= (obj_cite_digits.on.to!string ~ "-" ~ to!string(obj_cite_number_endpoint)
+            object_number_offset = m.captures[2].to!int;
+            object_number_endpoint=(obj_cite_digits.on + object_number_offset);
+            object_numbers ~= (obj_cite_digits.on.to!string ~ "-" ~ to!string(object_number_endpoint)
             ~ ":" ~ segment_anchor_tag);
           } else {
             main_term = bi_main_term_and_rest[0].strip;
-            obj_cite_numbers ~= obj_cite_digits.on.to!string
+            object_numbers ~= obj_cite_digits.on.to!string
             ~ ":" ~ segment_anchor_tag;
           }
-          bi[main_term]["_a"] ~= obj_cite_numbers;
-          obj_cite_numbers=null;
+          bi[main_term]["_a"] ~= object_numbers;
+          object_numbers=null;
           if (bi_main_term_and_rest.length > 1) {
             auto bi_sub_terms_split_arr
               = bi_main_term_and_rest[1].split(
-                rgx.bi_sub_terms_plus_obj_cite_number_offset_split
+                rgx.bi_sub_terms_plus_object_number_offset_split
               );
             foreach (sub_terms_bits; bi_sub_terms_split_arr) {
-              if (auto m = sub_terms_bits.match(rgx.bi_term_and_obj_cite_numbers_match)) {
+              if (auto m = sub_terms_bits.match(rgx.bi_term_and_object_numbers_match)) {
                 sub_term = m.captures[1].strip;
-                obj_cite_number_offset = m.captures[2].to!int;
-                obj_cite_number_endpoint=(obj_cite_digits.on + obj_cite_number_offset);
-                obj_cite_numbers ~= (obj_cite_digits.on.to!string ~ " - " ~ to!string(obj_cite_number_endpoint)
+                object_number_offset = m.captures[2].to!int;
+                object_number_endpoint=(obj_cite_digits.on + object_number_offset);
+                object_numbers ~= (obj_cite_digits.on.to!string ~ " - " ~ to!string(object_number_endpoint)
                 ~ ":" ~ segment_anchor_tag);
               } else {
                 sub_term = sub_terms_bits.strip;
-                obj_cite_numbers ~= to!string(obj_cite_digits.on)
+                object_numbers ~= to!string(obj_cite_digits.on)
                 ~ ":" ~ segment_anchor_tag;
               }
               if (!empty(sub_term)) {
-                bi[main_term][sub_term] ~= obj_cite_numbers;
+                bi[main_term][sub_term] ~= object_numbers;
               }
-              obj_cite_numbers=null;
+              object_numbers=null;
             }
           }
         }
@@ -5085,9 +5085,9 @@ template SiSUdocAbstraction() {
         comp_obj_heading_.typeinfo.is_a              = "heading";
         comp_obj_heading_.text                       = "Book Index";
         comp_obj_heading_.node.ocn                   = 0;
-        comp_obj_heading_.node.obj_cite_number       = "";
-        comp_obj_heading_.misc.obj_cite_number_off   = "";
-        comp_obj_heading_.misc.obj_cite_number_type  = 0;
+        comp_obj_heading_.node.object_number         = "";
+        comp_obj_heading_.misc.object_number_off     = "";
+        comp_obj_heading_.misc.object_number_type    = 0;
         comp_obj_heading_.tags.segment_anchor_tag    = "_part_book_index";
         comp_obj_heading_.node.marked_up_level       = "B";
         comp_obj_heading_.node.heading_lev_markup    = 1;
@@ -5105,9 +5105,9 @@ template SiSUdocAbstraction() {
         comp_obj_heading_.typeinfo.is_a              = "heading";
         comp_obj_heading_.text                       = "Index";
         comp_obj_heading_.node.ocn                   = 0;
-        comp_obj_heading_.node.obj_cite_number       = "";
-        comp_obj_heading_.misc.obj_cite_number_off   = "";
-        comp_obj_heading_.misc.obj_cite_number_type  = 0;
+        comp_obj_heading_.node.object_number         = "";
+        comp_obj_heading_.misc.object_number_off     = "";
+        comp_obj_heading_.misc.object_number_type    = 0;
         comp_obj_heading_.tags.segment_anchor_tag    = "bookindex";
         comp_obj_heading_.node.marked_up_level       = "1";
         comp_obj_heading_.node.heading_lev_markup    = 4;
@@ -5183,9 +5183,9 @@ template SiSUdocAbstraction() {
           comp_obj_para.typeinfo.is_a             = "bookindex";
           comp_obj_para.text                      = bi_tmp_scroll.to!string.strip;
           comp_obj_para.node.ocn                  = 0;
-          comp_obj_para.node.obj_cite_number      = "";
-          comp_obj_para.misc.obj_cite_number_off  = "";
-          comp_obj_para.misc.obj_cite_number_type = 0;
+          comp_obj_para.node.object_number        = "";
+          comp_obj_para.misc.object_number_off    = "";
+          comp_obj_para.misc.object_number_type   = 0;
           comp_obj_para.tags.anchor_tags          = bi_tmp_tags;
           comp_obj_para.attrib.indent_hang        = 0;
           comp_obj_para.attrib.indent_base        = 1;
@@ -5200,9 +5200,9 @@ template SiSUdocAbstraction() {
         comp_obj_heading_                            = comp_obj_heading_.init;
         comp_obj_heading_.text                       = "(skip) there is no Book Index";
         comp_obj_heading_.node.ocn                   = 0;
-        comp_obj_heading_.node.obj_cite_number       = "";
-        comp_obj_heading_.misc.obj_cite_number_off   = "";
-        comp_obj_heading_.misc.obj_cite_number_type  = 0;
+        comp_obj_heading_.node.object_number         = "";
+        comp_obj_heading_.misc.object_number_off     = "";
+        comp_obj_heading_.misc.object_number_type    = 0;
         comp_obj_heading_.node.marked_up_level       = "B";
         comp_obj_heading_.node.heading_lev_markup    = 1;
         comp_obj_heading_.node.heading_lev_collapsed = 1;
@@ -5315,9 +5315,9 @@ template SiSUdocAbstraction() {
         comp_obj_heading_.typeinfo.is_a              = "heading";
         comp_obj_heading_.text                       = "Endnotes";
         comp_obj_heading_.node.ocn                   = 0;
-        comp_obj_heading_.node.obj_cite_number       = "";
-        comp_obj_heading_.misc.obj_cite_number_off   = "";
-        comp_obj_heading_.misc.obj_cite_number_type  = 0;
+        comp_obj_heading_.node.object_number         = "";
+        comp_obj_heading_.misc.object_number_off     = "";
+        comp_obj_heading_.misc.object_number_type    = 0;
         comp_obj_heading_.tags.segment_anchor_tag    = "_part_endnotes";
         comp_obj_heading_.node.marked_up_level       = "B";
         comp_obj_heading_.node.heading_lev_markup    = 1;
@@ -5333,9 +5333,9 @@ template SiSUdocAbstraction() {
         comp_obj_heading_.typeinfo.is_a              = "heading";
         comp_obj_heading_.text                       = "Endnotes";
         comp_obj_heading_.node.ocn                   = 0;
-        comp_obj_heading_.node.obj_cite_number       = "";
-        comp_obj_heading_.misc.obj_cite_number_off   = "";
-        comp_obj_heading_.misc.obj_cite_number_type  = 0;
+        comp_obj_heading_.node.object_number         = "";
+        comp_obj_heading_.misc.object_number_off     = "";
+        comp_obj_heading_.misc.object_number_type    = 0;
         comp_obj_heading_.tags.segment_anchor_tag    = "endnotes";
         comp_obj_heading_.node.marked_up_level       = "1";
         comp_obj_heading_.node.heading_lev_markup    = 4;
@@ -5353,9 +5353,9 @@ template SiSUdocAbstraction() {
         comp_obj_heading_.typeinfo.is_a              = "heading";
         comp_obj_heading_.text                       = "(skip) there are no Endnotes";
         comp_obj_heading_.node.ocn                   = 0;
-        comp_obj_heading_.node.obj_cite_number       = "";
-        comp_obj_heading_.misc.obj_cite_number_off   = "";
-        comp_obj_heading_.misc.obj_cite_number_type  = 0;
+        comp_obj_heading_.node.object_number         = "";
+        comp_obj_heading_.misc.object_number_off     = "";
+        comp_obj_heading_.misc.object_number_type    = 0;
         comp_obj_heading_.node.marked_up_level       = "B";
         comp_obj_heading_.node.heading_lev_markup    = 1;
         comp_obj_heading_.node.heading_lev_collapsed = 1;
@@ -5371,9 +5371,9 @@ template SiSUdocAbstraction() {
         comp_obj_endnote_.typeinfo.is_of             = "para";
         comp_obj_endnote_.typeinfo.is_a              = "endnote";
         comp_obj_endnote_.node.ocn                   = 0;
-        comp_obj_heading_.node.obj_cite_number       = "";
-        comp_obj_heading_.misc.obj_cite_number_off   = "";
-        comp_obj_heading_.misc.obj_cite_number_type  = 0;
+        comp_obj_heading_.node.object_number         = "";
+        comp_obj_heading_.misc.object_number_off     = "";
+        comp_obj_heading_.misc.object_number_type    = 0;
         comp_obj_endnote_.attrib.indent_hang         = 0;
         comp_obj_endnote_.attrib.indent_base         = 0;
         comp_obj_endnote_.attrib.bullet              = false;
@@ -5522,23 +5522,23 @@ template SiSUdocAbstraction() {
       assert(obj_cite_digits.on.to!int >= 0); // should not be necessary
       if (lv7 > State.off) {
         p_["lev_markup_number"] = DocStructMarkupHeading.h_text_4;
-        p_["obj_cite_number"] = lv7;
+        p_["object_number"] = lv7;
       } else if (lv6 > State.off) {
         p_["lev_markup_number"] = DocStructMarkupHeading.h_text_3;
-        p_["obj_cite_number"] = lv6;
+        p_["object_number"] = lv6;
       } else if (lv5 > State.off) {
         p_["lev_markup_number"] = DocStructMarkupHeading.h_text_2;
-        p_["obj_cite_number"] = lv5;
+        p_["object_number"] = lv5;
       } else {
         p_["lev_markup_number"] = DocStructMarkupHeading.h_text_1;
-        p_["obj_cite_number"] = lv4;
+        p_["object_number"] = lv4;
       }
       ObjGenericComposite comp_obj_location;
       comp_obj_location                         = comp_obj_location.init;
       comp_obj_location.typeinfo.is_a           = is_;
       comp_obj_location.node.ocn                = obj_cite_digits.on;
       comp_obj_location.tags.segment_anchor_tag = segment_anchor_tag.to!string;
-      comp_obj_location.node.parent_ocn         = p_["obj_cite_number"];
+      comp_obj_location.node.parent_ocn         = p_["object_number"];
       comp_obj_location.node.parent_lev_markup  = p_["lev_markup_number"];
       debug(node) {
         if (lev_markup_number.match(rgx.levels_numbered_headings)) {
@@ -5610,7 +5610,7 @@ template SiSUdocAbstraction() {
         lv0 = obj_cite_digit;
         lv1=0; lv2=0; lv3=0; lv4=0; lv5=0; lv6=0; lv7=0;
         p_["lev_markup_number"] = 0;
-        p_["obj_cite_number"] = 0;
+        p_["object_number"] = 0;
         break;
       case 1:
         lv = DocStructMarkupHeading.h_sect_B;
@@ -5618,7 +5618,7 @@ template SiSUdocAbstraction() {
         lv2=0; lv3=0; lv4=0; lv5=0; lv6=0; lv7=0;
         p_["lev_markup_number"]
           = DocStructMarkupHeading.h_sect_A;
-        p_["obj_cite_number"] = lv0;
+        p_["object_number"] = lv0;
         break;
       case 2:
         lv = DocStructMarkupHeading.h_sect_C;
@@ -5626,7 +5626,7 @@ template SiSUdocAbstraction() {
         lv3=0; lv4=0; lv5=0; lv6=0; lv7=0;
         p_["lev_markup_number"]
           = DocStructMarkupHeading.h_sect_B;
-        p_["obj_cite_number"] = lv1;
+        p_["object_number"] = lv1;
         break;
       case 3:
         lv = DocStructMarkupHeading.h_sect_D;
@@ -5634,7 +5634,7 @@ template SiSUdocAbstraction() {
         lv4=0; lv5=0; lv6=0; lv7=0;
         p_["lev_markup_number"]
           = DocStructMarkupHeading.h_sect_C;
-        p_["obj_cite_number"] = lv2;
+        p_["object_number"] = lv2;
         break;
       case 4:
         lv = DocStructMarkupHeading.h_text_1;
@@ -5643,19 +5643,19 @@ template SiSUdocAbstraction() {
         if (lv3 > State.off) {
           p_["lev_markup_number"]
             = DocStructMarkupHeading.h_sect_D;
-          p_["obj_cite_number"] = lv3;
+          p_["object_number"] = lv3;
         } else if (lv2 > State.off) {
           p_["lev_markup_number"]
             = DocStructMarkupHeading.h_sect_C;
-          p_["obj_cite_number"] = lv2;
+          p_["object_number"] = lv2;
         } else if (lv1 > State.off) {
           p_["lev_markup_number"]
             = DocStructMarkupHeading.h_sect_B;
-          p_["obj_cite_number"] = lv1;
+          p_["object_number"] = lv1;
         } else {
           p_["lev_markup_number"]
             = DocStructMarkupHeading.h_sect_A;
-          p_["obj_cite_number"] = lv0;
+          p_["object_number"] = lv0;
         }
         break;
       case 5:
@@ -5664,7 +5664,7 @@ template SiSUdocAbstraction() {
         lv6=0; lv7=0;
         p_["lev_markup_number"]
           = DocStructMarkupHeading.h_text_1;
-        p_["obj_cite_number"] = lv4;
+        p_["object_number"] = lv4;
         break;
       case 6:
         lv = DocStructMarkupHeading.h_text_3;
@@ -5672,14 +5672,14 @@ template SiSUdocAbstraction() {
         lv7=0;
         p_["lev_markup_number"]
           = DocStructMarkupHeading.h_text_2;
-        p_["obj_cite_number"] = lv5;
+        p_["object_number"] = lv5;
         break;
       case 7:
         lv = DocStructMarkupHeading.h_text_4;
         lv7 = obj_cite_digit;
         p_["lev_markup_number"]
           = DocStructMarkupHeading.h_text_3;
-        p_["obj_cite_number"] = lv6;
+        p_["object_number"] = lv6;
         break;
       default:
         break;
@@ -5692,14 +5692,14 @@ template SiSUdocAbstraction() {
       _comp_obj_heading_.typeinfo.is_a                 = "heading";
       _comp_obj_heading_.text                          = _text.to!string.strip;
       _comp_obj_heading_.node.ocn                      = obj_cite_digits.on;
-      _comp_obj_heading_.node.obj_cite_number          = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
-      _comp_obj_heading_.misc.obj_cite_number_off      = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
-      _comp_obj_heading_.misc.obj_cite_number_type     = obj_cite_digits.type;
+      _comp_obj_heading_.node.object_number            = (obj_cite_digits.on==0)    ? "" : obj_cite_digits.on.to!string;
+      _comp_obj_heading_.misc.object_number_off        = (obj_cite_digits.off==0)   ? "" : obj_cite_digits.off.to!string;
+      _comp_obj_heading_.misc.object_number_type       = obj_cite_digits.type;
       _comp_obj_heading_.tags.segment_anchor_tag       = segment_anchor_tag.to!string;
       _comp_obj_heading_.node.marked_up_level          = lev;
       _comp_obj_heading_.node.heading_lev_markup       = (!(lev_markup_number.empty) ? lev_markup_number.to!int : 0);
       _comp_obj_heading_.node.heading_lev_collapsed    = (!(lev_collapsed_number.empty) ? lev_collapsed_number.to!int : 0);
-      _comp_obj_heading_.node.parent_ocn               = p_["obj_cite_number"];
+      _comp_obj_heading_.node.parent_ocn               = p_["object_number"];
       _comp_obj_heading_.node.parent_lev_markup        = p_["lev_markup_number"];
       _comp_obj_heading_.tags.heading_ancestors_text   = lv_ancestors_txt;
       _comp_obj_heading_.ptr.doc_object                = cntr_;