0.26.3 object info changes

1 files changed, 49 insertions, 49 deletions

diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index c7b6571..8348870 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -446,7 +446,7 @@ auto html_heading(O)(
   string o = format(q"¶<p class="%s"><b>
       %s
     </b></p>¶",
-      obj.is_a,
+      obj.typeinfo.is_a,
       _txt,
     );
   return o;
@@ -465,10 +465,10 @@ auto html_heading(O)(
   o = format(q"¶<h%s class="%s">
       %s
     </h%s>¶",
-      obj.heading_lev_markup,
-      obj.is_a,
+      obj.node.heading_lev_markup,
+      obj.typeinfo.is_a,
       _txt,
-      obj.heading_lev_markup,
+      obj.node.heading_lev_markup,
     );
   return o;
 }
@@ -482,13 +482,13 @@ auto html_para(O)(
   auto return ref const O    obj,
 ) {
   string _txt = munge_html(obj);
-  _txt = (obj.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
+  _txt = (obj.attrib.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
   string o = format(q"¶<p class="%s" indent="h%si%s">
     %s
   </p>¶",
-      obj.is_a,
-      obj.indent_hang,
-      obj.indent_base,
+      obj.typeinfo.is_a,
+      obj.attrib.indent_hang,
+      obj.attrib.indent_base,
       _txt
     );
   return o;
@@ -506,7 +506,7 @@ auto html_quote(O)(
   string o = format(q"¶<p class="%s">
     %s
   </p>¶",
-      obj.is_a,
+      obj.typeinfo.is_a,
       _txt
     );
   return o;
@@ -524,7 +524,7 @@ auto html_group(O)(
   string o = format(q"¶<p class="%s">
     %s
   </p>¶",
-      obj.is_a,
+      obj.typeinfo.is_a,
       _txt
     );
   return o;
@@ -541,7 +541,7 @@ auto html_block(O)(
   string _txt = munge_html(obj);
   string o = format(q"¶
   <p class="%s">%s</p>¶",
-      obj.is_a,
+      obj.typeinfo.is_a,
       _txt.stripRight
     );
   return o;
@@ -557,7 +557,7 @@ auto html_verse(O)(
 ) {
   string _txt = munge_html(obj);
   string o = format(q"¶<p class="%s">%s</p>¶",
-      obj.is_a,
+      obj.typeinfo.is_a,
       _txt
     );
   return o;
@@ -573,7 +573,7 @@ auto html_code(O)(
 ) {
   string _txt = html_special_characters_code(obj.text);
   string o = format(q"¶<p class="%s">%s</p>¶",
-      obj.is_a,
+      obj.typeinfo.is_a,
       _txt
     );
   return o;
@@ -603,14 +603,14 @@ auto html_table(O)(
           && (_table_rows.length <= row_idx+2)) { // check row_idx+2 (rather than == ++row_idx)
             _tablenote ~= cell;
           } else {
-            string _col_is = (row_idx == 0 && obj.table_heading) ? "th" : "td";
+            string _col_is = (row_idx == 0 && obj.table.heading) ? "th" : "td";
             string _align = ("style=\"text-align:"
-            ~ ((obj.table_column_aligns[col_idx] == "l")
+            ~ ((obj.table.column_aligns[col_idx] == "l")
             ? "left\"" : "right\""));
             _table ~= "<"
               ~ _col_is
               ~ " width=\""
-              ~ obj.table_column_widths[col_idx].to!string
+              ~ obj.table.column_widths[col_idx].to!string
               ~ "%\" "
               ~ _align
               ~ ">";
@@ -638,7 +638,7 @@ auto html_table(O)(
     </table>
     %s
   </p>¶",
-    obj.is_a,
+    obj.typeinfo.is_a,
     _txt,
     _note
   );
@@ -925,7 +925,7 @@ auto table(O)(
 }
 #+END_SRC
 
-** 4. loop, identify, load - loop template
+** 4. ↻ loop, identify, load - loop template
 
 #+name: sqlite_objects_loop
 #+BEGIN_SRC d
@@ -935,32 +935,32 @@ string doc_text;
 string[] _insert_doc_objects;
 foreach (part; doc_matters.xml.keys_seq.sql) {
   foreach (obj; doc_abstraction[part]) {
-    switch (obj.of_part) {
+    switch (obj.typeinfo.of_part) {
     case "frontmatter":              assert(part == "head", part);
-      switch (obj.is_of) {
+      switch (obj.typeinfo.is_of) {
       case "para":
-        switch (obj.is_a) {
+        switch (obj.typeinfo.is_a) {
         case "heading":
           obj_txt = format_and_sqlite_load.heading(obj);
           break;
         default:
           if ((doc_matters.opt.action.debug_do)) {
-            writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+            writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
           }
           break;
         }
         break;
       default:
         if ((doc_matters.opt.action.debug_do)) {
-          writeln(__FILE__, ":", __LINE__, ": ", obj.is_of);
+          writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
         }
         break;
       }
       break;
     case "body": //                    assert(part == "body", part); // TODO broken
-      switch (obj.is_of) {
+      switch (obj.typeinfo.is_of) {
       case "para":
-        switch (obj.is_a) {
+        switch (obj.typeinfo.is_a) {
         case "heading":
           debug (asserts) { // TODO consider and fix or remove
             if (part != "body") {
@@ -974,13 +974,13 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
           break;
         default:
           if ((doc_matters.opt.action.debug_do)) {
-            writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+            writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
           }
           break;
         }
         break;
       case "block":
-        switch (obj.is_a) {
+        switch (obj.typeinfo.is_a) {
         case "quote":
           obj_txt = format_and_sqlite_load.quote(obj);
           break;
@@ -1003,23 +1003,23 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
           break;
         default:
           if ((doc_matters.opt.action.debug_do)) {
-            writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+            writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
           }
           break;
         }
         break;
       default:
         if ((doc_matters.opt.action.debug_do)) {
-          writeln(__FILE__, ":", __LINE__, ": ", obj.is_of);
+          writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
         }
         break;
       }
       break;
     case "backmatter":
       assert(part == "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail", part);
-      switch (obj.is_of) {
+      switch (obj.typeinfo.is_of) {
       case "para":
-        switch (obj.is_a) {
+        switch (obj.typeinfo.is_a) {
         case "heading":
           obj_txt = format_and_sqlite_load.heading(obj);
           break;
@@ -1037,14 +1037,14 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
           break;
         default:
           if ((doc_matters.opt.action.debug_do)) {
-            writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+            writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
           }
           break;
         }
         break;
       default:
         if ((doc_matters.opt.action.debug_do)) {
-          writeln(__FILE__, ":", __LINE__, ": ", obj.is_of);
+          writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of);
         }
         break;
       }
@@ -1053,28 +1053,28 @@ foreach (part; doc_matters.xml.keys_seq.sql) {
       break;
     default:
       if ((doc_matters.opt.action.debug_do)) {
-        writeln(__FILE__, ":", __LINE__, ": ", obj.of_part); // check where empty value could come from
-        writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+        writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.of_part); // check where empty value could come from
+        writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
         writeln(__FILE__, ":", __LINE__, ": ", obj.text); // check where empty value could come from
       }
       break;
     }
-    if (obj.is_a == "heading") {
+    if (obj.typeinfo.is_a == "heading") {
       if ((doc_matters.opt.action.verbose)) {
         writeln(
-          "markup: ", obj.heading_lev_markup,
-          "> ", obj.dom_markedup,
-          "; collapsed: ", obj.heading_lev_collapsed,
-          "> ", obj.dom_collapsed,
-          "; ocn: ", obj.ocn,
-          " node: ", obj.node,
-          "; parent: ", obj.parent_lev_markup,
-          "; ocn: ", obj.parent_ocn,
+          "markup: ", obj.node.heading_lev_markup,
+          "> ", obj.node.dom_markedup,
+          "; collapsed: ", obj.node.heading_lev_collapsed,
+          "> ", obj.node.dom_collapsed,
+          "; ocn: ", obj.node.ocn,
+          " node: ", obj.node.node,
+          "; parent: ", obj.node.parent_lev_markup,
+          "; ocn: ", obj.node.parent_ocn,
           "; ",
         );
       }
     }
-    if (!(obj.is_a == "comment")) {
+    if (!(obj.typeinfo.is_a == "comment")) {
       _insert_doc_objects ~= insertDocObjectsRow(obj);
     }
   } // loop closes
@@ -1302,12 +1302,12 @@ _insert_doc_objects_row = format(q"¶
 #+BEGIN_SRC d
 ¶",
   _metadata_tid,
-  obj.ocn,
+  obj.node.ocn,
   SQLinsertDelimiter!()(obj_txt["text"]),
   SQLinsertDelimiter!()(obj_txt["html"]),
-  obj.heading_lev_markup,
-  obj.is_of,
-  obj.is_a,
+  obj.node.heading_lev_markup,
+  obj.typeinfo.is_of,
+  obj.typeinfo.is_a,
 );
 #+END_SRC