From 9cf470e69b2d579701ee607f796de612dc600565 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 20 Apr 2017 13:57:03 -0400
Subject: 0.14.0 reorganized files, and paths

---
 src/sdp/output_hub.d | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'src/sdp/output_hub.d')

diff --git a/src/sdp/output_hub.d b/src/sdp/output_hub.d
index 9e4f971..c38b8e5 100644
--- a/src/sdp/output_hub.d
+++ b/src/sdp/output_hub.d
@@ -29,47 +29,55 @@ template outputHub() {
     source_sisupod,
     create_zip_file,
     output_rgx,
-    output_xhtmls;
+    output_xhtmls,
+    paths_output;
   void outputHub(D,I)(D doc_abstraction, I doc_matters) {
     mixin SiSUoutputRgxInit;
     auto rgx = Rgx();
     if ((doc_matters.opt_action_bool["verbose"])) {
       writeln(doc_matters.keys_seq.seg);
     }
-    if (doc_matters.opt_action_bool["source"]) {
-      /+ mixin outputSource; +/
-      writeln("source");
-    }
-    if (doc_matters.opt_action_bool["sisupod"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) {write("sisupod source processing... ");}
+    if ((doc_matters.opt_action_bool["source"])
+    || (doc_matters.opt_action_bool["sisupod"])) {
+      if ((doc_matters.opt_action_bool["verbose"])
+      && (doc_matters.opt_action_bool["source"]))
+        { write("sisu source processing... "); }
+      if ((doc_matters.opt_action_bool["verbose"])
+      && (doc_matters.opt_action_bool["sisupod"]))
+        { write("sisupod source processing... "); }
       SiSUpod!()(doc_matters);
-      if ((doc_matters.opt_action_bool["verbose"])) {writeln("sisupod done");}
+      if ((doc_matters.opt_action_bool["verbose"])
+      && (doc_matters.opt_action_bool["source"]))
+        { writeln("sisu source done"); }
+      if ((doc_matters.opt_action_bool["verbose"])
+      && (doc_matters.opt_action_bool["sisupod"]))
+        { writeln("sisupod done"); }
     }
     if (doc_matters.opt_action_bool["text"]) {
       /+ mixin outputText; +/
       writeln("text processing");
     }
     if (doc_matters.opt_action_bool["html"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) {write("html scroll processing... ");}
+      if ((doc_matters.opt_action_bool["verbose"])) { write("html scroll processing... "); }
       outputHTML!().scroll(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action_bool["verbose"])) {writeln("html scroll done");}
-      if ((doc_matters.opt_action_bool["verbose"])) {write("html seg processing... ");}
+      if ((doc_matters.opt_action_bool["verbose"])) { writeln("html scroll done"); }
+      if ((doc_matters.opt_action_bool["verbose"])) { write("html seg processing... "); }
       outputHTML!().seg(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action_bool["verbose"])) {writeln("html seg done");}
+      if ((doc_matters.opt_action_bool["verbose"])) { writeln("html seg done"); }
     } else if (doc_matters.opt_action_bool["html_seg"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) {write("html seg processing... ");}
+      if ((doc_matters.opt_action_bool["verbose"])) { write("html seg processing... "); }
       outputHTML!().seg(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action_bool["verbose"])) {writeln("html seg done");}
+      if ((doc_matters.opt_action_bool["verbose"])) { writeln("html seg done"); }
     } else if (doc_matters.opt_action_bool["html_scroll"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) {write("html scroll processing... ");}
+      if ((doc_matters.opt_action_bool["verbose"])) { write("html scroll processing... "); }
       outputHTML!().scroll(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action_bool["verbose"])) {writeln("html scroll done");}
+      if ((doc_matters.opt_action_bool["verbose"])) { writeln("html scroll done"); }
     }
     if (doc_matters.opt_action_bool["epub"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) {write("epub3 processing... ");}
+      if ((doc_matters.opt_action_bool["verbose"])) { write("epub3 processing... "); }
       outputEPub3!()(doc_abstraction, doc_matters);
       // epub.css_write;
-      if ((doc_matters.opt_action_bool["verbose"])) {writeln("epub3 done");}
+      if ((doc_matters.opt_action_bool["verbose"])) { writeln("epub3 done"); }
     }
     if (doc_matters.opt_action_bool["pdf"]) {
       /+ mixin outputPDF; +/
-- 
cgit v1.2.3