From 6f8fddb2dfa5faad56af2a0bfd0bf3b694695136 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 12 Jun 2018 15:38:38 -0400
Subject: 0.26.3 object info changes

---
 src/sdp/output/xmls.d | 178 +++++++++++++++++++++++++-------------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

(limited to 'src/sdp/output/xmls.d')

diff --git a/src/sdp/output/xmls.d b/src/sdp/output/xmls.d
index 785d87e..cc08bfe 100644
--- a/src/sdp/output/xmls.d
+++ b/src/sdp/output/xmls.d
@@ -60,7 +60,7 @@ template outputXHTMLs() {
         .replaceAll(rgx.xhtml_less_than,    "&#60;")
         .replaceAll(rgx.xhtml_greater_than, "&#62;")
         .replaceAll(rgx.nbsp_char,          " ");
-      if (!(obj.is_a == "code")) {
+      if (!(obj.typeinfo.is_a == "code")) {
         _txt = (_txt)
           .replaceAll(rgx.xhtml_line_break,   "<br />");
       }
@@ -340,7 +340,7 @@ template outputXHTMLs() {
       string                  _suffix    = ".html",
       string                  _xml_type = "seg",
     ) {
-      if (obj.inline_links) {
+      if (obj.has.inline_links) {
         if ((_txt.match(rgx.mark_internal_site_lnk))
         && (_xml_type == "scroll")) { // conditions reversed to avoid: gdc compiled program run segfault
           _txt = (_txt).replaceAll(
@@ -362,8 +362,8 @@ template outputXHTMLs() {
         if (_txt.match(rgx.inline_link)) {
           writeln(__LINE__,
             " (missed) markup link identified (",
-            obj.inline_links,
-            "): ", obj.is_a, ": ",
+            obj.has.inline_links,
+            "): ", obj.typeinfo.is_a, ": ",
             obj.text
           );
         }
@@ -372,8 +372,8 @@ template outputXHTMLs() {
         if (_txt.match(rgx.inline_link)) {
           writeln(__LINE__,
             " (missed) markup link identified (",
-            obj.inline_links,
-            "): ", obj.is_a, ": ",
+            obj.has.inline_links,
+            "): ", obj.typeinfo.is_a, ": ",
             obj.text
           );
         }
@@ -384,7 +384,7 @@ template outputXHTMLs() {
       auto return ref const O   obj,
       string                    _txt,
     ) {
-      if (obj.inline_notes_reg) {
+      if (obj.has.inline_notes_reg) {
         _txt = font_face(_txt);
         _txt = (_txt).replaceAll(
           rgx.inline_notes_delimiter_al_regular_number_note,
@@ -393,12 +393,12 @@ template outputXHTMLs() {
       }
       debug(markup_endnotes) {
         if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
-          writeln(__LINE__, " (missed) markup endnote: ", obj.is_a, ": ", obj.text);
+          writeln(__LINE__, " (missed) markup endnote: ", obj.typeinfo.is_a, ": ", obj.text);
         }
       }
       debug(markup) {
         if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
-          writeln(__LINE__, " (missed) markup endnote: ", obj.is_a, ": ", obj.text);
+          writeln(__LINE__, " (missed) markup endnote: ", obj.typeinfo.is_a, ": ", obj.text);
         }
       }
       return _txt;
@@ -408,7 +408,7 @@ template outputXHTMLs() {
       string                      _txt,
     ) {
       string[] _endnotes;
-      if (obj.inline_notes_reg) {
+      if (obj.has.inline_notes_reg) {
         _txt = font_face(_txt);
         /+ need markup for text, and separated footnote +/
         foreach(m; _txt.matchAll(rgx.inline_notes_delimiter_al_regular_number_note)) {
@@ -433,7 +433,7 @@ template outputXHTMLs() {
         );
       } else if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
         debug(markup) {
-          writeln(__LINE__, " endnote: ", obj.is_a, ": ", obj.text);
+          writeln(__LINE__, " endnote: ", obj.typeinfo.is_a, ": ", obj.text);
         }
       }
       auto t = tuple(
@@ -468,7 +468,7 @@ template outputXHTMLs() {
     ) {
       char[] lev4_subtoc;
       lev4_subtoc ~= "  <div class=\"nav\">\n";
-      foreach (subtoc; obj.lev4_subtoc) {
+      foreach (subtoc; obj.tags.lev4_subtoc) {
         if (auto m = subtoc.match(rgx.inline_link_subtoc)) {
           auto indent = m.captures[1].to!string;
           auto text = m.captures[2].to!string;
@@ -493,7 +493,7 @@ template outputXHTMLs() {
       auto return ref const O    obj,
     ) {
       string prev, next, toc;
-      if (obj.segment_anchor_tag == "toc") {
+      if (obj.tags.segment_anchor_tag == "toc") {
         toc = "";
         prev = "";
       } else {
@@ -506,7 +506,7 @@ template outputXHTMLs() {
             </a>¶",
         );
       }
-      if (obj.segname_prev == "") {
+      if (obj.tags.segname_prev == "") {
         prev = "";
       } else {
         prev = format(q"¶<a href="%s.html" target="_top">
@@ -516,10 +516,10 @@ template outputXHTMLs() {
                 </svg>
               </div>
             </a>¶",
-          obj.segname_prev,
+          obj.tags.segname_prev,
         );
       }
-      if (obj.segname_next == "") {
+      if (obj.tags.segname_next == "") {
         next = "";
       } else {
         next = format(q"¶<a href="%s.html" target="_top">
@@ -529,7 +529,7 @@ template outputXHTMLs() {
                 </svg>
               </div>
             </a>¶",
-          obj.segname_next,
+          obj.tags.segname_next,
         );
       }
       string _toc_pre_next = format(q"¶        <div class="flex-menu-option">
@@ -571,15 +571,15 @@ template outputXHTMLs() {
       string                     _txt,
       string                     _xml_type = "html",
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       string _horizontal_rule = "<hr />";
       if ((_xml_type != "html")
-      || (obj.heading_lev_markup == 0 || obj.heading_lev_markup > 4)) {
+      || (obj.node.heading_lev_markup == 0 || obj.node.heading_lev_markup > 4)) {
         _horizontal_rule = "";
       }
       _txt = font_face(_txt);
       string o;
-      if (obj.obj_cite_number.empty) {
+      if (obj.node.obj_cite_number.empty) {
         o = format(q"¶%s
       <div class="substance">
         <h%s class="%s">%s
@@ -587,11 +587,11 @@ template outputXHTMLs() {
         </h%s>
       </div>¶",
           _horizontal_rule,
-          obj.heading_lev_markup,
-          obj.is_a,
+          obj.node.heading_lev_markup,
+          obj.typeinfo.is_a,
           tags,
           _txt,
-          obj.heading_lev_markup,
+          obj.node.heading_lev_markup,
         );
       } else {
         o = format(q"¶%s
@@ -602,15 +602,15 @@ template outputXHTMLs() {
         </h%s>
       </div>¶",
         _horizontal_rule,
-        obj.obj_cite_number,
-        obj.obj_cite_number,
-        obj.heading_lev_markup,
-        obj.is_a,
-        obj.obj_cite_number,
-        obj.obj_cite_number,
+        obj.node.obj_cite_number,
+        obj.node.obj_cite_number,
+        obj.node.heading_lev_markup,
+        obj.typeinfo.is_a,
+        obj.node.obj_cite_number,
+        obj.node.obj_cite_number,
         tags,
         _txt,
-        obj.heading_lev_markup,
+        obj.node.heading_lev_markup,
         );
       }
       return o;
@@ -620,7 +620,7 @@ template outputXHTMLs() {
       string                     _txt,
       string                     _suffix = ".html",
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = inline_markup_scroll(obj, _txt, _suffix);
       string o = heading(obj, _txt);
       return o;
@@ -645,19 +645,19 @@ template outputXHTMLs() {
       auto return ref const O    obj,
       string                     _txt,
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = font_face(_txt);
       string o;
-      _txt = (obj.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
-      if (obj.obj_cite_number.empty) {
+      _txt = (obj.attrib.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
+      if (obj.node.obj_cite_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s" indent="h%si%s">%s
         %s
       </p>
     </div>¶",
-          obj.is_a,
-          obj.indent_hang,
-          obj.indent_base,
+          obj.typeinfo.is_a,
+          obj.attrib.indent_hang,
+          obj.attrib.indent_base,
           tags,
           _txt
         );
@@ -668,12 +668,12 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-          obj.obj_cite_number,
-          obj.obj_cite_number,
-          obj.is_a,
-          obj.indent_hang,
-          obj.indent_base,
-          obj.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.typeinfo.is_a,
+          obj.attrib.indent_hang,
+          obj.attrib.indent_base,
+          obj.node.obj_cite_number,
           tags,
           _txt
         );
@@ -685,7 +685,7 @@ template outputXHTMLs() {
       string                     _txt,
       string                     _suffix = ".html",
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = inline_markup_scroll(obj, _txt, _suffix);
       string o = para(obj, _txt);
       return o;
@@ -712,13 +712,13 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.obj_cite_number.empty) {
+      if (obj.node.obj_cite_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s">
         %s
       </p>
     </div>¶",
-          obj.is_a,
+          obj.typeinfo.is_a,
           _txt
         );
       } else {
@@ -728,10 +728,10 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-          obj.obj_cite_number,
-          obj.obj_cite_number,
-          obj.is_a,
-          obj.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.typeinfo.is_a,
+          obj.node.obj_cite_number,
           _txt
         );
       }
@@ -742,7 +742,7 @@ template outputXHTMLs() {
       string                     _txt,
       string                     _suffix = ".html",
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = inline_markup_scroll(obj, _txt, _suffix);
       string o = quote(obj, _txt);
       return o;
@@ -769,13 +769,13 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.obj_cite_number.empty) {
+      if (obj.node.obj_cite_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s">
         %s
       </p>
     </div>¶",
-          obj.is_a,
+          obj.typeinfo.is_a,
           _txt
         );
       } else {
@@ -785,10 +785,10 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-          obj.obj_cite_number,
-          obj.obj_cite_number,
-          obj.is_a,
-          obj.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.typeinfo.is_a,
+          obj.node.obj_cite_number,
           _txt
         );
       }
@@ -800,7 +800,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
       string                     _xml_type = "html",
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = inline_markup_scroll(obj, _txt, _suffix);
       string o = group(obj, _txt);
       return o;
@@ -827,11 +827,11 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.obj_cite_number.empty) {
+      if (obj.node.obj_cite_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s">%s</p>
     </div>¶",
-          obj.is_a,
+          obj.typeinfo.is_a,
           _txt.stripRight
         );
       } else {
@@ -839,10 +839,10 @@ template outputXHTMLs() {
       <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
       <p class="%s" id="%s">%s</p>
     </div>¶",
-          obj.obj_cite_number,
-          obj.obj_cite_number,
-          obj.is_a,
-          obj.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.typeinfo.is_a,
+          obj.node.obj_cite_number,
           _txt.stripRight
         );
       }
@@ -854,7 +854,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
       string                     _xml_type = "html",
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = inline_markup_scroll(obj, _txt, _suffix);
       string o = block(obj, _txt);
       return o;
@@ -881,11 +881,11 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.obj_cite_number.empty) {
+      if (obj.node.obj_cite_number.empty) {
           o = format(q"¶  <div class="substance">
             <p class="%s">%s</p>
         </div>¶",
-          obj.is_a,
+          obj.typeinfo.is_a,
           _txt
         );
       } else {
@@ -893,10 +893,10 @@ template outputXHTMLs() {
           <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
           <p class="%s" id="%s">%s</p>
         </div>¶",
-          obj.obj_cite_number,
-          obj.obj_cite_number,
-          obj.is_a,
-          obj.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.typeinfo.is_a,
+          obj.node.obj_cite_number,
           _txt
         );
       }
@@ -908,7 +908,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
       string                     _xml_type = "html",
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = inline_markup_scroll(obj, _txt, _suffix);
       string o = verse(obj, _txt);
       return o;
@@ -945,11 +945,11 @@ template outputXHTMLs() {
             && (_table_rows.length <= row_idx+2)) {
               _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 ~ "%\" " ~ _align ~ ">";
+              _table ~= "<" ~ _col_is ~ " width=\"" ~ obj.table.column_widths[col_idx].to!string ~ "%\" " ~ _align ~ ">";
               _table ~= cell;
               _table ~= "</" ~ _col_is ~ ">";
             }
@@ -966,7 +966,7 @@ template outputXHTMLs() {
       auto return ref const O    obj,
       string                     _txt,
     ) {
-      auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       _txt = font_face(_txt);
       auto t = tablarize(obj, _txt);
       _txt = t[0];
@@ -981,10 +981,10 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-        obj.obj_cite_number,
-        obj.obj_cite_number,
-        obj.is_a,
-        obj.obj_cite_number,
+        obj.node.obj_cite_number,
+        obj.node.obj_cite_number,
+        obj.typeinfo.is_a,
+        obj.node.obj_cite_number,
         tags,
         _txt,
         _note
@@ -999,9 +999,9 @@ template outputXHTMLs() {
       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;
@@ -1011,11 +1011,11 @@ template outputXHTMLs() {
       string                   _txt,
     ) {
       string o;
-      if (obj.obj_cite_number.empty) {
+      if (obj.node.obj_cite_number.empty) {
           o = format(q"¶  <div class="substance">
         <p class="%s">%s</p>
     </div>¶",
-          obj.is_a,
+          obj.typeinfo.is_a,
           _txt
         );
       } else {
@@ -1023,10 +1023,10 @@ template outputXHTMLs() {
       <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
       <p class="%s" id="%s">%s</p>
     </div>¶",
-          obj.obj_cite_number,
-          obj.obj_cite_number,
-          obj.is_a,
-          obj.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.node.obj_cite_number,
+          obj.typeinfo.is_a,
+          obj.node.obj_cite_number,
           _txt
         );
       }
-- 
cgit v1.2.3