From b86c91d6136476de3a35e0077db28caccacd816e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 20 Jun 2018 11:42:14 -0400
Subject: doc object metainfo consolidation

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

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

diff --git a/src/sdp/output/xmls.d b/src/sdp/output/xmls.d
index e5d27c9..e977e6c 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.typeinfo.is_a == "code")) {
+      if (!(obj.metainfo.is_a == "code")) {
         _txt = (_txt)
           .replaceAll(rgx.xhtml_line_break,   "<br />");
       }
@@ -363,7 +363,7 @@ template outputXHTMLs() {
           writeln(__LINE__,
             " (missed) markup link identified (",
             obj.has.inline_links,
-            "): ", obj.typeinfo.is_a, ": ",
+            "): ", obj.metainfo.is_a, ": ",
             obj.text
           );
         }
@@ -373,7 +373,7 @@ template outputXHTMLs() {
           writeln(__LINE__,
             " (missed) markup link identified (",
             obj.has.inline_links,
-            "): ", obj.typeinfo.is_a, ": ",
+            "): ", obj.metainfo.is_a, ": ",
             obj.text
           );
         }
@@ -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.typeinfo.is_a, ": ", obj.text);
+          writeln(__LINE__, " (missed) markup endnote: ", obj.metainfo.is_a, ": ", obj.text);
         }
       }
       debug(markup) {
         if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
-          writeln(__LINE__, " (missed) markup endnote: ", obj.typeinfo.is_a, ": ", obj.text);
+          writeln(__LINE__, " (missed) markup endnote: ", obj.metainfo.is_a, ": ", obj.text);
         }
       }
       return _txt;
@@ -433,7 +433,7 @@ template outputXHTMLs() {
         );
       } else if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
         debug(markup) {
-          writeln(__LINE__, " endnote: ", obj.typeinfo.is_a, ": ", obj.text);
+          writeln(__LINE__, " endnote: ", obj.metainfo.is_a, ": ", obj.text);
         }
       }
       auto t = tuple(
@@ -574,12 +574,12 @@ template outputXHTMLs() {
       auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
       string _horizontal_rule = "<hr />";
       if ((_xml_type != "html")
-      || (obj.node.heading_lev_markup == 0 || obj.node.heading_lev_markup > 4)) {
+      || (obj.metainfo.heading_lev_markup == 0 || obj.metainfo.heading_lev_markup > 4)) {
         _horizontal_rule = "";
       }
       _txt = font_face(_txt);
       string o;
-      if (obj.node.object_number.empty) {
+      if (obj.metainfo.object_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.node.heading_lev_markup,
-          obj.typeinfo.is_a,
+          obj.metainfo.heading_lev_markup,
+          obj.metainfo.is_a,
           tags,
           _txt,
-          obj.node.heading_lev_markup,
+          obj.metainfo.heading_lev_markup,
         );
       } else {
         o = format(q"¶%s
@@ -602,15 +602,15 @@ template outputXHTMLs() {
         </h%s>
       </div>¶",
         _horizontal_rule,
-        obj.node.object_number,
-        obj.node.object_number,
-        obj.node.heading_lev_markup,
-        obj.typeinfo.is_a,
-        obj.node.object_number,
-        obj.node.object_number,
+        obj.metainfo.object_number,
+        obj.metainfo.object_number,
+        obj.metainfo.heading_lev_markup,
+        obj.metainfo.is_a,
+        obj.metainfo.object_number,
+        obj.metainfo.object_number,
         tags,
         _txt,
-        obj.node.heading_lev_markup,
+        obj.metainfo.heading_lev_markup,
         );
       }
       return o;
@@ -649,13 +649,13 @@ template outputXHTMLs() {
       _txt = font_face(_txt);
       string o;
       _txt = (obj.attrib.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
-      if (obj.node.object_number.empty) {
+      if (obj.metainfo.object_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s" indent="h%si%s">%s
         %s
       </p>
     </div>¶",
-          obj.typeinfo.is_a,
+          obj.metainfo.is_a,
           obj.attrib.indent_hang,
           obj.attrib.indent_base,
           tags,
@@ -668,12 +668,12 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-          obj.node.object_number,
-          obj.node.object_number,
-          obj.typeinfo.is_a,
+          obj.metainfo.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.is_a,
           obj.attrib.indent_hang,
           obj.attrib.indent_base,
-          obj.node.object_number,
+          obj.metainfo.object_number,
           tags,
           _txt
         );
@@ -712,13 +712,13 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.node.object_number.empty) {
+      if (obj.metainfo.object_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s">
         %s
       </p>
     </div>¶",
-          obj.typeinfo.is_a,
+          obj.metainfo.is_a,
           _txt
         );
       } else {
@@ -728,10 +728,10 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-          obj.node.object_number,
-          obj.node.object_number,
-          obj.typeinfo.is_a,
-          obj.node.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.is_a,
+          obj.metainfo.object_number,
           _txt
         );
       }
@@ -769,13 +769,13 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.node.object_number.empty) {
+      if (obj.metainfo.object_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s">
         %s
       </p>
     </div>¶",
-          obj.typeinfo.is_a,
+          obj.metainfo.is_a,
           _txt
         );
       } else {
@@ -785,10 +785,10 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-          obj.node.object_number,
-          obj.node.object_number,
-          obj.typeinfo.is_a,
-          obj.node.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.is_a,
+          obj.metainfo.object_number,
           _txt
         );
       }
@@ -827,11 +827,11 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.node.object_number.empty) {
+      if (obj.metainfo.object_number.empty) {
         o = format(q"¶  <div class="substance">
       <p class="%s">%s</p>
     </div>¶",
-          obj.typeinfo.is_a,
+          obj.metainfo.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.node.object_number,
-          obj.node.object_number,
-          obj.typeinfo.is_a,
-          obj.node.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.is_a,
+          obj.metainfo.object_number,
           _txt.stripRight
         );
       }
@@ -881,11 +881,11 @@ template outputXHTMLs() {
     ) {
       _txt = font_face(_txt);
       string o;
-      if (obj.node.object_number.empty) {
+      if (obj.metainfo.object_number.empty) {
           o = format(q"¶  <div class="substance">
             <p class="%s">%s</p>
         </div>¶",
-          obj.typeinfo.is_a,
+          obj.metainfo.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.node.object_number,
-          obj.node.object_number,
-          obj.typeinfo.is_a,
-          obj.node.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.is_a,
+          obj.metainfo.object_number,
           _txt
         );
       }
@@ -981,10 +981,10 @@ template outputXHTMLs() {
         %s
       </p>
     </div>¶",
-        obj.node.object_number,
-        obj.node.object_number,
-        obj.typeinfo.is_a,
-        obj.node.object_number,
+        obj.metainfo.object_number,
+        obj.metainfo.object_number,
+        obj.metainfo.is_a,
+        obj.metainfo.object_number,
         tags,
         _txt,
         _note
@@ -999,7 +999,7 @@ template outputXHTMLs() {
       o = format(q"¶    <p class="%s" indent="h%si%s">
       %s
     </p>¶",
-        obj.typeinfo.is_a,
+        obj.metainfo.is_a,
         obj.attrib.indent_hang,
         obj.attrib.indent_base,
         _txt
@@ -1011,11 +1011,11 @@ template outputXHTMLs() {
       string                   _txt,
     ) {
       string o;
-      if (obj.node.object_number.empty) {
+      if (obj.metainfo.object_number.empty) {
           o = format(q"¶  <div class="substance">
         <p class="%s">%s</p>
     </div>¶",
-          obj.typeinfo.is_a,
+          obj.metainfo.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.node.object_number,
-          obj.node.object_number,
-          obj.typeinfo.is_a,
-          obj.node.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.object_number,
+          obj.metainfo.is_a,
+          obj.metainfo.object_number,
           _txt
         );
       }
-- 
cgit v1.2.3