1 files changed, 22 insertions, 20 deletions

diff --git a/org/meta_debugs.org b/org/meta_debugs.org
index c381ebf..f623076 100644
--- a/org/meta_debugs.org
+++ b/org/meta_debugs.org
@@ -34,7 +34,7 @@ template SiSUdebugs() {
     <<initialize>>
     <<meta_output_debugs>>
     debug(checkdoc) {
-      if ((doc_matters.opt_action.do_debug)) {
+      if ((doc_matters.opt.action.debug_do)) {
         <<meta_output_debugs_summary>>
         <<meta_output_debugs_checkdoc>>
       }
@@ -87,7 +87,7 @@ debug(parent) {
     __FILE__,
     __LINE__,
   );
-  foreach (key; doc_matters.keys_seq.seg) {
+  foreach (key; doc_matters.xml.keys_seq.seg) {
     foreach (obj; contents[key]) {
       if (obj.of_part != "empty") {
         if (obj.is_a == "heading") {
@@ -116,14 +116,16 @@ debug(dumpdoc) {
     __FILE__,
     __LINE__,
   );
-  foreach (obj; contents[key]) {
-    if (obj.of_part != "empty") {
-      writefln(
-        "[%s][%s]\n%s",
-        obj.obj_cite_number,
-        obj.is_a,
-        obj.text
-      );
+  if (key.length > 0) {
+    foreach (obj; contents[key]) {
+      if (obj.of_part != "empty") {
+        writefln(
+          "[%s][%s]\n%s",
+          obj.obj_cite_number,
+          obj.is_a,
+          obj.text
+        );
+      }
     }
   }
 }
@@ -138,11 +140,11 @@ debug(checkdoc) {
     auto return ref const S  contents,
     auto return ref T        doc_matters,
   ) {
-    foreach (key; doc_matters.keys_seq.seg) {
+    foreach (key; doc_matters.xml.keys_seq.seg) {
       if (contents[key].length > 1) {
         foreach (obj; contents[key]) {
           if (obj.heading_lev_markup == 4) {
-            writeln(obj.ptr_html_segnames, ". (", doc_matters.segnames[obj.ptr_html_segnames], ") -> ",  obj.text);
+            writeln(obj.ptr_html_segnames, ". (", doc_matters.xml.segnames[obj.ptr_html_segnames], ") -> ",  obj.text);
           }
         }
       }
@@ -305,7 +307,7 @@ debug(section_body) {
 #+BEGIN_SRC d
 debug(toc_nav_dom) {
   enum DomTags { none, open, close, close_and_open, open_still, }
-  foreach (sect; doc_matters.keys_seq.seg) {
+  foreach (sect; doc_matters.xml.keys_seq.seg) {
     foreach (obj; contents[sect]) {
       if (obj.is_a == "heading") {
         foreach_reverse (k; 0 .. 7) {
@@ -332,7 +334,7 @@ debug(toc_nav_dom) {
     }
   }
   writeln("--------------------");
-  foreach (sect; doc_matters.keys_seq.seg) {
+  foreach (sect; doc_matters.xml.keys_seq.seg) {
     foreach (obj; contents[sect]) {
       if (obj.is_a == "heading") {
         foreach_reverse (k; 0 .. 7) {
@@ -665,7 +667,7 @@ debug(anchor) {
     __FILE__,
     __LINE__,
   );
-  foreach (k; doc_matters.keys_seq.seg) {
+  foreach (k; doc_matters.xml.keys_seq.seg) {
     foreach (obj; contents[k]) {
       if (obj.is_a == "heading") {
         writefln(
@@ -687,7 +689,7 @@ debug(anchor) {
 #+name: meta_output_debugs
 #+BEGIN_SRC d
 debug(heading) {                         // heading
-  foreach (k; doc_matters.keys_seq.seg) {
+  foreach (k; doc_matters.xml.keys_seq.seg) {
     foreach (o; contents[k]) {
       if (o.is_a == "heading") {
         writefln(
@@ -714,7 +716,7 @@ debug(headings) {
     __FILE__,
     __LINE__,
   );
-  foreach (k; doc_matters.keys_seq.seg) {
+  foreach (k; doc_matters.xml.keys_seq.seg) {
     foreach (obj; contents[k]) {
       if (obj.is_a == "heading") {
         writefln(
@@ -744,8 +746,8 @@ debug(summary) {
 #+name: meta_output_debugs_summary
 #+BEGIN_SRC d
 debug(checkdoc) {
-  if (auto mfn=match(doc_matters.source_filename, rgx.src_fn)) {
-    if (doc_matters.opt_action.assertions) {
+  if (auto mfn=match(doc_matters.src.filename, rgx.src_fn)) {
+    if (doc_matters.opt.action.assertions) {
       switch (mfn.captures[2]) {
       // live manual:
       case "live-manual.ssm":
@@ -864,7 +866,7 @@ debug(checkdoc) {
         // error in bookindex ... (ch7 ... building the cc machine, an extra semi colon)
         break;
       default:
-        writeln(doc_matters.source_filename);
+        writeln(doc_matters.src.filename);
         break;
       }
     }