From a086f413748920c0faeb58b7a211547e92b57bc0 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 27 Jan 2017 10:33:49 -0500
Subject: output templates

---
 src/sdp/output_hub.d | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

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

diff --git a/src/sdp/output_hub.d b/src/sdp/output_hub.d
index f17a007..fe53bdb 100644
--- a/src/sdp/output_hub.d
+++ b/src/sdp/output_hub.d
@@ -10,7 +10,6 @@ template outputHub() {
     std.container,
     std.exception,
     std.getopt,
-    std.json,
     std.process,
     std.stdio,
     std.file,
@@ -38,9 +37,7 @@ template outputHub() {
       writeln("source");
     }
     if (doc_matters.opt_action_bool["sisupod"]) {
-      mixin SiSUpod;
-      auto sisupod=SiSUpod();
-      sisupod.sisupod_assemble(doc_matters.source_filename);
+      SiSUpod!()(doc_matters.source_filename);
       writeln("sisupod source");
     }
     if (doc_matters.opt_action_bool["text"]) {
@@ -50,41 +47,15 @@ template outputHub() {
       // text.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make, dochead_meta, fn_src, opt_action_bool);
     }
     if (doc_matters.opt_action_bool["html"]) {
-      mixin outputHTML;
-      auto html=outputHTML();
-      html.css_write;
-      html.scroll(
-        contents,
-        doc_matters,
-      );
-      html.seg(
-        contents,
-        doc_matters,
-      );
+      outputHTML!().scroll(contents,doc_matters);
+      outputHTML!().seg(contents,doc_matters);
     } else if(doc_matters.opt_action_bool["html_seg"]) {
-      mixin outputHTML;
-      auto html=outputHTML();
-      html.css_write;
-      html.seg(
-        contents,
-        doc_matters,
-      );
+      outputHTML!().seg(contents,doc_matters);
     } else if(doc_matters.opt_action_bool["html_scroll"]) {
-      mixin outputHTML;
-      auto html=outputHTML();
-      html.css_write;
-      html.scroll(
-        contents,
-        doc_matters,
-      );
+      outputHTML!().scroll(contents,doc_matters);
     }
     if (doc_matters.opt_action_bool["epub"]) {
-      mixin outputEPub;
-      auto epub=outputEPub();
-      epub.doc_content(         // consolidate
-        contents,
-        doc_matters,
-      );
+      outputEPub!()(contents, doc_matters);
       // epub.css_write;
       // writeln("epub processing");
     }
-- 
cgit v1.2.3