From 1b311d6f2246d29c3a99da5c40f1558bc83049a9 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Wed, 19 Feb 2025 15:25:45 -0500
Subject: doc (metadata & abstraction) struct follow through

---
 src/sisudoc/io_out/epub3.d  | 122 ++++++++++++++++-----------------
 src/sisudoc/io_out/html.d   | 151 +++++++++++++++++++----------------------
 src/sisudoc/io_out/hub.d    |  69 +++++++++----------
 src/sisudoc/io_out/sqlite.d | 161 +++++++++++++++++++-------------------------
 src/sisudoc/spine.d         |   8 +--
 5 files changed, 236 insertions(+), 275 deletions(-)

(limited to 'src')

diff --git a/src/sisudoc/io_out/epub3.d b/src/sisudoc/io_out/epub3.d
index 8fd1cb5..610d6b8 100644
--- a/src/sisudoc/io_out/epub3.d
+++ b/src/sisudoc/io_out/epub3.d
@@ -95,10 +95,10 @@ template outputEPub3() {
   </rootfiles>┃") ~ "\n</container>\n";
     return o;
   }
-  string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
+  string epub3_oebps_content(D,P)(D doc, P parts) {
     auto xhtml_format = outputXHTMLs();
-    auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
-    string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters!
+    auto pth_epub3 = spinePathsEPUB!()(doc.matters.output_path, doc.matters.src.language);
+    string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc.matters!
     string content = format(q"┃<?xml version="1.0" encoding="utf-8"?>
   <package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="uid" prefix="rendition: http://www.idpf.org/vocab/rendition/#">
     <metadata
@@ -122,25 +122,25 @@ template outputEPub3() {
       <item id="nav" href="toc_nav.xhtml" media-type="application/xhtml+xml" properties="nav" />
   ┃",
       _uuid,
-      xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.title_main),
-      (doc_matters.conf_make_meta.meta.title_sub.empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.title_sub),
-      (doc_matters.conf_make_meta.meta.creator_author.empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.creator_author),
-      (doc_matters.conf_make_meta.meta.creator_author.empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.creator_author),
-      doc_matters.src.language,                                   // language, fix (needed in dochead metadata)
-      (doc_matters.conf_make_meta.meta.date_published.empty)
-        ? "" : xhtml_format.special_characters_date(doc_matters.conf_make_meta.meta.date_published),
-      (doc_matters.conf_make_meta.meta.rights_copyright.empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.rights_copyright),
+      xhtml_format.special_characters_text(doc.matters.conf_make_meta.meta.title_main),
+      (doc.matters.conf_make_meta.meta.title_sub.empty)
+        ? "" : xhtml_format.special_characters_text(doc.matters.conf_make_meta.meta.title_sub),
+      (doc.matters.conf_make_meta.meta.creator_author.empty)
+        ? "" : xhtml_format.special_characters_text(doc.matters.conf_make_meta.meta.creator_author),
+      (doc.matters.conf_make_meta.meta.creator_author.empty)
+        ? "" : xhtml_format.special_characters_text(doc.matters.conf_make_meta.meta.creator_author),
+      doc.matters.src.language,                                   // language, fix (needed in dochead metadata)
+      (doc.matters.conf_make_meta.meta.date_published.empty)
+        ? "" : xhtml_format.special_characters_date(doc.matters.conf_make_meta.meta.date_published),
+      (doc.matters.conf_make_meta.meta.rights_copyright.empty)
+        ? "" : xhtml_format.special_characters_text(doc.matters.conf_make_meta.meta.rights_copyright),
       _uuid,
       _uuid,
       (pth_epub3.fn_oebps_css).chompPrefix("OEBPS/"),
     );
     content ~= parts["manifest_documents"];
     // TODO sort jpg & png
-    foreach (image; doc_matters.srcs.image_list) {
+    foreach (image; doc.matters.srcs.image_list) {
       content ~= format(q"┃      <item id="%s" href="%s/%s" media-type="image/%s" />
   ┃",
         image.baseName.stripExtension,
@@ -158,8 +158,8 @@ template outputEPub3() {
     content ~= "  " ~ "</guide>"            ~ "\n  ";
     content ~= ""   ~ "</package>";
     debug(epubmanifest) {
-      foreach (section; doc_matters.has.keys_seq.seg) { // TODO
-        foreach (obj; doc_abstraction[section]) {
+      foreach (section; doc.matters.has.keys_seq.seg) { // TODO
+        foreach (obj; doc.abstraction[section]) {
           if (obj.metainfo.is_a == "heading") {
             if (obj.metainfo.heading_lev_markup == 4) {
               writefln(
@@ -183,7 +183,7 @@ template outputEPub3() {
     }
     return content;
   }
-  string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
+  string epub3_oebps_toc_nav_xhtml(D)(D doc) {
     enum DomTags { none, open, close, close_and_open, open_still, }
     auto markup = InlineMarkup();
     static auto rgx = RgxO();
@@ -202,12 +202,12 @@ template outputEPub3() {
     </header>
     <nav epub:type="toc" id="toc">
   ┃",
-            (doc_matters.conf_make_meta.meta.title_full).special_characters_text,
+            (doc.matters.conf_make_meta.meta.title_full).special_characters_text,
           );
     string _toc_nav_tail = "";
-    // writeln(doc_matters.has.keys_seq.seg); // DEBUG line
-    foreach (sect; doc_matters.has.keys_seq.seg) {
-      foreach (obj; doc_abstraction[sect]) {
+    // writeln(doc.matters.has.keys_seq.seg); // DEBUG line
+    foreach (sect; doc.matters.has.keys_seq.seg) {
+      foreach (obj; doc.abstraction[sect]) {
         if ((sect == "head") && (obj.metainfo.is_a == "heading")) {
           toc = toc_head;
         }
@@ -263,7 +263,7 @@ template outputEPub3() {
               }
               break;
             }
-            if (doc_matters.has.keys_seq.seg[doc_matters.has.keys_seq.seg.length - 2] == sect) {
+            if (doc.matters.has.keys_seq.seg[doc.matters.has.keys_seq.seg.length - 2] == sect) {
               // writeln(n, ": ", sect, ": ", _txt, " - ", obj.metainfo.dom_structure_collapsed_tags_status); // DEBUG
               // read last heading (heading prior to closing) and determine what those instructions imply still need to be done
               // CLOSE // DomTags { 0 none, 1 open, 2 close, 3 close_and_open, 4 open_still, }
@@ -296,16 +296,12 @@ template outputEPub3() {
     toc ~= _toc_nav_tail;
     return toc;
   }
-  @system void outputEPub3(D,I)(
-    const D    doc_abstraction,
-          I    doc_matters,
-  ) {
+  @system void outputEPub3(D)(D doc) {
     mixin spineRgxOut;
     mixin spineRgxXHTML;
     auto xhtml_format = outputXHTMLs();
     static auto rgx = RgxO();
     static auto rgx_xhtml = RgxXHTML();
-    string[] doc;
     string segment_filename;
     string[] top_level_headings = ["","","",""];
     string[string] oepbs_content_parts;
@@ -322,8 +318,8 @@ template outputEPub3() {
       string[] doc_parts;
     }
     auto epubWrite = writeOut();
-    foreach (section; doc_matters.has.keys_seq.seg) {
-      foreach (obj; doc_abstraction[section]) {
+    foreach (section; doc.matters.has.keys_seq.seg) {
+      foreach (obj; doc.abstraction[section]) {
         string _txt = xhtml_format.special_characters_breaks_indents_bullets(obj);
         if (obj.metainfo.is_a == "heading") {
           assert(section == "head" || "toc" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb" || "tail");
@@ -351,8 +347,8 @@ template outputEPub3() {
               goto default;
             default:
               epubWrite.doc_parts ~= obj.tags.segment_anchor_tag_epub;
-              epubWrite.doc_epub3[obj.tags.segment_anchor_tag_epub] ~= xhtml_format.epub3_seg_head(doc_matters);
-              Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "epub");
+              epubWrite.doc_epub3[obj.tags.segment_anchor_tag_epub] ~= xhtml_format.epub3_seg_head(doc.matters);
+              Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc.matters, suffix, "epub");
               epubWrite.doc_epub3[obj.tags.segment_anchor_tag_epub] ~= t[0];
               epubWrite.doc_epub3_endnotes[obj.tags.segment_anchor_tag_epub] ~= t[1];
               break;
@@ -360,19 +356,19 @@ template outputEPub3() {
             break;
           case 4:
             segment_filename = obj.tags.segment_anchor_tag_epub;
-            epubWrite.doc_epub3[segment_filename] ~= xhtml_format.epub3_seg_head(doc_matters);
-            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "epub");
+            epubWrite.doc_epub3[segment_filename] ~= xhtml_format.epub3_seg_head(doc.matters);
+            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc.matters, suffix, "epub");
             epubWrite.doc_epub3[segment_filename] ~= t[0];
             epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
             break;
           case 5: .. case 7:
-            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "epub");
+            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc.matters, suffix, "epub");
             epubWrite.doc_epub3[segment_filename] ~= t[0];
             epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
             break;
           case 8: .. case 9:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_epub) {
+              if (doc.matters.opt.action.debug_do_epub) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a, ": ", obj.metainfo.heading_lev_markup);
                 writeln(__FILE__, ":", __LINE__, ": ", obj.text);
               }
@@ -380,7 +376,7 @@ template outputEPub3() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_epub) {
+              if (doc.matters.opt.action.debug_do_epub) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a, ": ", obj.metainfo.heading_lev_markup);
               }
             }
@@ -395,13 +391,13 @@ template outputEPub3() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "toc":
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               default:
                 { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_epub) {
+                  if (doc.matters.opt.action.debug_do_epub) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -410,7 +406,7 @@ template outputEPub3() {
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_epub) {
+                if (doc.matters.opt.action.debug_do_epub) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
                 }
               }
@@ -422,13 +418,13 @@ template outputEPub3() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "para":
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               default:
                 { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_epub) {
+                  if (doc.matters.opt.action.debug_do_epub) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -438,37 +434,37 @@ template outputEPub3() {
             case "block":
               switch (obj.metainfo.is_a) {
               case "quote":
-                t = xhtml_format.quote_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.quote_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0].to!string;
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "group":
-                t = xhtml_format.group_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.group_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0].to!string;
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "block":
-                t = xhtml_format.block_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.block_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0].to!string;
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "poem":
                 break;
               case "verse":
-                t = xhtml_format.verse_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.verse_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0].to!string;
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "code":
-                epubWrite.doc_epub3[segment_filename] ~= xhtml_format.code(_txt, obj, doc_matters);
+                epubWrite.doc_epub3[segment_filename] ~= xhtml_format.code(_txt, obj, doc.matters);
                 break;
               case "table":
-                epubWrite.doc_epub3[segment_filename] ~= xhtml_format.table(_txt, obj, doc_matters);
+                epubWrite.doc_epub3[segment_filename] ~= xhtml_format.table(_txt, obj, doc.matters);
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= "";
                 break;
               default:
                 { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_epub) {
+                  if (doc.matters.opt.action.debug_do_epub) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -477,7 +473,7 @@ template outputEPub3() {
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_epub) {
+                if (doc.matters.opt.action.debug_do_epub) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
                 }
               }
@@ -490,37 +486,37 @@ template outputEPub3() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "endnote":             assert(section == "endnotes");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 break;
               case "glossary":            assert(section == "glossary");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "bibliography":        assert(section == "bibliography");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "bookindex":           assert(section == "bookindex");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "blurb":               assert(section == "blurb");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "tail":                assert(section == "tail");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "epub");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "epub");
                 epubWrite.doc_epub3[segment_filename] ~= t[0];
                 epubWrite.doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               default:
                 { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_epub) {
+                  if (doc.matters.opt.action.debug_do_epub) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -529,7 +525,7 @@ template outputEPub3() {
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_epub) {
+                if (doc.matters.opt.action.debug_do_epub) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
                 }
               }
@@ -540,7 +536,7 @@ template outputEPub3() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_epub) {
+              if (doc.matters.opt.action.debug_do_epub) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part);
               }
             }
@@ -597,9 +593,9 @@ template outputEPub3() {
     /+ epub specific documents +/
     epubWrite.mimetypes              = epub3_mimetypes;
     epubWrite.meta_inf_container_xml = epub3_container_xml;
-    epubWrite.oebps_toc_nav_xhtml    = doc_abstraction.epub3_oebps_toc_nav_xhtml(doc_matters);
-    epubWrite.oebps_content_opf      = doc_abstraction.epub3_oebps_content(doc_matters, oepbs_content_parts);
-    epubWrite.epub3_write_output_files(doc_matters);
+    epubWrite.oebps_toc_nav_xhtml    = doc.epub3_oebps_toc_nav_xhtml;
+    epubWrite.oebps_content_opf      = doc.epub3_oebps_content(oepbs_content_parts);
+    epubWrite.epub3_write_output_files(doc.matters);
   }
   @system void epub3_write_output_files(W,M)(
     W epub_write,
diff --git a/src/sisudoc/io_out/html.d b/src/sisudoc/io_out/html.d
index c1f0aa5..6d3129a 100644
--- a/src/sisudoc/io_out/html.d
+++ b/src/sisudoc/io_out/html.d
@@ -64,22 +64,19 @@ template outputHTML() {
     sisudoc.io_out.xmls,
     sisudoc.io_out.xmls_css;
   mixin outputXHTMLs;
-  void scroll(D,M)(
-    const        D    doc_abstraction,
-                 M    doc_matters,
-  ) {
+  void scroll(D)(D doc) {
     mixin spineRgxOut;
     mixin spineRgxXHTML;
     auto xhtml_format = outputXHTMLs();
     static auto rgx = RgxO();
     static auto rgx_xhtml = RgxXHTML();
     string[] doc_html;
-    string[] doc;
+    string[] doc_out;
     string suffix = ".html";
     string previous_section = "";
     string delimit = "";
-    foreach (section; doc_matters.has.keys_seq.scroll) {
-      foreach (obj; doc_abstraction[section]) {
+    foreach (section; doc.matters.has.keys_seq.scroll) {
+      foreach (obj; doc.abstraction[section]) {
         delimit = xhtml_format.div_delimit(section, previous_section);
         string _txt = xhtml_format.special_characters_breaks_indents_bullets(obj);
         switch (obj.metainfo.is_of_part) {
@@ -88,14 +85,14 @@ template outputHTML() {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "toc":
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_html) {
+                if (doc.matters.opt.action.debug_do_html) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -104,7 +101,7 @@ template outputHTML() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_html) {
+              if (doc.matters.opt.action.debug_do_html) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
               }
             }
@@ -116,14 +113,14 @@ template outputHTML() {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "para":
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_html) {
+                if (doc.matters.opt.action.debug_do_html) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -133,28 +130,28 @@ template outputHTML() {
           case "block":
             switch (obj.metainfo.is_a) {
             case "quote":
-              doc_html ~= xhtml_format.quote_scroll(_txt, obj, doc_matters);
+              doc_html ~= xhtml_format.quote_scroll(_txt, obj, doc.matters);
               break;
             case "group":
-              doc_html ~= xhtml_format.group_scroll(_txt, obj, doc_matters);
+              doc_html ~= xhtml_format.group_scroll(_txt, obj, doc.matters);
               break;
             case "block":
-              doc_html ~= xhtml_format.block_scroll(_txt, obj, doc_matters);
+              doc_html ~= xhtml_format.block_scroll(_txt, obj, doc.matters);
               break;
             case "poem":
               break;
             case "verse":
-              doc_html ~= xhtml_format.verse_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.verse_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "code":
-              doc_html ~= xhtml_format.code(_txt, obj, doc_matters);
+              doc_html ~= xhtml_format.code(_txt, obj, doc.matters);
               break;
             case "table":
-              doc_html ~= xhtml_format.table(_txt, obj, doc_matters);
+              doc_html ~= xhtml_format.table(_txt, obj, doc.matters);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_html) {
+                if (doc.matters.opt.action.debug_do_html) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -163,7 +160,7 @@ template outputHTML() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_html) {
+              if (doc.matters.opt.action.debug_do_html) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
               }
             }
@@ -176,29 +173,29 @@ template outputHTML() {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "endnote":              assert(section == "endnotes");
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "glossary":             assert(section == "glossary");
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "bibliography":         assert(section == "bibliography");
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "bookindex":            assert(section == "bookindex");
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "blurb":                assert(section == "blurb");
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             case "tail":                 assert(section == "tail");
-              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc.matters, suffix);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_html) {
+                if (doc.matters.opt.action.debug_do_html) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -207,7 +204,7 @@ template outputHTML() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_html) {
+              if (doc.matters.opt.action.debug_do_html) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
               }
             }
@@ -218,7 +215,7 @@ template outputHTML() {
           break;
         default:
           { /+ debug +/
-            if (doc_matters.opt.action.debug_do_html) {
+            if (doc.matters.opt.action.debug_do_html) {
               writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part);
               writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
               writeln(__FILE__, ":", __LINE__, ": ", obj.text);
@@ -228,18 +225,18 @@ template outputHTML() {
         }
       }
     }
-    doc = xhtml_format.html_head(doc_matters, "scroll")
+    doc_out = xhtml_format.html_head(doc.matters, "scroll")
     ~ doc_html
     ~ xhtml_format.dom_close
-    ~ xhtml_format.tail(doc_matters);
-    scroll_write_output(doc, doc_matters);
+    ~ xhtml_format.tail(doc.matters);
+    scroll_write_output(doc_out, doc.matters);
   }
-  @trusted void scroll_write_output(D,M)(
-    D doc,
+  @trusted void scroll_write_output(O,M)(
+    O doc_out,
     M doc_matters,
   ) {
     debug(asserts) {
-      static assert(is(typeof(doc)    == string[]));
+      static assert(is(typeof(doc_out)    == string[]));
     }
     auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
     try {
@@ -248,7 +245,7 @@ template outputHTML() {
       }
       {
         auto f = File(pth_html.fn_scroll(doc_matters.src.filename), "w");
-        foreach (o; doc) {
+        foreach (o; doc_out) {
           f.writeln(o);
         }
       }
@@ -271,10 +268,7 @@ template outputHTML() {
       writeln(" ", pth_html.fn_scroll(doc_matters.src.filename));
     }
   }
-  void seg(D,M)(
-    const D    doc_abstraction,
-          M    doc_matters,
-  ) {
+  void seg(D)(D doc) {
     mixin spineRgxOut;
     mixin spineRgxXHTML;
     static auto rgx = RgxO();
@@ -282,15 +276,14 @@ template outputHTML() {
     auto xhtml_format = outputXHTMLs();
     string[][string] doc_html;
     string[][string] doc_html_endnotes;
-    string[] doc;
     string segment_filename;
     string[] top_level_headings = ["","","",""];
     string previous_seg_filename = "";
     string suffix = ".html";
     string previous_section = "";
     string delimit = "";
-    foreach (section; doc_matters.has.keys_seq.seg) {
-      foreach (obj; doc_abstraction[section]) {
+    foreach (section; doc.matters.has.keys_seq.seg) {
+      foreach (obj; doc.abstraction[section]) {
         delimit = xhtml_format.div_delimit(section, previous_section);
         string _txt = xhtml_format.special_characters_breaks_indents_bullets(obj);
         if (obj.metainfo.is_a == "heading") {
@@ -318,33 +311,33 @@ template outputHTML() {
               top_level_headings[3] = "";
               goto default;
             default:
-              Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "seg");
+              Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc.matters, suffix, "seg");
               top_level_headings[obj.metainfo.heading_lev_markup] = t[0];
               break;
             }
             break;
           case 4:
             segment_filename = obj.tags.segment_anchor_tag_epub;
-            doc_html[segment_filename] ~= xhtml_format.html_head(doc_matters, "seg");
-            auto navigation_bar = xhtml_format.nav_pre_next_svg(obj, doc_matters);
+            doc_html[segment_filename] ~= xhtml_format.html_head(doc.matters, "seg");
+            auto navigation_bar = xhtml_format.nav_pre_next_svg(obj, doc.matters);
             doc_html[segment_filename] ~= navigation_bar.toc_pre_next;
             previous_seg_filename = segment_filename;
             foreach (top_level_heading; top_level_headings) {
               doc_html[segment_filename] ~= top_level_heading;
             }
-            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "seg");
+            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc.matters, suffix, "seg");
             doc_html[segment_filename] ~= t[0].to!string;
-            doc_html[segment_filename] ~= xhtml_format.lev4_heading_subtoc(obj, doc_matters);
+            doc_html[segment_filename] ~= xhtml_format.lev4_heading_subtoc(obj, doc.matters);
             doc_html_endnotes[segment_filename] ~= t[1];
             break;
           case 5: .. case 7:
-            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "seg");
+            Tuple!(string, string[]) t = xhtml_format.heading_seg(_txt, obj, doc.matters, suffix, "seg");
             doc_html[segment_filename] ~= t[0].to!string;
             doc_html_endnotes[segment_filename] ~= t[1];
             break;
           case 8: .. case 9:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_html) {
+              if (doc.matters.opt.action.debug_do_html) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a, ": ", obj.metainfo.heading_lev_markup);
                 writeln(__FILE__, ":", __LINE__, ": ", obj.text);
               }
@@ -352,7 +345,7 @@ template outputHTML() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_html) {
+              if (doc.matters.opt.action.debug_do_html) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a, ": ", obj.metainfo.heading_lev_markup);
               }
             }
@@ -367,12 +360,12 @@ template outputHTML() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "toc":
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 break;
               default:
                 { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_html) {
+                  if (doc.matters.opt.action.debug_do_html) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -381,7 +374,7 @@ template outputHTML() {
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_html) {
+                if (doc.matters.opt.action.debug_do_html) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -393,13 +386,13 @@ template outputHTML() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "para":
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               default:
                 { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_html) {
+                  if (doc.matters.opt.action.debug_do_html) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -409,24 +402,24 @@ template outputHTML() {
             case "block":
               switch (obj.metainfo.is_a) {
               case "quote":
-                t = xhtml_format.quote_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.quote_seg(_txt, obj, doc.matters, suffix, "seg");
                 goto default;
               case "group":
-                t = xhtml_format.group_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.group_seg(_txt, obj, doc.matters, suffix, "seg");
                 goto default;
               case "block":
-                t = xhtml_format.block_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.block_seg(_txt, obj, doc.matters, suffix, "seg");
                 goto default;
               case "poem":
                 break;
               case "verse":
-                t = xhtml_format.verse_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.verse_seg(_txt, obj, doc.matters, suffix, "seg");
                 goto default;
               case "code":
-                doc_html[segment_filename] ~= xhtml_format.code(_txt, obj, doc_matters);
+                doc_html[segment_filename] ~= xhtml_format.code(_txt, obj, doc.matters);
                 break;
               case "table":
-                doc_html[segment_filename] ~= xhtml_format.table(_txt, obj, doc_matters);
+                doc_html[segment_filename] ~= xhtml_format.table(_txt, obj, doc.matters);
                 doc_html_endnotes[segment_filename] ~= "";
                 break;
               default:
@@ -438,7 +431,7 @@ template outputHTML() {
                   doc_html[segment_filename] ~= t[0].to!string;
                   doc_html_endnotes[segment_filename] ~= t[1];
                 } else { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_html) {
+                  if (doc.matters.opt.action.debug_do_html) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -447,7 +440,7 @@ template outputHTML() {
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_html) {
+                if (doc.matters.opt.action.debug_do_html) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
                 }
               }
@@ -460,37 +453,37 @@ template outputHTML() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "endnote":             assert(section == "endnotes");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 break;
               case "glossary":            assert(section == "glossary");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "bibliography":        assert(section == "bibliography");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "bookindex":           assert(section == "bookindex");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "blurb":               assert(section == "blurb");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "tail":                assert(section == "tail");
-                t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
+                t = xhtml_format.para_seg(_txt, obj, doc.matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               default:
                 { /+ debug +/
-                  if (doc_matters.opt.action.debug_do_html) {
+                  if (doc.matters.opt.action.debug_do_html) {
                     writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                   }
                 }
@@ -499,7 +492,7 @@ template outputHTML() {
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_html) {
+                if (doc.matters.opt.action.debug_do_html) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
                 }
               }
@@ -510,7 +503,7 @@ template outputHTML() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_html) {
+              if (doc.matters.opt.action.debug_do_html) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part);
               }
             }
@@ -519,7 +512,7 @@ template outputHTML() {
         }
       }
     }
-    seg_write_output(doc_html, doc_html_endnotes, doc_matters);
+    seg_write_output(doc_html, doc_html_endnotes, doc.matters);
   }
   @trusted void seg_write_output(D,E,M)( // @system?
     D doc_html,
@@ -587,9 +580,7 @@ template outputHTML() {
       // Handle error
     }
   }
-  @trusted void images_cp(M)( // @system
-    M    doc_matters,
-  ) {
+  @trusted void images_cp(M)(M doc_matters) { // @system
     { /+ (copy html images) +/
       auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
       if (!exists(pth_html.image)) {
diff --git a/src/sisudoc/io_out/hub.d b/src/sisudoc/io_out/hub.d
index 498fa5c..8c41ce5 100644
--- a/src/sisudoc/io_out/hub.d
+++ b/src/sisudoc/io_out/hub.d
@@ -59,101 +59,98 @@ template outputHub() {
     sisudoc.io_out.xmls,
     sisudoc.io_out.create_zip_file,
     sisudoc.io_out.paths_output;
-  @system void outputHub(D,I)(
-    const D doc_abstraction,
-    I doc_matters
-  ) {
+  @system void outputHub(D)(D doc) {
     mixin Msg;
-    auto msg = Msg!()(doc_matters);
+    auto msg = Msg!()(doc.matters);
     enum outTask { source_or_pod, sqlite, sqlite_multi, latex, odt, epub, html_scroll, html_seg, html_stuff }
-    void Scheduled(D,I)(int sched, D doc_abstraction, I doc_matters) {
-      auto msg = Msg!()(doc_matters);
+    void Scheduled(D)(int sched, D doc) {
+      auto msg = Msg!()(doc.matters);
       if (sched == outTask.source_or_pod) {
         msg.v("spine (doc reform) source processing... ");
-        if (doc_matters.opt.action.pod) { msg.v("spine (doc reform) source pod processing... "); }
+        if (doc.matters.opt.action.pod) { msg.v("spine (doc reform) source pod processing... "); }
         import sisudoc.io_out.source_pod;
-        spinePod!()(doc_matters);
-        if (doc_matters.opt.action.source) { msg.vv("spine (doc reform) source done"); }
-        if (doc_matters.opt.action.pod) { msg.vv("spine (doc reform) source pod done"); }
+        spinePod!()(doc.matters);
+        if (doc.matters.opt.action.source) { msg.vv("spine (doc reform) source done"); }
+        if (doc.matters.opt.action.pod) { msg.vv("spine (doc reform) source pod done"); }
       }
       if (sched == outTask.epub) {
         msg.v("epub3 processing... ");
         import sisudoc.io_out.epub3;
-        doc_abstraction.outputEPub3!()(doc_matters);
+        doc.outputEPub3!();
         msg.vv("epub3 done");
       }
       if (sched == outTask.html_stuff) {
-        outputMetadata!()(doc_matters);
+        outputMetadata!()(doc.matters);
         msg.vv("html metadata done");
       }
       if (sched == outTask.html_scroll) {
         msg.v("html scroll processing... ");
         import sisudoc.io_out.html;
-        outputHTML!().scroll(doc_abstraction, doc_matters);
+        outputHTML!().scroll(doc);
         msg.vv("html scroll done");
       }
       if (sched == outTask.html_seg) {
         msg.v("html seg processing... ");
         import sisudoc.io_out.html;
-        outputHTML!().seg(doc_abstraction, doc_matters);
+        outputHTML!().seg(doc);
         msg.vv("html seg done");
       }
       if (sched == outTask.html_stuff) {
         import sisudoc.io_out.html;
-        outputHTML!().css(doc_matters);
-        outputHTML!().images_cp(doc_matters);
+        outputHTML!().css(doc.matters);
+        outputHTML!().images_cp(doc.matters);
         msg.vv("html css & images done");
       }
       if (sched == outTask.latex) {
         msg.v("latex processing... (available for downstream processing & pdf output");
         import sisudoc.io_out.latex;
         import std.file;
-        if ((isValidPath(doc_matters.output_path ~ "/latex/sty"))
-          && (!(exists(doc_matters.output_path ~ "/latex/sty")))
+        if ((isValidPath(doc.matters.output_path ~ "/latex/sty"))
+          && (!(exists(doc.matters.output_path ~ "/latex/sty")))
         ) {
           outputLaTeXstyInit!()(
-            doc_matters.output_path,
-            doc_matters.opt.action.generated_by,
-            doc_matters.generator_program.name_version_and_compiler,
-            doc_matters.generator_program.time_output_generated,
+            doc.matters.output_path,
+            doc.matters.opt.action.generated_by,
+            doc.matters.generator_program.name_version_and_compiler,
+            doc.matters.generator_program.time_output_generated,
           );
         }
-        outputLaTeX!()(doc_abstraction, doc_matters);
+        outputLaTeX!()(doc.abstraction, doc.matters);
         msg.vv("latex done");
       }
       if (sched == outTask.odt) {
         msg.v("odf:odt processing... ");
         import sisudoc.io_out.odt;
-        outputODT!()(doc_abstraction, doc_matters);
+        outputODT!()(doc.abstraction, doc.matters);
         msg.vv("odf:odt done");
       }
       if (sched == outTask.sqlite) {
         msg.v("sqlite processing... ");
         import sisudoc.io_out.sqlite;
-        doc_abstraction.SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters);
+        doc.SQLiteHubDiscreteBuildTablesAndPopulate!();
         msg.vv("sqlite done");
       }
     }
-    if (doc_matters.opt.action.vox_gt0) { writeln(doc_matters.src.filename_base); }
-    if (!(doc_matters.opt.action.parallelise_subprocesses)) {
-      foreach(schedule; doc_matters.opt.action.output_task_scheduler) {
-        Scheduled!()(schedule, doc_abstraction, doc_matters);
+    if (doc.matters.opt.action.vox_gt0) { writeln(doc.matters.src.filename_base); }
+    if (!(doc.matters.opt.action.parallelise_subprocesses)) {
+      foreach(schedule; doc.matters.opt.action.output_task_scheduler) {
+        Scheduled!()(schedule, doc);
       }
     } else {
       import std.parallelism;
-      foreach(schedule; parallel(doc_matters.opt.action.output_task_scheduler)) {
-        Scheduled!()(schedule, doc_abstraction, doc_matters);
+      foreach(schedule; parallel(doc.matters.opt.action.output_task_scheduler)) {
+        Scheduled!()(schedule, doc);
       }
     }
-    if (doc_matters.opt.action.sqlite_update) {
+    if (doc.matters.opt.action.sqlite_update) {
       msg.v("sqlite update processing...");
       import sisudoc.io_out.sqlite;
-      doc_abstraction.SQLiteHubBuildTablesAndPopulate!()(doc_matters);
+      doc.SQLiteHubBuildTablesAndPopulate!();
       msg.vv("sqlite update done");
-    } else if (doc_matters.opt.action.sqlite_delete) {
+    } else if (doc.matters.opt.action.sqlite_delete) {
       msg.v("sqlite delete processing...");
       import sisudoc.io_out.sqlite;
-      doc_abstraction.SQLiteHubBuildTablesAndPopulate!()(doc_matters);
+      doc.SQLiteHubBuildTablesAndPopulate!();
       msg.vv("sqlite delete done");
     }
   }
diff --git a/src/sisudoc/io_out/sqlite.d b/src/sisudoc/io_out/sqlite.d
index 4075bba..8776c9f 100644
--- a/src/sisudoc/io_out/sqlite.d
+++ b/src/sisudoc/io_out/sqlite.d
@@ -66,11 +66,8 @@ static auto rgx_xhtml = RgxXHTML();
 static auto mkup = InlineMarkup();
 long _metadata_tid_lastrowid;
 template SQLiteHubBuildTablesAndPopulate() {
-  void SQLiteHubBuildTablesAndPopulate(D,M)(
-    const D  doc_abstraction,
-          M  doc_matters,
-  ) {
-    auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.sqlite.path);
+  void SQLiteHubBuildTablesAndPopulate(D)(D doc) {
+    auto pth_sqlite = spinePathsSQLite!()(doc.matters.sqlite.filename, doc.matters.sqlite.path);
     if ((isValidPath(pth_sqlite.base) && exists(pth_sqlite.base) != 0 && pth_sqlite.base.isDir)) {
     } else {
       try {
@@ -78,14 +75,13 @@ template SQLiteHubBuildTablesAndPopulate() {
       } catch (FileException ex) { }
     }
     template SQLiteDbStatementComposite() {
-      void SQLiteDbStatementComposite(Db,D,M)(
-              Db   db,
-        const D    doc_abstraction,
-              M    doc_matters,
+      void SQLiteDbStatementComposite(Db,D)(
+        Db   db,
+        D    doc
       ) {
         string _db_statement;
-        if ((doc_matters.opt.action.sqlite_db_create)) {
-          auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.sqlite.path);
+        if ((doc.matters.opt.action.sqlite_db_create)) {
+          auto pth_sqlite = spinePathsSQLite!()(doc.matters.sqlite.filename, doc.matters.sqlite.path);
           if ((isValidPath(pth_sqlite.base) && exists(pth_sqlite.base) != 0 && pth_sqlite.base.isDir)) {
           } else {
             try {
@@ -93,38 +89,38 @@ template SQLiteHubBuildTablesAndPopulate() {
             } catch (FileException ex) { }
           }
           _db_statement ~= SQLiteTablesReCreate!()();
-          SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "TABLE RE-CREATE");
+          SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "TABLE RE-CREATE");
           _db_statement = [];
         }
-        if (doc_matters.opt.action.sqlite_delete) {
-          _db_statement ~= SQLiteDeleteDocument!()(doc_matters);
-          SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document");
+        if (doc.matters.opt.action.sqlite_delete) {
+          _db_statement ~= SQLiteDeleteDocument!()(doc.matters);
+          SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "DELETE Document");
           _db_statement = [];
         }
-        if (doc_matters.opt.action.sqlite_update) {
-          _db_statement ~= SQLiteDeleteDocument!()(doc_matters);
-          SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document");
+        if (doc.matters.opt.action.sqlite_update) {
+          _db_statement ~= SQLiteDeleteDocument!()(doc.matters);
+          SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "DELETE Document");
           _db_statement = [];
-          _db_statement ~= SQLiteInsertMetadata!()(doc_matters);
-          SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "INSERT MetaData");
+          _db_statement ~= SQLiteInsertMetadata!()(doc.matters);
+          SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "INSERT MetaData");
           _db_statement = [];
-          /+ get tid (lastrowid or max) for use in doc_objects table +/
-          _db_statement ~= doc_abstraction.SQLiteInsertDocObjectsLoop!()(doc_matters);
-          SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "INSERT DocObjects");
+          /+ get tid (lastrowid or max) for use in doc.objects table +/
+          _db_statement ~= doc.SQLiteInsertDocObjectsLoop!();
+          SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "INSERT DocObjects");
           _db_statement = [];
-         _db_statement ~= SQLiteInsertMetadataTopics!()(doc_matters);
-          SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "INSERT MetaDataTopics");
+         _db_statement ~= SQLiteInsertMetadataTopics!()(doc.matters);
+          SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "INSERT MetaDataTopics");
           _db_statement = [];
         }
         db.close;
-        if (doc_matters.opt.action.vox_gt0) {
+        if (doc.matters.opt.action.vox_gt0) {
           writeln(" ", pth_sqlite.sqlite_file);
         }
       }
     }
     try {
       auto db = Database(pth_sqlite.sqlite_file);
-      SQLiteDbStatementComposite!()(db, doc_abstraction, doc_matters);
+      SQLiteDbStatementComposite!()(db, doc);
     }
     catch (FileException e) {
       writeln("Failed (FileException): ", e.msg, " ", pth_sqlite.sqlite_file);
@@ -152,33 +148,29 @@ template SQLiteHubBuildTablesAndPopulate() {
   }
 }
 template SQLiteHubDiscreteBuildTablesAndPopulate() {
-  void SQLiteHubDiscreteBuildTablesAndPopulate(D,M)(
-    const D    doc_abstraction,
-          M    doc_matters,
-  ) {
-    auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.w_srv_data_root_url_html, doc_matters.src.language);
-    auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); // doc_matters.db_path
+  void SQLiteHubDiscreteBuildTablesAndPopulate(D)(D doc) {
+    auto url_html = spineUrlsHTML!()(doc.matters.conf_make_meta.conf.w_srv_data_root_url_html, doc.matters.src.language);
+    auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc.matters.output_path, doc.matters.src.language); // doc.matters.db_path
     if ((isValidPath(pth_sqlite.base) && exists(pth_sqlite.base) != 0 && pth_sqlite.base.isDir)) {
     } else {
       try {
         pth_sqlite.base.mkdirRecurse;
       } catch (FileException ex) { }
     }
-    auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename));
+    auto db = Database(pth_sqlite.sqlite_file(doc.matters.src.filename));
     template SQLiteDiscreteDbStatementComposite() {
-      void SQLiteDiscreteDbStatementComposite(Db,D,M)(
-              Db   db,
-        const D    doc_abstraction,
-              M    doc_matters,
+      void SQLiteDiscreteDbStatementComposite(Db,D)(
+        Db   db,
+        D    doc
       ) {
         try {
           {
             string _db_statement;
             _db_statement ~= SQLiteTablesReCreate!()();
-            _db_statement ~= SQLiteInsertMetadata!()(doc_matters);
-            _db_statement ~= SQLiteInsertMetadataTopics!()(doc_matters);
-            _db_statement ~= doc_abstraction.SQLiteInsertDocObjectsLoop!()(doc_matters);
-            SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "table CREATE Tables, INSERT DocObjects");
+            _db_statement ~= SQLiteInsertMetadata!()(doc.matters);
+            _db_statement ~= SQLiteInsertMetadataTopics!()(doc.matters);
+            _db_statement ~= doc.SQLiteInsertDocObjectsLoop!();
+            SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "table CREATE Tables, INSERT DocObjects");
           }
           db.close;
         }
@@ -204,12 +196,12 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() {
           import core.runtime;
           core.runtime.Runtime.terminate();
         }
-        if (doc_matters.opt.action.vox_gt0) {
-          writeln(" ", pth_sqlite.sqlite_file(doc_matters.src.filename));
+        if (doc.matters.opt.action.vox_gt0) {
+          writeln(" ", pth_sqlite.sqlite_file(doc.matters.src.filename));
         }
       }
     }
-    SQLiteDiscreteDbStatementComposite!()(db, doc_abstraction, doc_matters);
+    SQLiteDiscreteDbStatementComposite!()(db, doc);
   }
 }
 template SQLiteDbRun() {
@@ -251,9 +243,7 @@ template SQLinsertDelimiter() {
   }
 }
 template SQLiteFormatAndLoadObject() {
-  auto SQLiteFormatAndLoadObject(M)(
-    M    doc_matters,
-  ) {
+  auto SQLiteFormatAndLoadObject(M)(M doc_matters) {
     mixin spineRgxOut;
     mixin spineRgxXHTML;
     struct sqlite_format_and_load_objects {
@@ -1143,9 +1133,7 @@ template SQLiteTablesReCreate() {
   }
 }
 template SQLiteDeleteDocument() {
-  string SQLiteDeleteDocument(M)(
-    M doc_matters,
-  ) {
+  string SQLiteDeleteDocument(M)(M doc_matters) {
     string _uid = doc_matters.src.doc_uid;
     string _delete_uid = format(q"┃
     DELETE FROM metadata_and_text
@@ -1160,9 +1148,7 @@ template SQLiteDeleteDocument() {
   }
 }
 template SQLiteInsertMetadata() {
-  string SQLiteInsertMetadata(M)(
-    M doc_matters,
-  ) {
+  string SQLiteInsertMetadata(M)(M doc_matters) {
     string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid);
     string _insert_metadata = format(q"┃
       INSERT INTO metadata_and_text (
@@ -1276,9 +1262,7 @@ template SQLiteInsertMetadata() {
   }
 }
 template SQLiteInsertMetadataTopics() {
-  string SQLiteInsertMetadataTopics(M)(
-    M doc_matters,
-  ) {
+  string SQLiteInsertMetadataTopics(M)(M doc_matters) {
     string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid);
     string[] _insert_topics;
     foreach (topic_line; doc_matters.conf_make_meta.meta.classify_topic_register_expanded_arr) {
@@ -1301,12 +1285,9 @@ template SQLiteInsertMetadataTopics() {
   }
 }
 template SQLiteInsertDocObjectsLoop() {
-  string SQLiteInsertDocObjectsLoop(D,M)(
-    const D    doc_abstraction,
-          M    doc_matters,
-  ) {
-    string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid);
-    auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.w_srv_data_root_url_html, doc_matters.src.language);
+  string SQLiteInsertDocObjectsLoop(D)(D doc) {
+    string _uid = SQLinsertDelimiter!()(doc.matters.src.doc_uid);
+    auto url_html = spineUrlsHTML!()(doc.matters.conf_make_meta.conf.w_srv_data_root_url_html, doc.matters.src.language);
     string insertDocObjectsRow(O)(O obj) {
       string _insert_doc_objects_row = format(q"┃
         INSERT INTO doc_objects (
@@ -1336,23 +1317,23 @@ template SQLiteInsertDocObjectsLoop() {
       );
       return _insert_doc_objects_row;
     }
-    auto format_and_sqlite_load = SQLiteFormatAndLoadObject!()(doc_matters);
+    auto format_and_sqlite_load = SQLiteFormatAndLoadObject!()(doc.matters);
     string[string] obj_txt;
     string doc_text;
     string[] _insert_doc_objects;
-    foreach (part; doc_matters.has.keys_seq.sql) {
-      foreach (obj; doc_abstraction[part]) {
+    foreach (part; doc.matters.has.keys_seq.sql) {
+      foreach (obj; doc.abstraction[part]) {
         switch (obj.metainfo.is_of_part) {
         case "frontmatter":              assert(part == "head", part);
           switch (obj.metainfo.is_of_type) {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              obj_txt = format_and_sqlite_load.heading(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.heading(doc.matters, obj);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_sqlite) {
+                if (doc.matters.opt.action.debug_do_sqlite) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -1361,7 +1342,7 @@ template SQLiteInsertDocObjectsLoop() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_sqlite) {
+              if (doc.matters.opt.action.debug_do_sqlite) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
               }
             }
@@ -1378,14 +1359,14 @@ template SQLiteInsertDocObjectsLoop() {
                   writeln(__LINE__, ": ", obj.text);
                 }
               }
-              obj_txt = format_and_sqlite_load.heading(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.heading(doc.matters, obj);
               break;
             case "para":
-              obj_txt = format_and_sqlite_load.para(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.para(doc.matters, obj);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_sqlite) {
+                if (doc.matters.opt.action.debug_do_sqlite) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -1395,28 +1376,28 @@ template SQLiteInsertDocObjectsLoop() {
           case "block":
             switch (obj.metainfo.is_a) {
             case "quote":
-              obj_txt = format_and_sqlite_load.quote(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.quote(doc.matters, obj);
               break;
             case "group":
-              obj_txt = format_and_sqlite_load.group(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.group(doc.matters, obj);
               break;
             case "block":
-              obj_txt = format_and_sqlite_load.block(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.block(doc.matters, obj);
               break;
             case "poem":                        // double check on keeping both poem & verse
               break;
             case "verse":
-              obj_txt = format_and_sqlite_load.verse(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.verse(doc.matters, obj);
               break;
             case "code":
-              obj_txt = format_and_sqlite_load.code(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.code(doc.matters, obj);
               break;
             case "table":
-              obj_txt = format_and_sqlite_load.table(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.table(doc.matters, obj);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_sqlite) {
+                if (doc.matters.opt.action.debug_do_sqlite) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -1425,7 +1406,7 @@ template SQLiteInsertDocObjectsLoop() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_sqlite) {
+              if (doc.matters.opt.action.debug_do_sqlite) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
               }
             }
@@ -1438,23 +1419,23 @@ template SQLiteInsertDocObjectsLoop() {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              obj_txt = format_and_sqlite_load.heading(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.heading(doc.matters, obj);
               break;
             case "glossary":             assert(part == "glossary", part);
-              obj_txt = format_and_sqlite_load.para(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.para(doc.matters, obj);
               break;
             case "bibliography":         assert(part == "bibliography", part);
-              obj_txt = format_and_sqlite_load.para(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.para(doc.matters, obj);
               break;
             case "bookindex":            assert(part == "bookindex", part);
-              obj_txt = format_and_sqlite_load.para(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.para(doc.matters, obj);
               break;
             case "blurb":                assert(part == "blurb", part);
-              obj_txt = format_and_sqlite_load.para(doc_matters, obj);
+              obj_txt = format_and_sqlite_load.para(doc.matters, obj);
               break;
             default:
               { /+ debug +/
-                if (doc_matters.opt.action.debug_do_sqlite) {
+                if (doc.matters.opt.action.debug_do_sqlite) {
                   writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
                 }
               }
@@ -1463,7 +1444,7 @@ template SQLiteInsertDocObjectsLoop() {
             break;
           default:
             { /+ debug +/
-              if (doc_matters.opt.action.debug_do_sqlite) {
+              if (doc.matters.opt.action.debug_do_sqlite) {
                 writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
               }
             }
@@ -1474,7 +1455,7 @@ template SQLiteInsertDocObjectsLoop() {
           break;
         default:
           { /+ debug +/
-            if (doc_matters.opt.action.debug_do_sqlite) {
+            if (doc.matters.opt.action.debug_do_sqlite) {
               writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part); // check where empty value could come from
               writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
               writeln(__FILE__, ":", __LINE__, ": ", obj.text); // check where empty value could come from
@@ -1483,9 +1464,9 @@ template SQLiteInsertDocObjectsLoop() {
           break;
         }
         if (obj.metainfo.is_a == "heading") {
-          if (doc_matters.opt.action.show_sqlite) {
+          if (doc.matters.opt.action.show_sqlite) {
             if (obj.metainfo.heading_lev_markup == 0) {
-              writeln(doc_matters.src.filename);
+              writeln(doc.matters.src.filename);
             }
             writeln(
               "markup: ", obj.metainfo.heading_lev_markup,
diff --git a/src/sisudoc/spine.d b/src/sisudoc/spine.d
index 81713c0..e6e163d 100755
--- a/src/sisudoc/spine.d
+++ b/src/sisudoc/spine.d
@@ -1060,8 +1060,6 @@ string program_name = "spine";
             writeln("--->\nstepX commence → (document abstraction) [", manifest.src.filename, "]");
           }
           auto doc = spineAbstraction!()(_env, program_info, _opt_action, _cfg, manifest, _make_and_meta_struct);
-          auto doc_abstraction = doc.abstraction;
-          auto doc_matters = doc.matters;
           if ((doc.matters.opt.action.debug_do)
             || (_opt_action.debug_do_stages)
           ) {
@@ -1112,7 +1110,7 @@ string program_name = "spine";
             if ((_opt_action.debug_do) || (_opt_action.debug_do_stages)) {
               writeln("step5 commence → (process outputs) [", manifest.src.filename, "]");
             }
-            doc.abstraction.outputHub!()(doc.matters);
+            doc.outputHub!();
             if ((_opt_action.debug_do) || (_opt_action.debug_do_stages)) {
               writeln("- step5 complete for [", manifest.src.filename, "]");
             }
@@ -1161,8 +1159,6 @@ string program_name = "spine";
             writeln("--->\nstepX commence → (document abstraction) [", manifest.src.filename, "]");
           }
           auto doc = spineAbstraction!()(_env, program_info, _opt_action, _cfg, manifest, _make_and_meta_struct);
-          auto doc_abstraction = doc.abstraction;
-          auto doc_matters = doc.matters;
           if ((doc.matters.opt.action.debug_do)
             || (_opt_action.debug_do_stages)
           ) {
@@ -1213,7 +1209,7 @@ string program_name = "spine";
             if ((_opt_action.debug_do) || (_opt_action.debug_do_stages)) {
               writeln("step5 commence → (process outputs) [", manifest.src.filename, "]");
             }
-            doc.abstraction.outputHub!()(doc.matters);
+            doc.outputHub!();
             if ((_opt_action.debug_do) || (_opt_action.debug_do_stages)) {
               writeln("- step5 complete for [", manifest.src.filename, "]");
             }
-- 
cgit v1.2.3