step2doc-reform_v0.0.2

1 files changed, 70 insertions, 70 deletions

diff --git a/org/ao_output_debugs.org b/org/ao_output_debugs.org
index 3f9b59f..c5f4482 100644
--- a/org/ao_output_debugs.org
+++ b/org/ao_output_debugs.org
@@ -29,10 +29,10 @@ debug(parent) {
         writefln(
           "%s%s node: %s heading: %s %s",
           scr_txt_marker["cyan"],
-          obj["ocn"],
-          " node: ", obj["node"],
-          " heading: ", obj["lvn"],
-          " ", obj["obj"],
+          obj["obj_cite_number"],
+          obj["node"],
+          obj["lev_markup_number"],
+          obj["obj"],
         );
       } else {
       }
@@ -54,7 +54,7 @@ debug(dumpdoc) {
     if (obj["use"] == "content") {
       writefln(
         "[%s][%s]\n%s",
-        obj["ocn"],
+        obj["obj_cite_number"],
         obj["is"],
         obj["obj"]
       );
@@ -77,7 +77,7 @@ debug(objects) {
       writefln(
         "%s* [%s][%s] %s%s",
         scr_txt_color["green"],
-        obj["ocn"],
+        obj["obj_cite_number"],
         obj["is"],
         scr_txt_color["off"],
         obj["obj"]
@@ -261,7 +261,7 @@ debug(bookindex) {
 #+BEGIN_SRC d
 debug(summary) {
   string[string] check = [
-    "last_ocn" : "NA [debug \"checkdoc\" not run]",
+    "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]",
   ];
 #+END_SRC
 *** (checkdoc)                                                     :checkdoc:
@@ -270,8 +270,8 @@ debug(summary) {
 debug(checkdoc) {
   foreach (obj; contents) {
     if (obj["use"] == "content") {
-      if (!empty(obj["ocn"])) {
-        check["last_ocn"] = obj["ocn"];
+      if (!empty(obj["obj_cite_number"])) {
+        check["last_obj_cite_number"] = obj["obj_cite_number"];
       }
     }
   }
@@ -293,7 +293,7 @@ debug(headings) {
         "%s%s~ [%s] %s",
         scr_txt_marker["yellow"],
         obj["lev"],
-        obj["ocn"],
+        obj["obj_cite_number"],
         // "[", obj["is"], "] ",
         obj["obj"]
       );
@@ -308,132 +308,132 @@ writefln(
   fn_src,
   "length contents array: ",
   contents.length,
-  "last ocn: ",
-  check["last_ocn"],
+  "last obj_cite_number: ",
+  check["last_obj_cite_number"],
   "length bookindex: ",
   bookindex_unordered_hashes.length,
   __FILE__,
   __LINE__,
 );
 #+END_SRC
-*** compare number of ocn for known sisu markup output (checkdoc)
+*** compare number of obj_cite_number for known sisu markup output (checkdoc)
 #+name: ao_output_debugs_summary
 #+BEGIN_SRC d
 debug(checkdoc) {
   if (auto mfn=match(fn_src, rgx.src_fn)) {
-    if (actions["assert"] == "yes") {
+    if (opt_action_bool["assertions"]) {
       switch (mfn.captures[2]) {
       case "live-manual.ssm":
-        assert(check["last_ocn"] ==
-          "1019","last ocn should be: 1019 (check test, document is frequently updated)"); // ok
+        assert(check["last_obj_cite_number"] ==
+          "1019","last obj_cite_number should be: 1019 (check test, document is frequently updated)"); // ok
         break;
       case "sisu_markup.sst":
-        assert(check["last_ocn"] ==
-          "297","last ocn should be: 297"); // ok
-        // assert(check["last_ocn"] == "297","last ocn should be: 297");
+        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"]);
         // notes for first divergance study sisu headings 247 250
-        // sisu has issue with code that contains heading 1~ which results in no ocn! ??
-        // sisu currently has incorrect last body ocn of 294!
+        // 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!
         // bug in sisu? attend
         break;
       // sisu-markup-samples:
       case "accelerando.charles_stross.sst":
-        assert(check["last_ocn"] ==
-          "2861","last ocn should be: 2861"); // ok
+        assert(check["last_obj_cite_number"] ==
+          "2861","last obj_cite_number expected to be: 2861 rather than " ~ check["last_obj_cite_number"]); // ok
         break;
       case "alices_adventures_in_wonderland.lewis_carroll.sst":
-        assert(check["last_ocn"] ==
-          "805","last ocn should be: 805"); // 808
+        assert(check["last_obj_cite_number"] ==
+          "805","last obj_cite_number expected to be: 805 rather than " ~ check["last_obj_cite_number"]); // 808
         break;
       case "autonomy_markup0.sst":
-        assert(check["last_ocn"] ==
-          "77","last ocn should be: 77"); // ok endnotes
-        // assert(check["last_ocn"] == "78","last ocn should be: 78");
+        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"]);
         break;
       case "content.cory_doctorow.sst":
-        assert(check["last_ocn"] ==
-          "953","last ocn should be: 953"); // 1007 way off, check ocn off switches
-        // assert(check["last_ocn"] == "953","last ocn should be: 953");
+        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"]);
         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_ocn"] ==
-          "905","last ocn should be: 905"); // 911
+        assert(check["last_obj_cite_number"] ==
+          "905","last obj_cite_number expected to be: 905 rather than " ~ check["last_obj_cite_number"]); // 911
         break;
       case "down_and_out_in_the_magic_kingdom.cory_doctorow.sst":
-        assert(check["last_ocn"] ==
-          "1417","last ocn should be: 1417"); // 1455 check ocn off switches
+        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
         break;
       case "for_the_win.cory_doctorow.sst":
-        assert(check["last_ocn"] ==
-          "3510","last ocn should be: 3510"); // 3569 check ocn off switches
+        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
         break;
       case "free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst":
-        assert(check["last_ocn"] ==
-          "1082","last ocn should be: 1082"); // check 1079 too few
+        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
         break;
       case "free_culture.lawrence_lessig.sst":
-        assert(check["last_ocn"] ==
-          "1330","last ocn should be: 1330"); // 1312
+        assert(check["last_obj_cite_number"] ==
+          "1330","last obj_cite_number expected to be: 1330 rather than " ~ check["last_obj_cite_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_ocn"] ==
-          "1559","last ocn should be: 1559"); // 1560, check ocn off switches, has endnotes so 2 too many
-        // assert(check["last_ocn"] == "1559","last ocn should be: 1559");
+        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"]);
         break;
       case "gpl2.fsf.sst":
-        assert(check["last_ocn"] ==
-          "65","last ocn should be: 65"); // ok endnotes? check
-        // assert(check["last_ocn"] == "66","last ocn should be: 66");
+        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"]);
         break;
       case "gpl3.fsf.sst":
-        assert(check["last_ocn"] ==
-          "123","last ocn should be: 123"); // ok
+        assert(check["last_obj_cite_number"] ==
+          "123","last obj_cite_number expected to be: 123 rather than " ~ check["last_obj_cite_number"]); // ok
         break;
       case "gullivers_travels.jonathan_swift.sst":
-        assert(check["last_ocn"] ==
-          "668","last ocn should be: 668"); // 674
+        assert(check["last_obj_cite_number"] ==
+          "668","last obj_cite_number expected to be: 668 rather than " ~ check["last_obj_cite_number"]); // 674
         break;
       case "little_brother.cory_doctorow.sst":
-        assert(check["last_ocn"] ==
-          "3130","last ocn should be: 3130"); // 3204, check ocn off switches
+        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
         break;
       case "the_cathedral_and_the_bazaar.eric_s_raymond.sst":
-        assert(check["last_ocn"] ==
-          "258","last ocn should be: 258"); // ok
+        assert(check["last_obj_cite_number"] ==
+          "258","last obj_cite_number expected to be: 258 rather than " ~ check["last_obj_cite_number"]); // ok
         break;
       case "the_public_domain.james_boyle.sst":
-        assert(check["last_ocn"] ==
-          "970","last ocn should be: 970"); // 978
+        assert(check["last_obj_cite_number"] ==
+          "970","last obj_cite_number expected to be: 970 rather than " ~ check["last_obj_cite_number"]); // 978
         break;
       case "the_wealth_of_networks.yochai_benkler.sst": // endnotes, bookindex
-        assert(check["last_ocn"] ==
-          "829","last ocn should be: 829"); // ok
-        // assert(check["last_ocn"] == "832","last ocn should be: 832");
+        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"]);
         // has endnotes and bookindex, issue with sisu.rb
         break;
       case "through_the_looking_glass.lewis_carroll.sst":
-        assert(check["last_ocn"] ==
-          "949","last ocn should be: 949"); // 955
+        assert(check["last_obj_cite_number"] ==
+          "949","last obj_cite_number expected to be: 949 rather than " ~ check["last_obj_cite_number"]); // 955
         break;
       case "two_bits.christopher_kelty.sst": // endnotes, bookindex, biblio
-        assert(check["last_ocn"] ==
-          "1190","last ocn should be: 1190"); // 1191
-        // assert(check["last_ocn"] == "1193","last ocn should be: 1193"); // 1191 ok?
+        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?
         // 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_ocn"] ==
-          "377","last ocn should be: 377"); // ok
+        assert(check["last_obj_cite_number"] ==
+          "377","last obj_cite_number expected to be: 377 rather than " ~ check["last_obj_cite_number"]); // ok
         break;
       case "viral_spiral.david_bollier.sst": // endnotes, bookindex
-        assert(check["last_ocn"] ==
-          "1078","last ocn should be: 1078"); // 1100
+        assert(check["last_obj_cite_number"] ==
+          "1078","last obj_cite_number expected to be: 1078 rather than " ~ check["last_obj_cite_number"]); // 1100
         // fixed ERROR! range violation!
         // error in bookindex ... (ch7 ... building the cc machine, an extra semi colon)
         break;
@@ -463,7 +463,7 @@ template SiSUoutputDebugs() {
       string[][string][string] bookindex_unordered_hashes,
       JSONValue[] biblio,
       string fn_src,
-      string[string] actions
+      bool[string] opt_action_bool
     ) {
       mixin RgxInit;
       mixin ScreenTxtColors;