naming

3 files changed, 132 insertions, 92 deletions

diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index 1580238..0697ae4 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -161,10 +161,11 @@ template SiSUdocAbstraction() {
       an_object["blurb_nugget"] = "";
       comp_obj_heading_                       = comp_obj_heading_.init;
       comp_obj_heading_.use                   = "content";
-      comp_obj_heading_.of                    = "para";
+      comp_obj_heading_.is_of                 = "para";
       comp_obj_heading_.is_a                  = "heading";
       comp_obj_heading_.text                  = "Table of Contents";
       comp_obj_heading_.ocn                   = 0;
+      comp_obj_heading_.obj_cite_number       = "";
       comp_obj_heading_.segment_anchor_tag    = "toc";
       comp_obj_heading_.marked_up_level       = "1";
       comp_obj_heading_.heading_lev_markup    = 4;
@@ -262,10 +263,11 @@ template SiSUdocAbstraction() {
               if (matchFirst(line, rgx.heading_glossary)) {
                 comp_obj_heading_                       = comp_obj_heading_.init;
                 comp_obj_heading_.use                   = "content";
-                comp_obj_heading_.of                    = "para";
+                comp_obj_heading_.is_of                 = "para";
                 comp_obj_heading_.is_a                  = "heading";
                 comp_obj_heading_.text                  = "Glossary";
                 comp_obj_heading_.ocn                   = 0;
+                comp_obj_heading_.obj_cite_number       = "";
                 comp_obj_heading_.marked_up_level       = "B";
                 comp_obj_heading_.heading_lev_markup    = 1;
                 comp_obj_heading_.heading_lev_collapsed = 1;
@@ -274,10 +276,11 @@ template SiSUdocAbstraction() {
                 the_glossary_section                    ~= comp_obj_heading_;
                 comp_obj_heading_                       = comp_obj_heading_.init;
                 comp_obj_heading_.use                   = "content";
-                comp_obj_heading_.of                    = "para";
+                comp_obj_heading_.is_of                 = "para";
                 comp_obj_heading_.is_a                  = "heading";
                 comp_obj_heading_.text                  = "Glossary";
                 comp_obj_heading_.ocn                   = 0;
+                comp_obj_heading_.obj_cite_number       = "";
                 comp_obj_heading_.segment_anchor_tag    = "glossary";
                 comp_obj_heading_.marked_up_level       = "1";
                 comp_obj_heading_.heading_lev_markup    = 4;
@@ -292,11 +295,11 @@ template SiSUdocAbstraction() {
                 _para_match_(line, an_object, an_object_key, indent, bullet, type, line_occur);
                 comp_obj_para                       = comp_obj_para.init;
                 comp_obj_para.use                   = "content";
-                comp_obj_para.of                    = "para";
-                comp_obj_para.is_a                  = "para";
+                comp_obj_para.is_of                 = "para";
+                comp_obj_para.is_a                  = "glossary";
                 comp_obj_para.text                  = to!string(line).strip;
                 comp_obj_para.ocn                   = 0;
-                comp_obj_para.obj_cite_number       = "0";
+                comp_obj_para.obj_cite_number       = "";
                 comp_obj_para.indent_hang           = indent["hang_position"];
                 comp_obj_para.indent_base           = indent["base_position"];
                 comp_obj_para.bullet                = bullet;
@@ -331,10 +334,11 @@ template SiSUdocAbstraction() {
               if (matchFirst(line, rgx.heading_blurb)) {
                 comp_obj_heading_                       = comp_obj_heading_.init;
                 comp_obj_heading_.use                   = "content";
-                comp_obj_heading_.of                    = "para";
+                comp_obj_heading_.is_of                 = "para";
                 comp_obj_heading_.is_a                  = "heading";
                 comp_obj_heading_.text                  = "Blurb";
                 comp_obj_heading_.ocn                   = 0;
+                comp_obj_heading_.obj_cite_number       = "";
                 comp_obj_heading_.marked_up_level       = "B";
                 comp_obj_heading_.heading_lev_markup    = 1;
                 comp_obj_heading_.heading_lev_collapsed = 1;
@@ -343,10 +347,11 @@ template SiSUdocAbstraction() {
                 the_blurb_section                       ~= comp_obj_heading_;
                 comp_obj_heading_                       = comp_obj_heading_.init;
                 comp_obj_heading_.use                   = "content";
-                comp_obj_heading_.of                    = "para";
+                comp_obj_heading_.is_of                 = "para";
                 comp_obj_heading_.is_a                  = "heading";
                 comp_obj_heading_.text                  = "Blurb";
                 comp_obj_heading_.ocn                   = 0;
+                comp_obj_heading_.obj_cite_number       = "";
                 comp_obj_heading_.segment_anchor_tag    = "blurb";
                 comp_obj_heading_.marked_up_level       = "1";
                 comp_obj_heading_.heading_lev_markup    = 4;
@@ -359,10 +364,11 @@ template SiSUdocAbstraction() {
               && (opt_action_bool["backmatter"] && opt_action_bool["section_blurb"])) {
                 comp_obj_heading_                       = comp_obj_heading_.init;
                 comp_obj_heading_.use                   = "content";
-                comp_obj_heading_.of                    = "para";
+                comp_obj_heading_.is_of                 = "para";
                 comp_obj_heading_.is_a                  = "heading";
                 comp_obj_heading_.text                  = to!string(line);
                 comp_obj_heading_.ocn                   = 0;
+                comp_obj_heading_.obj_cite_number       = "";
                 comp_obj_heading_.segment_anchor_tag    = "blurb";
                 comp_obj_heading_.marked_up_level       = to!string(an_object["lev"]);
                 comp_obj_heading_.heading_lev_markup    = to!int(an_object["lev_markup_number"]);    // make int, remove need to conv
@@ -374,11 +380,11 @@ template SiSUdocAbstraction() {
                 _para_match_(line, an_object, an_object_key, indent, bullet, type, line_occur);
                 comp_obj_para                       = comp_obj_para.init;
                 comp_obj_para.use                   = "content";
-                comp_obj_para.of                    = "para";
+                comp_obj_para.is_of                 = "para";
                 comp_obj_para.is_a                  = "para";
                 comp_obj_para.text                  = to!string(line).strip;
                 comp_obj_para.ocn                   = obj_cite_number;
-                comp_obj_para.obj_cite_number       = to!string(obj_cite_number);
+                comp_obj_para.obj_cite_number       = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
                 comp_obj_para.indent_hang           = indent["hang_position"];
                 comp_obj_para.indent_base           = indent["base_position"];
                 comp_obj_para.bullet                = bullet;
@@ -465,7 +471,7 @@ template SiSUdocAbstraction() {
                   an_object[an_object_key] ~= line ~= "\n";
                   comp_obj_comment                   = comp_obj_comment.init;
                   comp_obj_comment.use               = "comment";
-                  comp_obj_comment.of                = "comment";
+                  comp_obj_comment.is_of             = "comment";
                   comp_obj_comment.is_a              = "comment";
                   comp_obj_comment.text              = an_object[an_object_key].strip;
                   the_document_body_section          ~= comp_obj_comment;
@@ -628,11 +634,11 @@ template SiSUdocAbstraction() {
                 anchor_tags = substantive_object_and_anchor_tags_tuple[1];
                 comp_obj_para                       = comp_obj_para.init;
                 comp_obj_para.use                   = "content";
-                comp_obj_para.of                    = "para";
+                comp_obj_para.is_of                 = "para";
                 comp_obj_para.is_a                  = "para";
                 comp_obj_para.text                  = to!string(an_object["substantive"]).strip;
                 comp_obj_para.ocn                   = obj_cite_number;
-                comp_obj_para.obj_cite_number       = to!string(obj_cite_number);
+                comp_obj_para.obj_cite_number       = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
                 comp_obj_para.indent_hang           = indent["hang_position"];
                 comp_obj_para.indent_base           = indent["base_position"];
                 comp_obj_para.bullet                = bullet;
@@ -717,10 +723,11 @@ template SiSUdocAbstraction() {
         writeln("no gloss");
         comp_obj_heading_                       = comp_obj_heading_.init;
         comp_obj_heading_.use                   = "content";
-        comp_obj_heading_.of                    = "para";
+        comp_obj_heading_.is_of                 = "para";
         comp_obj_heading_.is_a                  = "heading";
         comp_obj_heading_.text                  = "(skip) there is no Glossary section";
         comp_obj_heading_.ocn                   = 0;
+        comp_obj_heading_.obj_cite_number       = "";
         comp_obj_heading_.marked_up_level       = "B";
         comp_obj_heading_.heading_lev_markup    = 1;
         comp_obj_heading_.heading_lev_collapsed = 1;
@@ -743,10 +750,11 @@ template SiSUdocAbstraction() {
       if (biblio_ordered.length > 0) {
         comp_obj_heading_                       = comp_obj_heading_.init;
         comp_obj_heading_.use                   = "content";
-        comp_obj_heading_.of                    = "para";
+        comp_obj_heading_.is_of                 = "para";
         comp_obj_heading_.is_a                  = "heading";
         comp_obj_heading_.text                  = "Bibliography";
         comp_obj_heading_.ocn                   = 0;
+        comp_obj_heading_.obj_cite_number       = "";
         comp_obj_heading_.marked_up_level       = "B";
         comp_obj_heading_.heading_lev_markup    = 1;
         comp_obj_heading_.heading_lev_collapsed = 1;
@@ -756,10 +764,11 @@ template SiSUdocAbstraction() {
         // ---
         comp_obj_heading_                       = comp_obj_heading_.init;
         comp_obj_heading_.use                   = "content";
-        comp_obj_heading_.of                    = "para";
+        comp_obj_heading_.is_of                 = "para";
         comp_obj_heading_.is_a                  = "heading";
         comp_obj_heading_.text                  = "Bibliography";
         comp_obj_heading_.ocn                   = 0;
+        comp_obj_heading_.obj_cite_number       = "";
         comp_obj_heading_.segment_anchor_tag    = "bibliography";
         comp_obj_heading_.marked_up_level       = "1";
         comp_obj_heading_.heading_lev_markup    = 4;
@@ -771,10 +780,11 @@ template SiSUdocAbstraction() {
       } else {
         comp_obj_heading_                       = comp_obj_heading_.init;
         comp_obj_heading_.use                   = "content";
-        comp_obj_heading_.of                    = "para";
+        comp_obj_heading_.is_of                 = "para";
         comp_obj_heading_.is_a                  = "heading";
         comp_obj_heading_.text                  = "(skip) there is no Bibliography";
         comp_obj_heading_.ocn                   = 0;
+        comp_obj_heading_.obj_cite_number       = "";
         comp_obj_heading_.marked_up_level       = "B";
         comp_obj_heading_.heading_lev_markup    = 1;
         comp_obj_heading_.heading_lev_collapsed = 1;
@@ -800,11 +810,11 @@ template SiSUdocAbstraction() {
         );
         comp_obj_para                       = comp_obj_para.init;
         comp_obj_para.use                   = "content";
-        comp_obj_para.of                    = "para";
+        comp_obj_para.is_of                 = "para";
         comp_obj_para.is_a                  = "bibliography";
         comp_obj_para.text                  = to!string(out_).strip;
         comp_obj_para.ocn                   = 0;
-        comp_obj_para.obj_cite_number       = "0";
+        comp_obj_para.obj_cite_number       = "";
         comp_obj_para.indent_hang           = 0;
         comp_obj_para.indent_base           = 1;
         comp_obj_para.bullet                = bullet;
@@ -836,10 +846,11 @@ template SiSUdocAbstraction() {
         writeln("no blurb");
         comp_obj_heading_                       = comp_obj_heading_.init;
         comp_obj_heading_.use                   = "content";
-        comp_obj_heading_.of                    = "para";
+        comp_obj_heading_.is_of                 = "para";
         comp_obj_heading_.is_a                  = "heading";
         comp_obj_heading_.text                  = "(skip) there is no Blurb section";
         comp_obj_heading_.ocn                   = 0;
+        comp_obj_para.obj_cite_number           = "";
         comp_obj_heading_.segment_anchor_tag    = "bibliography";
         comp_obj_heading_.marked_up_level       = "1";
         comp_obj_heading_.heading_lev_markup    = 4;
@@ -862,10 +873,10 @@ template SiSUdocAbstraction() {
       ];
       comp_obj_toc                       = comp_obj_toc.init;
       comp_obj_toc.use                   = "content";
-      comp_obj_toc.of                    = "para";
+      comp_obj_toc.is_of                 = "para";
       comp_obj_toc.is_a                  = "toc";
       comp_obj_toc.ocn                   = 0;
-      comp_obj_toc.obj_cite_number       = "0";
+      comp_obj_toc.obj_cite_number       = "";
       comp_obj_toc.indent_hang           = indent["hang_position"];
       comp_obj_toc.indent_base           = indent["base_position"];
       comp_obj_toc.bullet                = false;
@@ -1420,8 +1431,8 @@ template SiSUdocAbstraction() {
             anchor_tags = substantive_object_and_anchor_tags_tuple[1];
             comp_obj_block                            = comp_obj_block.init;
             comp_obj_block.use                        = "content";
-            comp_obj_block.of                         = "block";
-            comp_obj_block.is_a                       = an_object["is"];
+            comp_obj_block.is_of                      = "block";
+            comp_obj_block.is_a                       = "verse";
             comp_obj_block.ocn                        = obj_cite_number;
             comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
             comp_obj_block.text                       = an_object["substantive"];
@@ -1471,8 +1482,8 @@ template SiSUdocAbstraction() {
             anchor_tags = substantive_object_and_anchor_tags_tuple[1];
             comp_obj_block                            = comp_obj_block.init;
             comp_obj_block.use                        = "content";
-            comp_obj_block.of                         = "block";
-            comp_obj_block.is_a                       = an_object["is"];
+            comp_obj_block.is_of                      = "block";
+            comp_obj_block.is_a                       = "verse";
             comp_obj_block.ocn                        = obj_cite_number;
             comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
             comp_obj_block.text                       = an_object["substantive"];
@@ -1507,8 +1518,8 @@ template SiSUdocAbstraction() {
             anchor_tags = substantive_object_and_anchor_tags_tuple[1];
             comp_obj_block                            = comp_obj_block.init;
             comp_obj_block.use                        = "content";
-            comp_obj_block.of                         = "block";
-            comp_obj_block.is_a                       = an_object["is"];
+            comp_obj_block.is_of                      = "block";
+            comp_obj_block.is_a                       = "verse";
             comp_obj_block.ocn                        = obj_cite_number;
             comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
             comp_obj_block.text                       = an_object["substantive"];
@@ -1558,8 +1569,8 @@ template SiSUdocAbstraction() {
             anchor_tags = substantive_object_and_anchor_tags_tuple[1];
             comp_obj_block                            = comp_obj_block.init;
             comp_obj_block.use                        = "content";
-            comp_obj_block.of                         = "block";
-            comp_obj_block.is_a                       = an_object["is"];
+            comp_obj_block.is_of                      = "block";
+            comp_obj_block.is_a                       = "verse";
             comp_obj_block.ocn                        = obj_cite_number;
             comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
             comp_obj_block.text                       = an_object["substantive"];
@@ -1756,8 +1767,8 @@ template SiSUdocAbstraction() {
         anchor_tags = substantive_object_and_anchor_tags_tuple[1];
         comp_obj_code                             = comp_obj_code.init;
         comp_obj_code.use                         = "content";
-        comp_obj_code.of                          = "block";
-        comp_obj_code.is_a                        = an_object["is"];
+        comp_obj_code.is_of                       = "block";
+        comp_obj_code.is_a                        = "code";
         comp_obj_code.ocn                         = obj_cite_number;
         comp_obj_code.obj_cite_number             = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
         comp_obj_code.text                        = an_object["substantive"];
@@ -1784,7 +1795,7 @@ template SiSUdocAbstraction() {
           );
         comp_obj_poem_ocn                         = comp_obj_poem_ocn.init;
         comp_obj_poem_ocn.use                     = "content";
-        comp_obj_poem_ocn.of                      = "block";
+        comp_obj_poem_ocn.is_of                   = "block";
         comp_obj_poem_ocn.is_a                    = "poem";
         comp_obj_poem_ocn.ocn                     = obj_cite_number;
         comp_obj_poem_ocn.obj_cite_number         = (obj_cite_number_poem["start"], obj_cite_number_poem["end"]); // not sure about this
@@ -1817,8 +1828,8 @@ template SiSUdocAbstraction() {
         anchor_tags = substantive_object_and_anchor_tags_tuple[1];
         comp_obj_block                            = comp_obj_block.init;
         comp_obj_block.use                        = "content";
-        comp_obj_block.of                         = "block";
-        comp_obj_block.is_a                       = an_object["is"];
+        comp_obj_block.is_of                      = "block";
+        comp_obj_block.is_a                       = "table";
         comp_obj_block.ocn                        = obj_cite_number;
         comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
         comp_obj_block.text                       = an_object["substantive"];
@@ -1851,8 +1862,8 @@ template SiSUdocAbstraction() {
         anchor_tags = substantive_object_and_anchor_tags_tuple[1];
         comp_obj_block                            = comp_obj_block.init;
         comp_obj_block.use                        = "content";
-        comp_obj_block.of                         = "block";
-        comp_obj_block.is_a                       = an_object["is"];
+        comp_obj_block.is_of                      = "block";
+        comp_obj_block.is_a                       = "group";
         comp_obj_block.ocn                        = obj_cite_number;
         comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
         comp_obj_block.text                       = an_object["substantive"];
@@ -1884,8 +1895,8 @@ template SiSUdocAbstraction() {
         anchor_tags = substantive_object_and_anchor_tags_tuple[1];
         comp_obj_block                            = comp_obj_block.init;
         comp_obj_block.use                        = "content";
-        comp_obj_block.of                         = "block";
-        comp_obj_block.is_a                       = an_object["is"];
+        comp_obj_block.is_of                      = "block";
+        comp_obj_block.is_a                       = "block";
         comp_obj_block.ocn                        = obj_cite_number;
         comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
         comp_obj_block.text                       = an_object["substantive"];
@@ -1918,8 +1929,8 @@ template SiSUdocAbstraction() {
         anchor_tags = substantive_object_and_anchor_tags_tuple[1];
         comp_obj_block                            = comp_obj_block.init;
         comp_obj_block.use                        = "content";
-        comp_obj_block.of                         = "block";
-        comp_obj_block.is_a                       = an_object["is"];
+        comp_obj_block.is_of                      = "block";
+        comp_obj_block.is_a                       = "quote";
         comp_obj_block.ocn                        = obj_cite_number;
         comp_obj_block.obj_cite_number            = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
         comp_obj_block.text                       = an_object["substantive"];
@@ -2667,10 +2678,10 @@ template SiSUdocAbstraction() {
           toc_txt_= munge.url_links(toc_txt_);
           comp_obj_toc                       = comp_obj_toc.init;
           comp_obj_toc.use                   = "content";
-          comp_obj_toc.of                    = "para";
+          comp_obj_toc.is_of                 = "para";
           comp_obj_toc.is_a                  = "toc";
           comp_obj_toc.ocn                   = 0;
-          comp_obj_toc.obj_cite_number       = "0";
+          comp_obj_toc.obj_cite_number       = "";
           comp_obj_toc.indent_hang           = indent["hang_position"];
           comp_obj_toc.indent_base           = indent["base_position"];
           comp_obj_toc.bullet                = false;
@@ -2683,10 +2694,10 @@ template SiSUdocAbstraction() {
           ];
           comp_obj_toc                       = comp_obj_toc.init;
           comp_obj_toc.use                   = "content";
-          comp_obj_toc.of                    = "para";
+          comp_obj_toc.is_of                 = "para";
           comp_obj_toc.is_a                  = "toc";
           comp_obj_toc.ocn                   = 0;
-          comp_obj_toc.obj_cite_number       = "0";
+          comp_obj_toc.obj_cite_number       = "";
           comp_obj_toc.indent_hang           = indent["hang_position"];
           comp_obj_toc.indent_base           = indent["base_position"];
           comp_obj_toc.bullet                = false;
@@ -2695,10 +2706,10 @@ template SiSUdocAbstraction() {
         }
         comp_obj_toc                       = comp_obj_toc.init;
         comp_obj_toc.use                   = "content";
-        comp_obj_toc.of                    = "para";
+        comp_obj_toc.is_of                 = "para";
         comp_obj_toc.is_a                  = "toc";
         comp_obj_toc.ocn                   = 0;
-        comp_obj_toc.obj_cite_number       = "0";
+        comp_obj_toc.obj_cite_number       = "";
         comp_obj_toc.bullet                = false;
         switch (to!int(obj_["lev_markup_number"])) {
         case 0:
@@ -3260,7 +3271,7 @@ template SiSUdocAbstraction() {
       }
     }
     struct BookIndexReportSection {
-      int mkn, skn;
+      int  mkn, skn;
       auto rgx = Rgx();
       auto munge = ObjInlineMarkupMunge();
       auto bookindex_write_section(
@@ -3312,7 +3323,7 @@ template SiSUdocAbstraction() {
           string bi_tmp_seg, bi_tmp_scroll;
           comp_obj_heading_                       = comp_obj_heading_.init;
           comp_obj_heading_.use                   = "content";
-          comp_obj_heading_.of                    = "para";
+          comp_obj_heading_.is_of                 = "para";
           comp_obj_heading_.is_a                  = "heading";
           comp_obj_heading_.text                  = "Book Index";
           comp_obj_heading_.ocn                   = 0;
@@ -3327,7 +3338,7 @@ template SiSUdocAbstraction() {
           ++mkn;
           comp_obj_heading_                       = comp_obj_heading_.init;
           comp_obj_heading_.use                   = "content";
-          comp_obj_heading_.of                    = "para";
+          comp_obj_heading_.is_of                 = "para";
           comp_obj_heading_.is_a                  = "heading";
           comp_obj_heading_.text                  = "Index";
           comp_obj_heading_.ocn                   = 0;
@@ -3375,11 +3386,11 @@ template SiSUdocAbstraction() {
             bi_tmp_seg = replaceFirst(bi_tmp_seg, rgx.trailing_linebreak, "");
             comp_obj_para                       = comp_obj_para.init;
             comp_obj_para.use                   = "content";
-            comp_obj_para.of                    = "para";
-            comp_obj_para.is_a                  = "para";
+            comp_obj_para.is_of                 = "para";
+            comp_obj_para.is_a                  = "bookindex";
             comp_obj_para.text                  = to!string(bi_tmp_scroll).strip;
             comp_obj_para.ocn                   = obj_cite_number;
-            comp_obj_para.obj_cite_number       = to!string(obj_cite_number);
+            comp_obj_para.obj_cite_number       = (obj_cite_number==0) ? "" : to!string(obj_cite_number);
             comp_obj_para.indent_hang           = 0;
             comp_obj_para.indent_base           = 1;
             comp_obj_para.bullet                = false;
@@ -3498,7 +3509,7 @@ template SiSUdocAbstraction() {
         && (opt_action_bool["backmatter"] && opt_action_bool["section_endnotes"])) {
           comp_obj_heading_                       = comp_obj_heading_.init;
           comp_obj_heading_.use                   = "content";
-          comp_obj_heading_.of                    = "para";
+          comp_obj_heading_.is_of                 = "para";
           comp_obj_heading_.is_a                  = "heading";
           comp_obj_heading_.text                  = "Endnotes";
           comp_obj_heading_.ocn                   = 0;
@@ -3513,7 +3524,7 @@ template SiSUdocAbstraction() {
           ++mkn;
           comp_obj_heading_                       = comp_obj_heading_.init;
           comp_obj_heading_.use                   = "content";
-          comp_obj_heading_.of                    = "para";
+          comp_obj_heading_.is_of                 = "para";
           comp_obj_heading_.is_a                  = "heading";
           comp_obj_heading_.text                  = "Endnotes";
           comp_obj_heading_.ocn                   = 0;
@@ -3531,7 +3542,7 @@ template SiSUdocAbstraction() {
         } else {
           comp_obj_heading_                       = comp_obj_heading_.init;
           comp_obj_heading_.use                   = "content";
-          comp_obj_heading_.of                    = "para";
+          comp_obj_heading_.is_of                 = "para";
           comp_obj_heading_.is_a                  = "heading";
           comp_obj_heading_.text                  = "(skip) there are no Endnotes";
           comp_obj_heading_.ocn                   = 0;
@@ -3547,10 +3558,10 @@ template SiSUdocAbstraction() {
           ObjGenericComposite comp_obj_endnote_;
           comp_obj_endnote_                       = comp_obj_endnote_.init;
           comp_obj_endnote_.use                   = "content";
-          comp_obj_endnote_.of                    = "para";
+          comp_obj_endnote_.is_of                 = "para";
           comp_obj_endnote_.is_a                  = "endnote";
           comp_obj_endnote_.ocn                   = 0;
-          comp_obj_endnote_.obj_cite_number       = "0";
+          comp_obj_heading_.obj_cite_number       = "";
           comp_obj_endnote_.indent_hang           = 0;
           comp_obj_endnote_.indent_base           = 0;
           comp_obj_endnote_.bullet                = false;
@@ -3824,7 +3835,7 @@ template SiSUdocAbstraction() {
         ObjGenericComposite _comp_obj_heading_;
         _comp_obj_heading_                       = _comp_obj_heading_.init;
         _comp_obj_heading_.use                   = "content";
-        _comp_obj_heading_.of                    = "para";
+        _comp_obj_heading_.is_of                 = "para";
         _comp_obj_heading_.is_a                  = "heading";
         _comp_obj_heading_.text                  = to!string(_text).strip;
         _comp_obj_heading_.ocn                   = obj_cite_number_;
diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index f6f7641..13bcc36 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -17,7 +17,7 @@ template ObjectSetter() {
   struct ObjGenericComposite {
     // size_t id;
     string                 use                          = "";
-    string                 of                           = "";
+    string                 is_of                        = "";
     string                 is_a                         = "";
     string                 text                         = "";
     string                 obj_cite_number              = "";
diff --git a/src/sdp/output_html.d b/src/sdp/output_html.d
index 42ecf0a..5cd1b26 100644
--- a/src/sdp/output_html.d
+++ b/src/sdp/output_html.d
@@ -43,7 +43,7 @@ template SiSUoutputHTML() {
       if (obj.obj_cite_number.empty) {
         o = format(q"¶  <div class="substance">
       <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
-      <p class="%s" attrib="h%si%s">%s
+      <p class="%s" indent="h%si%s">%s
         %s
       </p>
     </div>¶",
@@ -58,7 +58,7 @@ template SiSUoutputHTML() {
       } else {
         o = format(q"¶  <div class="substance">
       <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
-      <p class="%s" attrib="h%si%s" id="%s">%s
+      <p class="%s" indent="h%si%s" id="%s">%s
         %s
       </p>
     </div>¶",
@@ -128,7 +128,7 @@ template SiSUoutputHTML() {
     ) {
       string o;
       o = format(q"¶  <div class="substance">
-      <p class="%s" attrib="h%si%s">
+      <p class="%s" indent="h%si%s">
         %s
       </p>
     </div>¶",
@@ -143,7 +143,7 @@ template SiSUoutputHTML() {
       auto ref const O         obj,
     ) {
       string o;
-      o = format(q"¶    <p class="%s" attrib="h%si%s">
+      o = format(q"¶    <p class="%s" indent="h%si%s">
       %s
     </p>¶",
         obj.is_a,
@@ -176,38 +176,67 @@ template SiSUoutputHTML() {
       foreach (part; document_section_keys_sequenced["scroll"]) {
         foreach (obj; contents[part]) {
           if (obj.use == "content") {
-            switch (obj.is_a) {
-            case "heading":
-              body_html ~= html_heading(obj);
-              break;
-            case "toc":
-              body_html ~= html_toc(obj);
-              break;
+            switch (obj.is_of) {
             case "para":
-              body_html ~= html_para(obj);
-              break;
-            case "verse":
-              body_html ~= html_nugget(obj);
-              break;
-            case "group":
-              body_html ~= html_nugget(obj);
+              switch (obj.is_a) {
+              case "heading":
+                body_html ~= html_heading(obj);
+                break;
+              case "toc":
+                body_html ~= html_toc(obj);
+                break;
+              case "para":
+                body_html ~= html_para(obj);
+                break;
+              case "endnote":
+                body_html ~= html_endnote(obj);
+                break;
+              case "glossary":
+                body_html ~= html_para(obj);
+                break;
+              case "bibliography":
+                body_html ~= html_para(obj);
+                break;
+              case "bookindex":
+                body_html ~= html_para(obj);
+                break;
+              case "blurb":
+                body_html ~= html_para(obj);
+                break;
+              default:
+                writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+                break;
+              }
               break;
             case "block":
-              body_html ~= html_nugget(obj);
-              break;
-            case "quote":
-              body_html ~= html_nugget(obj);
-              break;
-            case "table":
-              body_html ~= html_para(obj);
-              break;
-            case "code":
-              body_html ~= html_nugget(obj);
-              break;
-            case "endnote":
-              body_html ~= html_endnote(obj);
+              switch (obj.is_a) {
+              case "poem":
+                break;
+              case "verse":
+                body_html ~= html_nugget(obj);
+                break;
+              case "group":
+                body_html ~= html_nugget(obj);
+                break;
+              case "block":
+                body_html ~= html_nugget(obj);
+                break;
+              case "quote":
+                body_html ~= html_nugget(obj);
+                break;
+              case "table":
+                body_html ~= html_para(obj); //
+                break;
+              case "code":
+                body_html ~= html_nugget(obj);
+                break;
+              default:
+                writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
+                break;
+              }
               break;
             default:
+              writeln(__FILE__, ":", __LINE__, ": ", obj.is_of);
               break;
             }
           }