1 files changed, 21 insertions, 54 deletions

diff --git a/src/sdp/ao_output_debugs.d b/src/sdp/ao_output_debugs.d
index c6e8ac7..e4eaccb 100644
--- a/src/sdp/ao_output_debugs.d
+++ b/src/sdp/ao_output_debugs.d
@@ -32,8 +32,8 @@ template SiSUoutputDebugs() {
                   "%s node: %s heading: %s %s",
                   obj.obj_cite_number,
                   obj.node,
-                  obj.lev_int_markup,
-                  obj.object,
+                  obj.heading_lev_markup,
+                  obj.text,
                 );
               }
             }
@@ -53,7 +53,7 @@ template SiSUoutputDebugs() {
               "[%s][%s]\n%s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -65,11 +65,11 @@ template SiSUoutputDebugs() {
         if (contents[key].length > 1) {
           string indent_spaces;
           foreach (obj; contents[key]) {
-            indent_spaces=markup.indent_by_spaces_provided(obj.para_attrib.indent_start);
+            indent_spaces=markup.indent_by_spaces_provided(obj.indent_hang);
             writefln(
               "%s%s",
               indent_spaces,
-              obj.object
+              obj.text
             );
           }
         }
@@ -83,7 +83,7 @@ template SiSUoutputDebugs() {
             writefln(
               "[%s]\n%s",
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -98,7 +98,7 @@ template SiSUoutputDebugs() {
               "[%s][%s]\n%s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -111,7 +111,7 @@ template SiSUoutputDebugs() {
               "[%s][%s]\n%s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -136,7 +136,7 @@ template SiSUoutputDebugs() {
               "[%s][%s]\n%s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -161,7 +161,7 @@ template SiSUoutputDebugs() {
               "[%s][%s]\n%s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -174,7 +174,7 @@ template SiSUoutputDebugs() {
               "[%s][%s]\n%s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -199,7 +199,7 @@ template SiSUoutputDebugs() {
               "[%s][%s]\n%s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -217,7 +217,7 @@ template SiSUoutputDebugs() {
               "* [%s][%s] %s",
               obj.obj_cite_number,
               obj.is_a,
-              obj.object
+              obj.text
             );
           }
         }
@@ -382,59 +382,26 @@ template SiSUoutputDebugs() {
             if (obj.is_a == "heading") {
               writefln(
                 "%s~ [%s] %s %s",
-                obj.heading_attrib.lev,
+                obj.marked_up_level,
                 obj.obj_cite_number,
                 obj.anchor_tags,
                 // "[", obj["is"], "] ",
-                obj.object
+                obj.text
               );
             }
           }
         }
       }
       debug(heading) {                         // heading
-        string spc;
         foreach (k; document_section_keys_sequenced["seg"]) {
           foreach (o; contents[k]) {
             if (o.is_a == "heading") {
-              switch (o.heading_attrib.lev_int_markup) {
-              case 0:
-                spc="";
-                break;
-              case 1:
-                spc="  ";
-                break;
-              case 2:
-                spc="    ";
-                break;
-              case 3:
-                spc="      ";
-                break;
-              case 4:
-                spc="        ";
-                break;
-              case 5:
-                spc="          ";
-                break;
-              case 6:
-                spc="            ";
-                break;
-              case 7:
-                spc="              ";
-                break;
-              case 8:
-                spc="                ";
-                break;
-              default:
-                spc="";
-                break;
-              }
               writefln(
                 "%s* %s\n                (markup level: %s; collapsed level: %s)",
-                spc,
-                strip(o.object),
-                o.heading_attrib.lev_int_markup,
-                o.heading_attrib.lev_int_collapsed
+                replicate("  ", o.heading_lev_markup),
+                strip(o.text),
+                o.heading_lev_markup,
+                o.heading_lev_collapsed,
               );
             }
           }
@@ -456,10 +423,10 @@ template SiSUoutputDebugs() {
               if (obj.is_a == "heading") {
                 writefln(
                   "%s~ [%s] %s",
-                  obj.heading_attrib.lev,
+                  obj.marked_up_level,
                   obj.obj_cite_number,
                   // "[", obj["is"], "] ",
-                  obj.object
+                  obj.text
                 );
               }
             }