0.10.0 generic object (ObjGenericComposite), removed "object_set"

1 files changed, 22 insertions, 55 deletions

diff --git a/org/ao_output_debugs.org b/org/ao_output_debugs.org
index bea972e..28fcef2 100644
--- a/org/ao_output_debugs.org
+++ b/org/ao_output_debugs.org
@@ -13,7 +13,7 @@
 #+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
 
 [[./sdp.org][sdp]]  [[./][org/]]
-* 0. Code Outline / Structure (tangles)                              :tangle:
+* 0. Code Skeleton / Outline / Structure (tangles)                   :tangle:
 ** code structure:                                          :ao_output_debugs.d:
 
 #+name: tangle_ao_output_debugs
@@ -74,8 +74,8 @@ debug(parent) {
             "%s node: %s heading: %s %s",
             obj.obj_cite_number,
             obj.node,
-            obj.lev_int_markup,
-            obj.object,
+            obj.heading_lev_markup,
+            obj.text,
           );
         }
       }
@@ -101,7 +101,7 @@ debug(dumpdoc) {
         "[%s][%s]\n%s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -120,11 +120,11 @@ void out_toc(S)(
   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
       );
     }
   }
@@ -144,7 +144,7 @@ void out_endnotes(S)(
       writefln(
         "[%s]\n%s",
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -165,7 +165,7 @@ void out_bookindex(S)(
         "[%s][%s]\n%s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -185,7 +185,7 @@ debug(section_head) {
         "[%s][%s]\n%s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -235,7 +235,7 @@ debug(section_body) {
         "[%s][%s]\n%s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -286,7 +286,7 @@ debug(section_glossary) {
         "[%s][%s]\n%s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -305,7 +305,7 @@ debug(section_bibliography) {
         "[%s][%s]\n%s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -356,7 +356,7 @@ debug(blurb_section) {
         "[%s][%s]\n%s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -381,7 +381,7 @@ debug(objects) {
         "* [%s][%s] %s",
         obj.obj_cite_number,
         obj.is_a,
-        obj.object
+        obj.text
       );
     }
   }
@@ -564,11 +564,11 @@ debug(anchor) {
       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
         );
       }
     }
@@ -581,48 +581,15 @@ debug(anchor) {
 #+name: ao_output_debugs
 #+BEGIN_SRC d
 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,
         );
       }
     }
@@ -646,10 +613,10 @@ debug(headings) {
       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
         );
       }
     }