From e280a374991a3a6db3c40fd1fa03a2d9c6fa66eb Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 6 Jun 2017 17:58:10 -0400
Subject: naming mostly

---
 src/sdp/output/hub.d          | 15 ++++++++++-----
 src/sdp/output/paths_source.d | 10 +++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/sdp/output')

diff --git a/src/sdp/output/hub.d b/src/sdp/output/hub.d
index fd64851..2a1221f 100644
--- a/src/sdp/output/hub.d
+++ b/src/sdp/output/hub.d
@@ -27,9 +27,11 @@ template outputHub() {
         { writeln("sisupod source processing... "); }
       SiSUpod!()(doc_matters);
       if ((doc_matters.opt_action["verbose"])
+      && (doc_matters.opt_action["debug"])
       && (doc_matters.opt_action["source"]))
         { writeln("sisu source done"); }
       if ((doc_matters.opt_action["verbose"])
+      && (doc_matters.opt_action["debug"])
       && (doc_matters.opt_action["sisupod"]))
         { writeln("sisupod done"); }
     }
@@ -40,24 +42,27 @@ template outputHub() {
     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"])) { writeln("html scroll done"); }
+      if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { 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"])) { writeln("html seg done"); }
+      if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { 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... "); }
       outputHTML!().seg(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action["verbose"])) { writeln("html seg done"); }
+      if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { 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... "); }
       outputHTML!().scroll(doc_abstraction, doc_matters);
-      if ((doc_matters.opt_action["verbose"])) { writeln("html scroll done"); }
+      if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { writeln("html scroll done"); }
+      outputHTML!().css(doc_matters);
     }
     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"])) { writeln("epub3 done"); }
+      if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { writeln("epub3 done"); }
     }
     if (doc_matters.opt_action["pdf"]) {
       /+ mixin outputPDF; +/
diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d
index 7658df5..80e2c1a 100644
--- a/src/sdp/output/paths_source.d
+++ b/src/sdp/output/paths_source.d
@@ -14,7 +14,7 @@ template SiSUpathsSRC() {
   auto rgx = Rgx();
   auto SiSUpathsSRC(D,Fn)(
     D   _pwd,
-    Fn  _fn_src,
+    Fn  _fn_src_and_relative_path,
   ) {
     struct SisuSrcPaths {
       auto pwd() {
@@ -23,10 +23,10 @@ template SiSUpathsSRC() {
       auto language() {
         // use command line info as well?
         string _k;
-        if (auto m = _fn_src.match(rgx.language_code_and_filename)) {
+        if (auto m = _fn_src_and_relative_path.match(rgx.language_code_and_filename)) {
           _k = m.captures[1];
         } else {
-          _k = "en";
+          _k = "xx"; // original default was "en" but is not known
         }
         return _k;
       }
@@ -49,10 +49,10 @@ template SiSUpathsSRC() {
         return text_root.chainPath(language).array;
       }
       auto doc_src_with_relative_path() {
-        return pwd.chainPath(_fn_src).array;
+        return pwd.chainPath(_fn_src_and_relative_path).array;
       }
       auto doc_src_fn() {
-        return _fn_src.baseName.array;
+        return _fn_src_and_relative_path.baseName.array;
       }
     }
     return SisuSrcPaths();
-- 
cgit v1.2.3