1 files changed, 22 insertions, 20 deletions

diff --git a/src/sdp/meta/doc_debugs.d b/src/sdp/meta/doc_debugs.d
index 2b274a3..255ea92 100644
--- a/src/sdp/meta/doc_debugs.d
+++ b/src/sdp/meta/doc_debugs.d
@@ -37,7 +37,7 @@ template SiSUdebugs() {
         __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") {
@@ -60,14 +60,16 @@ template SiSUdebugs() {
         __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
+            );
+          }
         }
       }
     }
@@ -115,7 +117,7 @@ template SiSUdebugs() {
     }
     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) {
@@ -142,7 +144,7 @@ template SiSUdebugs() {
         }
       }
       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) {
@@ -401,7 +403,7 @@ template SiSUdebugs() {
         __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(
@@ -417,7 +419,7 @@ template SiSUdebugs() {
       }
     }
     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(
@@ -438,7 +440,7 @@ template SiSUdebugs() {
         __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(
@@ -458,10 +460,10 @@ template SiSUdebugs() {
       ];
     }
     debug(checkdoc) {
-      if ((doc_matters.opt_action.do_debug)) {
+      if ((doc_matters.opt.action.debug_do)) {
         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":
@@ -580,7 +582,7 @@ template SiSUdebugs() {
                 // 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;
               }
             }
@@ -591,11 +593,11 @@ template SiSUdebugs() {
             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);
                   }
                 }
               }