1 files changed, 82 insertions, 43 deletions

diff --git a/src/sdp/output/hub.d b/src/sdp/output/hub.d
index 1600dd2..7f03360 100644
--- a/src/sdp/output/hub.d
+++ b/src/sdp/output/hub.d
@@ -16,73 +16,108 @@ template outputHub() {
   void outputHub(D,I)(D doc_abstraction, I doc_matters) {
     mixin SiSUoutputRgxInit;
     static auto rgx = Rgx();
-    if ((doc_matters.opt_action.verbose)) {
-      writeln(doc_matters.keys_seq.seg);
+    if ((doc_matters.opt.action.verbose)) {
+      writeln(doc_matters.xml.keys_seq.seg);
     }
-    if ((doc_matters.opt_action.source)
-    || (doc_matters.opt_action.sisupod)) {
-      if ((doc_matters.opt_action.verbose)
-      && (doc_matters.opt_action.source))
-        { writeln("sisu source processing... "); }
-      if ((doc_matters.opt_action.verbose)
-      && (doc_matters.opt_action.sisupod))
-        { writeln("sisupod source processing... "); }
+    if ((doc_matters.opt.action.source)
+    || (doc_matters.opt.action.sisupod)) {
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.source)) {
+        writeln("sisu source processing... ");
+      }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.sisupod)) {
+        writeln("sisupod source processing... ");
+      }
       SiSUpod!()(doc_matters);
-      if ((doc_matters.opt_action.verbose)
-      && (doc_matters.opt_action.debug_do)
-      && (doc_matters.opt_action.source))
-        { writeln("sisu source done"); }
-      if ((doc_matters.opt_action.verbose)
-      && (doc_matters.opt_action.debug_do)
-      && (doc_matters.opt_action.sisupod))
-        { writeln("sisupod done"); }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.debug_do)
+      && (doc_matters.opt.action.source)) {
+        writeln("sisu source done");
+      }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.debug_do)
+      && (doc_matters.opt.action.sisupod)) {
+        writeln("sisupod done");
+      }
     }
-    if (doc_matters.opt_action.text) {
+    if (doc_matters.opt.action.text) {
       /+ mixin outputText; +/
-      if ((doc_matters.opt_action.verbose)) { writeln("text processing... "); }
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("text processing... ");
+      }
     }
-    if (doc_matters.opt_action.html) {
-      if ((doc_matters.opt_action.verbose)) { writeln("html scroll processing... "); }
+    if (doc_matters.opt.action.html) {
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("html scroll processing... ");
+      }
       outputHTML!().scroll(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html scroll done"); }
-      if ((doc_matters.opt_action.verbose)) { writeln("html seg processing... "); }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.debug_do)) {
+        writeln("html scroll done");
+      }
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("html seg processing... ");
+      }
       outputHTML!().seg(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html seg done"); }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.debug_do)) {
+        writeln("html seg done");
+      }
       outputHTML!().css(doc_matters);
-    } else if (doc_matters.opt_action.html_seg) {
-      if ((doc_matters.opt_action.verbose)) { writeln("html seg processing... "); }
+    } else if (doc_matters.opt.action.html_seg) {
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("html seg processing... ");
+      }
       outputHTML!().seg(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html seg done"); }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.debug_do)) {
+        writeln("html seg done");
+      }
       outputHTML!().css(doc_matters);
-    } else if (doc_matters.opt_action.html_scroll) {
-      if ((doc_matters.opt_action.verbose)) { writeln("html scroll processing... "); }
+    } else if (doc_matters.opt.action.html_scroll) {
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("html scroll processing... ");
+      }
       outputHTML!().scroll(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html scroll done"); }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.debug_do)) {
+        writeln("html scroll done");
+      }
       outputHTML!().css(doc_matters);
     }
-    if (doc_matters.opt_action.epub) {
-      if ((doc_matters.opt_action.verbose)) { writeln("epub3 processing... "); }
+    if (doc_matters.opt.action.epub) {
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("epub3 processing... ");
+      }
       outputEPub3!()(doc_abstraction, doc_matters);
       // epub.css_write;
-      if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("epub3 done"); }
+      if ((doc_matters.opt.action.verbose)
+      && (doc_matters.opt.action.debug_do)) {
+         writeln("epub3 done");
+      }
     }
-    if (doc_matters.opt_action.pdf) {
+    if (doc_matters.opt.action.pdf) {
       /+ mixin outputPDF; +/
       writeln("pdf processing");
     }
-    if (doc_matters.opt_action.odt) {
+    if (doc_matters.opt.action.odt) {
       /+ mixin outputODT; +/
       writeln("odt processing");
     }
-    if (doc_matters.opt_action.sqlite_discrete) {
-      if ((doc_matters.opt_action.verbose)) { writeln("sqlite processing... "); }
+    if (doc_matters.opt.action.sqlite_discrete) {
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("sqlite processing... ");
+      }
       SQLiteDiscreteBuildTablesAndPopulate!()(doc_abstraction, doc_matters);
     }
-    if (doc_matters.opt_action.sqlite_update) {
-      if ((doc_matters.opt_action.verbose)) { writeln("sqlite processing... "); }
+    if (doc_matters.opt.action.sqlite_update) {
+      if ((doc_matters.opt.action.verbose)) {
+        writeln("sqlite processing... ");
+      }
       SQLiteBuildTablesAndPopulate!()(doc_abstraction, doc_matters);
     }
-    if (doc_matters.opt_action.postgresql) {
+    if (doc_matters.opt.action.postgresql) {
       /+ mixin outputPostgreSQL; +/
       writeln("pgsql processing");
     }
@@ -102,11 +137,15 @@ template outputHubOp() {
     mixin SiSUoutputRgxInit;
     static auto rgx = Rgx();
     if ((opt_action.sqlite_create)) {
-      if ((opt_action.verbose)) { writeln("sqlite create table... "); }
+      if ((opt_action.verbose)) {
+        writeln("sqlite create table... ");
+      }
       SQLiteTablesCreate!()();
     }
     if ((opt_action.sqlite_drop)) {
-      if ((opt_action.verbose)) { writeln("sqlite drop table... "); }
+      if ((opt_action.verbose)) {
+        writeln("sqlite drop table... ");
+      }
       SQLiteTablesDrop!()();
     }
   }