0.26.3 object info changes

1 files changed, 40 insertions, 40 deletions

diff --git a/src/sdp/output/html.d b/src/sdp/output/html.d
index ddd3c9f..6078c00 100644
--- a/src/sdp/output/html.d
+++ b/src/sdp/output/html.d
@@ -28,11 +28,11 @@ template outputHTML() {
       foreach (obj; doc_abstraction[part]) {
         delimit = xhtml_format.div_delimit(part, previous_part);
         string _txt = xhtml_format.special_characters(obj, obj.text);
-        switch (obj.of_part) {
+        switch (obj.typeinfo.of_part) {
         case "frontmatter":              assert(part == "head" || "toc_scroll");
-          switch (obj.is_of) {
+          switch (obj.typeinfo.is_of) {
           case "para":
-            switch (obj.is_a) {
+            switch (obj.typeinfo.is_a) {
             case "heading":
               doc_html ~= delimit ~ xhtml_format.heading_scroll(obj, _txt, suffix);
               break;
@@ -41,22 +41,22 @@ template outputHTML() {
               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" || "head"); // surprise
-          switch (obj.is_of) {
+          switch (obj.typeinfo.is_of) {
           case "para":
-            switch (obj.is_a) {
+            switch (obj.typeinfo.is_a) {
             case "heading":
               doc_html ~= delimit ~ xhtml_format.heading_scroll(obj, _txt, suffix);
               break;
@@ -65,13 +65,13 @@ template outputHTML() {
               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":
               doc_html ~= xhtml_format.quote_scroll(obj, _txt);
               break;
@@ -94,23 +94,23 @@ template outputHTML() {
               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 == "endnotes" || "glossary" || "bibliography" || "bookindex_scroll" || "blurb" || "tail");
-          switch (obj.is_of) {
+          switch (obj.typeinfo.is_of) {
           case "para":
-            switch (obj.is_a) {
+            switch (obj.typeinfo.is_a) {
             case "heading":
               doc_html ~= delimit ~ xhtml_format.heading_scroll(obj, _txt, suffix);
               break;
@@ -131,14 +131,14 @@ template outputHTML() {
               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;
           }
@@ -147,8 +147,8 @@ template outputHTML() {
           break;
         default:
           if ((doc_matters.opt.action.debug_do)) {
-            writeln(__FILE__, ":", __LINE__, ": ", obj.of_part);
-            writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+            writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.of_part);
+            writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
             writeln(__FILE__, ":", __LINE__, ": ", obj.text);
           }
           break;
@@ -200,12 +200,12 @@ template outputHTML() {
       foreach (obj; doc_abstraction[part]) {
         delimit = xhtml_format.div_delimit(part, previous_part);
         string _txt = xhtml_format.special_characters(obj, obj.text);
-        if (obj.is_a == "heading") {
+        if (obj.typeinfo.is_a == "heading") {
           assert(part == "head" || "toc_seg" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail");
-          switch (obj.heading_lev_markup) {
+          switch (obj.node.heading_lev_markup) {
           case 0: .. case 3:
             /+ fill buffer, and replace with new levels from 1 to 3 +/
-            switch (obj.heading_lev_markup) {
+            switch (obj.node.heading_lev_markup) {
             case 0:
               top_level_headings[0] = "";
               top_level_headings[1] = "";
@@ -226,12 +226,12 @@ template outputHTML() {
               goto default;
             default:
               auto t = xhtml_format.heading_seg(obj, _txt, suffix, "seg");
-              top_level_headings[obj.heading_lev_markup] = t[0];
+              top_level_headings[obj.node.heading_lev_markup] = t[0];
               break;
             }
             break;
           case 4:
-            segment_filename = obj.segment_anchor_tag;
+            segment_filename = obj.tags.segment_anchor_tag;
             doc_html[segment_filename] ~= xhtml_format.html_head(doc_matters, "seg");
             auto navigation_bar = xhtml_format.nav_pre_next_svg(obj);
             doc_html[segment_filename] ~= navigation_bar.toc_pre_next; // navigation bar
@@ -252,45 +252,45 @@ template outputHTML() {
             break;
           case 8: .. case 9:
             if ((doc_matters.opt.action.debug_do)) {
-              writeln(__FILE__, ":", __LINE__, ": ", obj.is_a, ": ", obj.heading_lev_markup);
+              writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a, ": ", obj.node.heading_lev_markup);
               writeln(__FILE__, ":", __LINE__, ": ", obj.text);
             }
             break;
           default:
             if ((doc_matters.opt.action.debug_do)) {
-              writeln(__FILE__, ":", __LINE__, ": ", obj.is_a, ": ", obj.heading_lev_markup);
+              writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a, ": ", obj.node.heading_lev_markup);
             }
             break;
           }
         } else {
           assert(part == "head" || "toc_seg" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail");
-          switch (obj.of_part) {
+          switch (obj.typeinfo.of_part) {
           case "frontmatter":             assert(part == "head" || "toc_seg");
-            switch (obj.is_of) {
+            switch (obj.typeinfo.is_of) {
             case "para":
-              switch (obj.is_a) {
+              switch (obj.typeinfo.is_a) {
               case "toc":
                 auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 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_a);
+                writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
               }
               break;
             }
             break;
           case "body":                    assert(part == "body");
-            switch (obj.is_of) {
+            switch (obj.typeinfo.is_of) {
             case "para":
-              switch (obj.is_a) {
+              switch (obj.typeinfo.is_a) {
               case "para":
                 auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
@@ -298,13 +298,13 @@ template outputHTML() {
                 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":
                 auto t = xhtml_format.quote_seg(obj, _txt, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
@@ -336,23 +336,23 @@ template outputHTML() {
                 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 == "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail");
-            switch (obj.is_of) {
+            switch (obj.typeinfo.is_of) {
             case "para":
-              switch (obj.is_a) {
+              switch (obj.typeinfo.is_a) {
               case "endnote":             assert(part == "endnotes");
                 auto t = xhtml_format.para_seg(obj, _txt, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
@@ -379,14 +379,14 @@ template outputHTML() {
                 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;
             }
@@ -395,7 +395,7 @@ template outputHTML() {
             break;
           default:
             if ((doc_matters.opt.action.debug_do)) {
-              writeln(__FILE__, ":", __LINE__, ": ", obj.of_part);
+              writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.of_part);
             }
             break;
           }