org file reorganise

1 files changed, 17 insertions, 29 deletions

diff --git a/org/sdp.org b/org/sdp.org
index 5077df9..10511cc 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -13,7 +13,7 @@
 #+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
 
 [[../maker.org][maker.org makefile]]  [[./][org/]]
-* 0. version.txt: set version (sisu document parser)                :version:
+* 0. version.txt (set version)                                      :version:
 
 #+NAME: version_txt
 #+BEGIN_SRC d  :tangle ../views/version.txt
@@ -37,7 +37,7 @@ enum ver = Version(0, 12, 1);
   - proess file
   - output
 
-** 0. sdp src/sdp.d                                                   :sdp:
+** 0. sdp src/sdp.d                                                    :sdp:
 
 #+BEGIN_SRC d  :tangle ../src/sdp.d :shebang #!/usr/bin/env rdmd
 /+
@@ -142,17 +142,11 @@ sdlang.exceptions;
 #+BEGIN_SRC 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,
@@ -196,15 +190,6 @@ mixin outputHub;
 
 #+NAME: sdp_args
 #+BEGIN_SRC d
-/+
-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;
@@ -246,6 +231,7 @@ look into using getopt
 bool[string] _opt_action_bool = [
   "assertions"         : false,
   "concordance"        : false,
+  "debug"              : false,
   "digest"             : false,
   "docbook"            : false,
   "epub"               : false,
@@ -280,6 +266,7 @@ auto helpInfo = getopt(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"],
@@ -377,7 +364,7 @@ enforce(
 );
 #+END_SRC
 
-*** 0. _document abstraction_
+*** 1. _document abstraction_
 
 #+NAME: sdp_abstraction
 #+BEGIN_SRC d
@@ -389,19 +376,21 @@ auto doc_abstraction = t[0];
 auto doc_matters = t[1];
 #+END_SRC
 
-*** 1. _output processing_ (post abstraction processing)
-**** 0. _debug_ (document parts, checkdoc)                  :debug:checkdoc:
+*** 2. _output processing_ (post abstraction processing)
+**** 1. _debug_ (document parts, checkdoc)                  :debug:checkdoc:
 - [[./ao_output_debugs.org][ao_output_debugs]]
 
 #+NAME: sdp_each_file_do_debugs_checkdoc
 #+BEGIN_SRC d
 /+ ↓ debugs +/
-debug(checkdoc) {
+if ((doc_matters.opt_action_bool["debug"])
+|| (doc_matters.opt_action_bool["verbose"])
+) {
   SiSUdebugs!()(doc_abstraction, doc_matters);
 }
 #+END_SRC
 
-**** 1. _process outputs_                                          :outputs:
+**** 2. _process outputs_                                          :outputs:
 - [[./output.org][output]]
 
 #+NAME: sdp_each_file_do_selected_output
@@ -423,12 +412,6 @@ scope(exit) {
       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);
 }
 #+END_SRC
@@ -442,7 +425,7 @@ break; // terminate, stop
 #+END_SRC
 
 * 2. _document abstraction_
-** 0. abstraction
+** 0. abstraction template
 
 #+BEGIN_SRC d  :tangle ../src/sdp/abstraction.d
 template SiSUabstraction() {
@@ -552,6 +535,11 @@ struct DocumentMatters {
     bool[string] _k = opts;
     return _k;
   }
+  auto environment() {
+    auto _k = env;
+    return _k;
+  }
+  /+ add a list of images +/
 }
 auto doc_matters = DocumentMatters();
 #+END_SRC