object_number, replaces object_cite_number in code

1 files changed, 67 insertions, 67 deletions

diff --git a/src/sdp/meta/doc_debugs.d b/src/sdp/meta/doc_debugs.d
index 60ad63f..f10411b 100644
--- a/src/sdp/meta/doc_debugs.d
+++ b/src/sdp/meta/doc_debugs.d
@@ -43,7 +43,7 @@ template SiSUdebugs() {
             if (obj.typeinfo.is_a == "heading") {
               writefln(
                 "%s node: %s heading: %s %s",
-                obj.obj_cite_number,
+                obj.object_number,
                 obj.node,
                 obj.heading_lev_markup,
                 obj.text,
@@ -64,7 +64,7 @@ template SiSUdebugs() {
           if (obj.typeinfo.of_part != "empty") {
             writefln(
               "[%s][%s]\n%s",
-              obj.obj_cite_number,
+              obj.object_number,
               obj.typeinfo.is_a,
               obj.text
             );
@@ -78,7 +78,7 @@ template SiSUdebugs() {
         foreach (obj; contents[key]) {
           writefln(
             "[%s][%s]\n%s",
-            obj.obj_cite_number,
+            obj.object_number,
             obj.typeinfo.is_a,
             obj.text
           );
@@ -107,7 +107,7 @@ template SiSUdebugs() {
         foreach (obj; contents[key]) {
           writefln(
             "[%s][%s]\n%s",
-            obj.obj_cite_number,
+            obj.object_number,
             obj.typeinfo.is_a,
             obj.text
           );
@@ -184,7 +184,7 @@ template SiSUdebugs() {
         foreach (obj; contents[key]) {
           writefln(
             "[%s][%s]\n%s",
-            obj.obj_cite_number,
+            obj.object_number,
             obj.typeinfo.is_a,
             obj.text
           );
@@ -197,7 +197,7 @@ template SiSUdebugs() {
         foreach (obj; contents[key]) {
           writefln(
             "[%s][%s]\n%s",
-            obj.obj_cite_number,
+            obj.object_number,
             obj.typeinfo.is_a,
             obj.text
           );
@@ -222,7 +222,7 @@ template SiSUdebugs() {
         foreach (obj; contents[key]) {
           writefln(
             "[%s][%s]\n%s",
-            obj.obj_cite_number,
+            obj.object_number,
             obj.typeinfo.is_a,
             obj.text
           );
@@ -239,7 +239,7 @@ template SiSUdebugs() {
         if (obj.typeinfo.of_part != "empty") {
           writefln(
             "* [%s][%s] %s",
-            obj.obj_cite_number,
+            obj.object_number,
             obj.typeinfo.is_a,
             obj.text
           );
@@ -406,7 +406,7 @@ template SiSUdebugs() {
             writefln(
               "%s~ [%s] %s %s",
               obj.marked_up_level,
-              obj.obj_cite_number,
+              obj.object_number,
               obj.anchor_tags,
               // "[", obj["is"], "] ",
               obj.text
@@ -442,7 +442,7 @@ template SiSUdebugs() {
             writefln(
               "%s~ [%s] %s",
               obj.marked_up_level,
-              obj.obj_cite_number,
+              obj.object_number,
               // "[", obj["is"], "] ",
               obj.text
             );
@@ -452,7 +452,7 @@ template SiSUdebugs() {
     }
     debug(summary) {
       string[string] check = [
-        "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]",
+        "last_object_number" : "NA [debug \"checkdoc\" not run]",
       ];
     }
     debug(checkdoc) {
@@ -463,117 +463,117 @@ template SiSUdebugs() {
               switch (mfn.captures[2]) {
               // live manual:
               case "live-manual.ssm":
-                assert(check["last_obj_cite_number"] ==
-                  "1019","last obj_cite_number should be: 1019 (check test, document is frequently updated)"); // ok
+                assert(check["last_object_number"] ==
+                  "1019","last object_number should be: 1019 (check test, document is frequently updated)"); // ok
                 break;
               // sisu_markup:
               case "sisu_markup.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "297","last obj_cite_number expected to be: 297 rather than " ~ check["last_obj_cite_number"]); // ok
-                // assert(check["last_obj_cite_number"] == "297","last obj_cite_number expected to be: 297 rather than " ~ check["last_obj_cite_number"]);
+                assert(check["last_object_number"] ==
+                  "297","last object_number expected to be: 297 rather than " ~ check["last_object_number"]); // ok
+                // assert(check["last_object_number"] == "297","last object_number expected to be: 297 rather than " ~ check["last_object_number"]);
                 // notes for first divergance study sisu headings 247 250
-                // sisu has issue with code that contains heading 1~ which results in no obj_cite_number! ??
-                // sisu currently has incorrect last body obj_cite_number of 294!
+                // sisu has issue with code that contains heading 1~ which results in no object_number! ??
+                // sisu currently has incorrect last body object_number of 294!
                 // bug in sisu? attend
                 break;
               // sisu-markup-samples:
               case "accelerando.charles_stross.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "2861","last obj_cite_number expected to be: 2861 rather than " ~ check["last_obj_cite_number"]); // ok
+                assert(check["last_object_number"] ==
+                  "2861","last object_number expected to be: 2861 rather than " ~ check["last_object_number"]); // ok
                 break;
               case "alices_adventures_in_wonderland.lewis_carroll.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "805","last obj_cite_number expected to be: 805 rather than " ~ check["last_obj_cite_number"]); // 808
+                assert(check["last_object_number"] ==
+                  "805","last object_number expected to be: 805 rather than " ~ check["last_object_number"]); // 808
                 break;
               case "autonomy_markup0.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "77","last obj_cite_number expected to be: 77 rather than " ~ check["last_obj_cite_number"]); // ok endnotes
-                // assert(check["last_obj_cite_number"] == "78","last obj_cite_number expected to be: 78 rather than " ~ check["last_obj_cite_number"]);
+                assert(check["last_object_number"] ==
+                  "77","last object_number expected to be: 77 rather than " ~ check["last_object_number"]); // ok endnotes
+                // assert(check["last_object_number"] == "78","last object_number expected to be: 78 rather than " ~ check["last_object_number"]);
                 break;
               case "content.cory_doctorow.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "953","last obj_cite_number expected to be: 953 rather than " ~ check["last_obj_cite_number"]); // 1007 way off, check obj_cite_number off switches
-                // assert(check["last_obj_cite_number"] == "953","last obj_cite_number expected to be: 953 rather than " ~ check["last_obj_cite_number"]);
+                assert(check["last_object_number"] ==
+                  "953","last object_number expected to be: 953 rather than " ~ check["last_object_number"]); // 1007 way off, check object_number off switches
+                // assert(check["last_object_number"] == "953","last object_number expected to be: 953 rather than " ~ check["last_object_number"]);
                 break;
               case "democratizing_innovation.eric_von_hippel.sst":
                 // fixed ERROR! range violation, broken check! endnotes, bookindex, biblio
                 // error in bookindex ... (ch1; ch6; ch8 )
-                assert(check["last_obj_cite_number"] ==
-                  "905","last obj_cite_number expected to be: 905 rather than " ~ check["last_obj_cite_number"]); // 911
+                assert(check["last_object_number"] ==
+                  "905","last object_number expected to be: 905 rather than " ~ check["last_object_number"]); // 911
                 break;
               case "down_and_out_in_the_magic_kingdom.cory_doctorow.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "1417","last obj_cite_number expected to be: 1417 rather than " ~ check["last_obj_cite_number"]); // 1455 check obj_cite_number off switches
+                assert(check["last_object_number"] ==
+                  "1417","last object_number expected to be: 1417 rather than " ~ check["last_object_number"]); // 1455 check object_number off switches
                 break;
               case "for_the_win.cory_doctorow.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "3510","last obj_cite_number expected to be: 3510 rather than " ~ check["last_obj_cite_number"]); // 3569 check obj_cite_number off switches
+                assert(check["last_object_number"] ==
+                  "3510","last object_number expected to be: 3510 rather than " ~ check["last_object_number"]); // 3569 check object_number off switches
                 break;
               case "free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "1082","last obj_cite_number expected to be: 1082 rather than " ~ check["last_obj_cite_number"]); // check 1079 too few
+                assert(check["last_object_number"] ==
+                  "1082","last object_number expected to be: 1082 rather than " ~ check["last_object_number"]); // check 1079 too few
                 break;
               case "free_culture.lawrence_lessig.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "1330","last obj_cite_number expected to be: 1330 rather than " ~ check["last_obj_cite_number"]); // 1312
+                assert(check["last_object_number"] ==
+                  "1330","last object_number expected to be: 1330 rather than " ~ check["last_object_number"]); // 1312
                 // fixed ERROR! range violation, broken check!
                 // error in bookindex ... sections piracy (ch1) & property (ch10 market concentration) fixed
                 break;
               case "free_for_all.peter_wayner.sst": // endnotes, bookindex, biblio
-                assert(check["last_obj_cite_number"] ==
-                  "1559","last obj_cite_number expected to be: 1559 rather than " ~ check["last_obj_cite_number"]); // 1560, check obj_cite_number off switches, has endnotes so 2 too many
-                // assert(check["last_obj_cite_number"] == "1559","last obj_cite_number expected to be: 1559 rather than " ~ check["last_obj_cite_number"]);
+                assert(check["last_object_number"] ==
+                  "1559","last object_number expected to be: 1559 rather than " ~ check["last_object_number"]); // 1560, check object_number off switches, has endnotes so 2 too many
+                // assert(check["last_object_number"] == "1559","last object_number expected to be: 1559 rather than " ~ check["last_object_number"]);
                 break;
               case "gpl2.fsf.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "65","last obj_cite_number expected to be: 65 rather than " ~ check["last_obj_cite_number"]); // ok endnotes? check
-                // assert(check["last_obj_cite_number"] == "66","last obj_cite_number expected to be: 66 rather than " ~ check["last_obj_cite_number"]);
+                assert(check["last_object_number"] ==
+                  "65","last object_number expected to be: 65 rather than " ~ check["last_object_number"]); // ok endnotes? check
+                // assert(check["last_object_number"] == "66","last object_number expected to be: 66 rather than " ~ check["last_object_number"]);
                 break;
               case "gpl3.fsf.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "123","last obj_cite_number expected to be: 123 rather than " ~ check["last_obj_cite_number"]); // ok
+                assert(check["last_object_number"] ==
+                  "123","last object_number expected to be: 123 rather than " ~ check["last_object_number"]); // ok
                 break;
               case "gullivers_travels.jonathan_swift.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "668","last obj_cite_number expected to be: 668 rather than " ~ check["last_obj_cite_number"]); // 674
+                assert(check["last_object_number"] ==
+                  "668","last object_number expected to be: 668 rather than " ~ check["last_object_number"]); // 674
                 break;
               case "little_brother.cory_doctorow.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "3130","last obj_cite_number expected to be: 3130 rather than " ~ check["last_obj_cite_number"]); // 3204, check obj_cite_number off switches
+                assert(check["last_object_number"] ==
+                  "3130","last object_number expected to be: 3130 rather than " ~ check["last_object_number"]); // 3204, check object_number off switches
                 break;
               case "the_cathedral_and_the_bazaar.eric_s_raymond.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "258","last obj_cite_number expected to be: 258 rather than " ~ check["last_obj_cite_number"]); // ok
+                assert(check["last_object_number"] ==
+                  "258","last object_number expected to be: 258 rather than " ~ check["last_object_number"]); // ok
                 break;
               case "the_public_domain.james_boyle.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "970","last obj_cite_number expected to be: 970 rather than " ~ check["last_obj_cite_number"]); // 978
+                assert(check["last_object_number"] ==
+                  "970","last object_number expected to be: 970 rather than " ~ check["last_object_number"]); // 978
                 break;
               case "the_wealth_of_networks.yochai_benkler.sst": // endnotes, bookindex
-                assert(check["last_obj_cite_number"] ==
-                  "829","last obj_cite_number expected to be: 829 rather than " ~ check["last_obj_cite_number"]); // ok
-                // assert(check["last_obj_cite_number"] == "832","last obj_cite_number expected to be: 832 rather than " ~ check["last_obj_cite_number"]);
+                assert(check["last_object_number"] ==
+                  "829","last object_number expected to be: 829 rather than " ~ check["last_object_number"]); // ok
+                // assert(check["last_object_number"] == "832","last object_number expected to be: 832 rather than " ~ check["last_object_number"]);
                 // has endnotes and bookindex, issue with sisu.rb
                 break;
               case "through_the_looking_glass.lewis_carroll.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "949","last obj_cite_number expected to be: 949 rather than " ~ check["last_obj_cite_number"]); // 955
+                assert(check["last_object_number"] ==
+                  "949","last object_number expected to be: 949 rather than " ~ check["last_object_number"]); // 955
                 break;
               case "two_bits.christopher_kelty.sst": // endnotes, bookindex, biblio
-                assert(check["last_obj_cite_number"] ==
-                  "1190","last obj_cite_number expected to be: 1190 rather than " ~ check["last_obj_cite_number"]); // 1191
-                // assert(check["last_obj_cite_number"] == "1193","last obj_cite_number expected to be: 1193 rather than " ~ check["last_obj_cite_number"]); // 1191 ok?
+                assert(check["last_object_number"] ==
+                  "1190","last object_number expected to be: 1190 rather than " ~ check["last_object_number"]); // 1191
+                // assert(check["last_object_number"] == "1193","last object_number expected to be: 1193 rather than " ~ check["last_object_number"]); // 1191 ok?
                 // has endnotes and bookindex, issue with sisu.rb
                 break;
                 // fixed ERROR! range violation!
                 // error in bookindex ... (ch3 the movement)
               case "un_contracts_international_sale_of_goods_convention_1980.sst":
-                assert(check["last_obj_cite_number"] ==
-                  "377","last obj_cite_number expected to be: 377 rather than " ~ check["last_obj_cite_number"]); // ok
+                assert(check["last_object_number"] ==
+                  "377","last object_number expected to be: 377 rather than " ~ check["last_object_number"]); // ok
                 break;
               case "viral_spiral.david_bollier.sst": // endnotes, bookindex
-                assert(check["last_obj_cite_number"] ==
-                  "1078","last obj_cite_number expected to be: 1078 rather than " ~ check["last_obj_cite_number"]); // 1100
+                assert(check["last_object_number"] ==
+                  "1078","last object_number expected to be: 1078 rather than " ~ check["last_object_number"]); // 1100
                 // fixed ERROR! range violation!
                 // error in bookindex ... (ch7 ... building the cc machine, an extra semi colon)
                 break;
@@ -643,7 +643,7 @@ template SiSUdebugs() {
               foreach (obj; contents[key]) {
                 writefln(
                   "[%s][%s]\n%s",
-                  obj.obj_cite_number,
+                  obj.object_number,
                   obj.typeinfo.is_a,
                   obj.text
                 );