0.7.0 using dub remote dependencies (local src related to sdlang removed)

13 files changed, 41 insertions, 54 deletions

diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index db814ac..c7e5a13 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -1,5 +1,6 @@
-/+
-  document abstraction
+/++
+  document abstraction:
+  abstraction of sisu markup for downstream processing
   ao_abstract_doc_source.d
 +/
 template SiSUdocAbstraction() {
@@ -14,10 +15,6 @@ template SiSUdocAbstraction() {
     /+ ↓ abstraction mixins +/
     mixin ObjectSetter;
     mixin InternalMarkup;
-    // // mixin SiSUrgxInitFlags;
-    // // mixin AssertionsOnBlocks;
-    // mixin SiSUbiblio; // issue
-    // mixin SiSUheader;
     /+ ↓ abstraction struct init +/
     /+ initialize +/
     auto rgx = Rgx();
@@ -106,7 +103,6 @@ template SiSUdocAbstraction() {
         is_
       );
     }
-    // mixin SiSUdocAbstractionFunctions;
     /+ ↓ abstract marked up document +/
     auto abstract_doc_source(
       char[][] markup_sourcefile_content,
@@ -129,7 +125,6 @@ template SiSUdocAbstraction() {
         "para"    : 0,
       ];
       auto type = flags_type_init;
-      mixin ScreenTxtColors;
       void tell_lo(int obj_cite_number, in char[] line) {
         writefln(
           "* %s %s",
@@ -201,10 +196,9 @@ template SiSUdocAbstraction() {
         }
         line = replaceAll(line, rgx.true_dollar, "$$$$");
           // dollar represented as $$ needed to stop submatching on $
-          // (substitutions using ${identifiers} must take into account (e.g. happen earlier))
+          // (substitutions using ${identifiers} must take into account (i.e. happen earlier))
         debug(source) {                                  // source lines
           writeln(line);
-          // writeln(scr_txt_marker["green"], line);
         }
         debug(srclines) {
           if (!line.empty) {                             // source lines, not empty
@@ -1870,16 +1864,13 @@ template SiSUdocAbstraction() {
     /+ abstraction functions ↑ +/
     /+ ↓ abstraction function emitters +/
     struct OCNemitter {
-    // class OCNemitter : AssertOCN {
       int obj_cite_number, obj_cite_number_;
       int obj_cite_number_emitter(int obj_cite_number_status_flag)
       in { assert(obj_cite_number_status_flag <= 2); }
       body {
-        if (obj_cite_number_status_flag == 0) {
-          obj_cite_number=++obj_cite_number_;
-        } else {
-          obj_cite_number=0;
-        }
+        obj_cite_number=(obj_cite_number_status_flag == 0)
+        ? ++obj_cite_number_
+        : 0;
         assert(obj_cite_number >= 0);
         return obj_cite_number;
       }
@@ -1887,7 +1878,6 @@ template SiSUdocAbstraction() {
       }
     }
     struct ObjAttributes {
-    // class ObjAttributes : AssertObjAttributes {
       string[string] obj_txt;
       string para_and_blocks(string obj_txt_in)
       in { }
@@ -2417,14 +2407,11 @@ template SiSUdocAbstraction() {
       }
     }
     struct ObjAttrib {
-    // struct ObjAttrib : AssertObjAttrib {
-    // auto sink = appender!(char[])();
       auto attrib = ObjAttributes();
       string[string] obj_attrib;
       string obj_attributes(string obj_is_, string obj_raw, string node)
       in { }
       body {
-        // string s = "{ \"language\": \"D\", \"rating\": 3.14, \"code\": \"42\" }";
         scope(exit) {
           // destroy(obj_is_);
           destroy(obj_raw);
@@ -2488,9 +2475,7 @@ template SiSUdocAbstraction() {
         obj_attrib["json"] = oa_j.toString();
         debug(structattrib) {
           if (oa_j["is"].str() == "heading") {
-            // writeln(__LINE__);
             writeln(obj_attrib["json"]);
-            // writeln(node);
             writeln(
               "is: ", oa_j["is"].str(),
               "; obj_cite_number: ", oa_j["obj_cite_number"].integer()
@@ -2504,7 +2489,6 @@ template SiSUdocAbstraction() {
       }
     }
     struct BookIndexNuggetHash {
-    // class BookIndexNuggetHash : AssertBookIndexNuggetHash {
       string main_term, sub_term, sub_term_bits;
       int obj_cite_number_offset, obj_cite_number_endpoint;
       string[] obj_cite_numbers;
@@ -2859,7 +2843,6 @@ template SiSUdocAbstraction() {
         ++mkn;
         foreach (endnote; endnotes_) {
           attrib="";
-          attrib="";
           // endnotes ~=
           //   set_abstract_object.contents_para(
           //     obj,
@@ -2957,7 +2940,6 @@ template SiSUdocAbstraction() {
       }
     }
     struct NodeStructureMetadata {
-    // class NodeStructureMetadata : AssertNodeJSON {
       int lv, lv0, lv1, lv2, lv3, lv4, lv5, lv6, lv7;
       int obj_cite_number;
       int[string] p_; // p_ parent_
diff --git a/src/sdp/ao_ansi_colors.d b/src/sdp/ao_ansi_colors.d
index e5a46f9..dea331d 100644
--- a/src/sdp/ao_ansi_colors.d
+++ b/src/sdp/ao_ansi_colors.d
@@ -1,6 +1,5 @@
-/+
-  utils
-  ao_util.d
+/++
+  ansi colors, depreciate use
 +/
 template ScreenTxtColors() {
   string[string] scr_txt_color = [
diff --git a/src/sdp/ao_conf_make_meta.d b/src/sdp/ao_conf_make_meta.d
index 04a9d7a..5bc9694 100644
--- a/src/sdp/ao_conf_make_meta.d
+++ b/src/sdp/ao_conf_make_meta.d
@@ -1,5 +1,12 @@
-/+
-  extract native/orig header return associative array
+/++
+  extract native/orig header return associative array<BR>
+
+  the header is passed as text (lopped off top of a sisu markup file until the
+  required first heading ^A~), determine whether is a native header or sdlang one
+  with a regex check if whether it contains the "native header" required tag/field
+  @title: then process accordingly as a "native header" or "sdlang header"
+  converting the metadata and make instructions to a common json format used by
+  program internally. Moved to associative array.
 +/
 template SiSUheaderExtractHub() {
   private import
diff --git a/src/sdp/ao_conf_make_meta_native.d b/src/sdp/ao_conf_make_meta_native.d
index 9f0ad63..f70a7bf 100644
--- a/src/sdp/ao_conf_make_meta_native.d
+++ b/src/sdp/ao_conf_make_meta_native.d
@@ -1,4 +1,5 @@
-/+
+/++
+  native headers using<br>@title:<BR>:subtitle:<BR>type tags<BR>
   extract native/orig header return associative array
 +/
 template SiSUheaderExtractNative() {
diff --git a/src/sdp/ao_conf_make_meta_sdlang.d b/src/sdp/ao_conf_make_meta_sdlang.d
index 1cc3498..61b4960 100644
--- a/src/sdp/ao_conf_make_meta_sdlang.d
+++ b/src/sdp/ao_conf_make_meta_sdlang.d
@@ -1,5 +1,6 @@
-/+
-  extract sdl header return sdl
+/++
+  sdlang headers<BR>
+  extract sdlang header return sdlang
 +/
 template SiSUheaderExtractSDLang() {
   private import
diff --git a/src/sdp/ao_defaults.d b/src/sdp/ao_defaults.d
index ea5caae..8db42e2 100644
--- a/src/sdp/ao_defaults.d
+++ b/src/sdp/ao_defaults.d
@@ -1,6 +1,5 @@
-/+
-  defaults
-  ao_defaults.d
+/++
+  default settings
 +/
 template SiSUregisters() {
   string[string][string] conf_aa() {
diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index 745de4e..6cb359b 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -1,5 +1,6 @@
-/+
-  object setter
+/++
+  object setter:
+  setting of sisu objects for downstream processing
   ao_object_setter.d
 +/
 template ObjectSetter() {
diff --git a/src/sdp/ao_output_debugs.d b/src/sdp/ao_output_debugs.d
index b5f96fa..9111cd6 100644
--- a/src/sdp/ao_output_debugs.d
+++ b/src/sdp/ao_output_debugs.d
@@ -1,6 +1,5 @@
-/+
+/++
   output debugs
-  ao_output_debugs.d
 +/
 template SiSUoutputDebugs() {
   struct BookIndexReport {
diff --git a/src/sdp/ao_read_config_files.d b/src/sdp/ao_read_config_files.d
index 49efe7b..013acdd 100644
--- a/src/sdp/ao_read_config_files.d
+++ b/src/sdp/ao_read_config_files.d
@@ -1,6 +1,7 @@
-/+
+/++
+  read configuration files<BR>
+  - read config files<BR>
   ao_config_files.d
-  - read config files
 +/
 template SiSUconfigIn() {
   private import
diff --git a/src/sdp/ao_read_source_files.d b/src/sdp/ao_read_source_files.d
index eabc4dc..5aef05d 100644
--- a/src/sdp/ao_read_source_files.d
+++ b/src/sdp/ao_read_source_files.d
@@ -1,9 +1,8 @@
-/+
-  ao_read_source_files.d
-  - open markup files
+/++
+  module ao_read_source_files;<BR>
+  - open markup files<BR>
   - if master file scan for addional files to import/insert
 +/
-// module ao_read_source_files;
 template SiSUmarkupRaw() {
   private import
     std.exception,
diff --git a/src/sdp/ao_rgx.d b/src/sdp/ao_rgx.d
index ccaf1bd..2a10d53 100644
--- a/src/sdp/ao_rgx.d
+++ b/src/sdp/ao_rgx.d
@@ -1,6 +1,5 @@
-/+
-  regex
-  ao_rgx.d
+/++
+  regex: regular expressions used in sisu document parser
 +/
 template RgxInit() {
   struct Rgx {
diff --git a/src/sdp/compile_time_info.d b/src/sdp/compile_time_info.d
index 783ac62..2b0151d 100644
--- a/src/sdp/compile_time_info.d
+++ b/src/sdp/compile_time_info.d
@@ -1,6 +1,5 @@
-/+
+/++
   compile_time_info
-  compile_time_info.d
 +/
 template CompileTimeInfo() {
   version(Windows) {
diff --git a/src/sdp/output_hub.d b/src/sdp/output_hub.d
index 0206bf5..e7c0c9e 100644
--- a/src/sdp/output_hub.d
+++ b/src/sdp/output_hub.d
@@ -1,6 +1,6 @@
-/+
-  output_hub.d
-  output_html.d
+/++
+  output hub<BR>
+  check & generate output types requested
 +/
 template SiSUoutputHub() {
   struct SDPoutput {