org file reorganise

1 files changed, 5 insertions, 22 deletions

diff --git a/src/sdp.d b/src/sdp.d
index fb5728e..2b511e5 100755
--- a/src/sdp.d
+++ b/src/sdp.d
@@ -21,17 +21,11 @@ import
 import sdlang;                            // sdlang.d
 /+ std +/
 private import
-  std.algorithm,
   std.array,
-  std.container,
   std.exception,
   std.getopt,
-  std.json,
   std.process,
   std.stdio,
-  std.file,
-  std.path,
-  std.range,
   std.regex,
   std.string,
   std.traits,
@@ -50,15 +44,6 @@ void main(string[] args) {
   mixin SiSUbiblio;
   mixin SiSUrgxInitFlags;
   mixin outputHub;
-  /+
-  struct DocumentParts {
-    string[string][] contents;
-    string[string][string] meta_aa;
-    string[string][string] make_aa;
-    string[][string][string] bookindex_unordered_hashes;
-    JSONValue[] biblio;
-  }
-  +/
   string[] fns_src;
   string flag_action;
   string arg_unrecognized;
@@ -83,6 +68,7 @@ void main(string[] args) {
   bool[string] _opt_action_bool = [
     "assertions"         : false,
     "concordance"        : false,
+    "debug"              : false,
     "digest"             : false,
     "docbook"            : false,
     "epub"               : false,
@@ -117,6 +103,7 @@ void main(string[] args) {
     std.getopt.config.passThrough,
     "assert",             "--assert set optional assertions on",                        &_opt_action_bool["assertions"],
     "concordance",        "--concordance file for document",                            &_opt_action_bool["concordance"],
+    "debug",             "--debug only relevant when debug options compiled in",        &_opt_action_bool["debug"],
     "digest",             "--digest hash digest for each object",                       &_opt_action_bool["digest"],
     "docbook",            "--docbook process docbook output",                           &_opt_action_bool["docbook"],
     "epub",               "--epub process epub output",                                 &_opt_action_bool["epub"],
@@ -202,7 +189,9 @@ void main(string[] args) {
       auto doc_abstraction = t[0];
       auto doc_matters = t[1];
       /+ ↓ debugs +/
-      debug(checkdoc) {
+      if ((doc_matters.opt_action_bool["debug"])
+      || (doc_matters.opt_action_bool["verbose"])
+      ) {
         SiSUdebugs!()(doc_abstraction, doc_matters);
       }
       /+ ↓ output hub +/
@@ -216,12 +205,6 @@ void main(string[] args) {
             fn_src
           );
         }
-        // destroy(_0_header_1_body_content_2_insert_filelist_tuple);
-        // destroy(t);
-        // destroy(doc_abstraction);
-        // // destroy(doc_ao_make_aa);
-        // // destroy(doc_ao_meta_aa);
-        // destroy(_doc_html_segnames);
         destroy(fn_src);
       }
     } else {