file renaming, whitespace cleaning

7 files changed, 7 insertions, 34 deletions

diff --git a/src/sdp.d b/src/sdp.d
index 4d50343..f03b7de 100755
--- a/src/sdp.d
+++ b/src/sdp.d
@@ -8,10 +8,10 @@ import
   compile_time_info,          // sdp/compile_time_info.d
   ao_abstract_doc_source,     // sdp/ao_abstract_doc_source.d
   ao_ansi_colors,             // sdp/ao_ansi_colors.d
+  ao_conf_make_meta,          // sdp/ao_conf_make_meta.d
+  ao_conf_make_meta_native,   // sdp/ao_conf_make_meta_native.d
+  ao_conf_make_meta_sdlang,   // sdp/ao_conf_make_meta_sdlang.d
   ao_defaults,                // sdp/ao_defaults.d
-  ao_header_extract,          // sdp/ao_header_extract.d
-  ao_header_extract_native,   // sdp/ao_header_extract_native.d
-  ao_header_extract_sdlang,   // sdp/ao_header_extract_sdlang.d
   ao_output_debugs,           // sdp/ao_output_debugs.d
   ao_read_config_files,       // sdp/ao_read_config_files.d
   ao_read_source_files,       // sdp/ao_read_source_files.d
@@ -42,8 +42,8 @@ struct SDPoutput {
     auto ref const S         contents,
     string[][string][string] bookindex_unordered_hashes,
     JSONValue[]              biblio,
-    // JSONValue[string]        dochead_make_json,
-    // JSONValue[string]        dochead_meta_json,
+    string[string][string]   dochead_make_json,
+    string[string][string]   dochead_meta_json,
     string                   fn_src,
     bool[string]             opt_action_bool
   ) {
@@ -140,7 +140,6 @@ void main(string[] args) {
       );
     }
   }
-  
   bool[string] opt_action_bool = [
     "assertions"      : false,
     "concordance"     : false,
@@ -270,8 +269,8 @@ void main(string[] args) {
         doc_ao_contents,
         doc_ao_bookindex_unordered_hashes,
         doc_ao_biblio,
-        // doc_ao_make_aa,
-        // doc_ao_meta_aa,
+        dochead_make_aa,
+        dochead_meta_aa,
         fn_src,
         opt_action_bool
       );
diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index 27a78b7..067e920 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -5,14 +5,12 @@
 template SiSUdocAbstraction() {
   private:
   struct Abstraction {
-
     /+ ↓ abstraction imports +/
     import
       ao_defaults,                  // sdp/ao_defaults.d
       ao_object_setter,             // sdp/ao_object_setter.d
       ao_rgx,                       // sdp/ao_rgx.d
       ao_ansi_colors;               // sdp/ao_ansi_colors.d
-
     /+ ↓ abstraction mixins +/
     mixin ObjectSetter;
     mixin InternalMarkup;
@@ -20,17 +18,13 @@ template SiSUdocAbstraction() {
     // // mixin AssertionsOnBlocks;
     // mixin SiSUbiblio; // issue
     // mixin SiSUheader;
-
     /+ ↓ abstraction struct init +/
     /+ initialize +/
-    
     auto rgx = Rgx();
     ObjComposite[] contents_the_objects;
-    
     string[string] an_object, processing;
     auto set_abstract_object = ObjectAbstractSet();
     auto note_section = NotesSection();
-    
     /+ enum +/
     enum State { off, on }
     enum TriState { off, on, closing } // make aware, possibility of third state
@@ -47,33 +41,27 @@ template SiSUdocAbstraction() {
       content_non_header
     } // header section A-D; header text 1-4
     enum DocStructCollapsedHeading { lv0, lv1, lv2, lv3, lv4, lv5, lv6, lv7 } // not yet used
-    
     /+ biblio variables +/
     string biblio_tag_name, biblio_tag_entry, st;
     string[] biblio_arr_json;
     JSONValue[] bib_arr_json;
     int bib_entry;
-    
     /+ counters +/
     long counter, previous_count;
     int[string] line_occur;
     int verse_line, heading_pointer;
-    
     /+ paragraph attributes +/
     string[string] indent;
     bool bullet = true;
     string content_non_header = "8";
-    
     auto obj_im = ObjInlineMarkup();
     auto obj_att = ObjAttrib();
-    
     /+ ocn +/
     int obj_cite_number, obj_cite_number_;
     auto object_citation_number = OCNemitter();
     int obj_cite_number_emit(int obj_cite_number_status_flag) {
       return object_citation_number.obj_cite_number_emitter(obj_cite_number_status_flag);
     }
-    
     /+ book index variables +/
     string book_idx_tmp;
     string[][string][string] bookindex_unordered_hashes;
@@ -81,7 +69,6 @@ template SiSUdocAbstraction() {
     string[][string][string] bkidx_hash(string bookindex_section, int obj_cite_number) {
       return bookindex_extract_hash.bookindex_nugget_hash(bookindex_section, obj_cite_number);
     }
-    
     /+ node +/
     string node;
     auto node_construct = NodeStructureMetadata();
@@ -118,7 +105,6 @@ template SiSUdocAbstraction() {
       );
     }
     // mixin SiSUdocAbstractionFunctions;
-
     /+ ↓ abstract marked up document +/
     auto abstract_doc_source(
       char[][] markup_sourcefile_content,
@@ -206,11 +192,9 @@ template SiSUdocAbstraction() {
         "h_4": regex(r"^(none)")
       ];
       /+ abstraction init ↑ +/
-
       /+ ↓ loop markup document/text line by line +/
       srcDocLoop:
       foreach (line; markup_sourcefile_content) {
-
         /+ ↓ markup document/text line by line +/
         /+ scope +/
         scope(exit) {
@@ -510,7 +494,6 @@ template SiSUdocAbstraction() {
           }
         }
       } /+ ← closed: loop markup document/text line by line +/
-
       /+ ↓ post loop markup document/text +/
       debug(objectrelated2) { // check
           tell_l("blue", line);
@@ -644,9 +627,7 @@ template SiSUdocAbstraction() {
       );
       return t;
       /+ post loop markup document/text ↑ +/
-
     } /+ ← closed: abstract doc source +/
-
     /+ ↓ abstraction functions +/
     auto object_reset(ref string[string] an_object) {
       an_object.remove("obj");
@@ -1960,7 +1941,6 @@ template SiSUdocAbstraction() {
       }
     }
     /+ abstraction functions ↑ +/
-
     /+ ↓ abstraction function emitters +/
     struct OCNemitter {
     // class OCNemitter : AssertOCN {
@@ -3174,7 +3154,6 @@ template SiSUdocAbstraction() {
       }
     }
     /+ abstraction functions emitters ↑ +/
-
     /+ ↓ abstraction functions assertions +/
     auto assertions_doc_structure(string[string] an_object, int[string] lv) {
       if (lv["h3"] > State.off) {
@@ -3371,7 +3350,5 @@ template SiSUdocAbstraction() {
         "block status: off or closing");
     }
     /+ abstraction functions assertions ↑ +/
-
   } /+ ← closed: struct Abstraction +/
-
 } /+ ← closed: template SiSUdocAbstraction +/
diff --git a/src/sdp/ao_header_extract.d b/src/sdp/ao_conf_make_meta.d
index f78d7c4..f78d7c4 100644
--- a/src/sdp/ao_header_extract.d
+++ b/src/sdp/ao_conf_make_meta.d
diff --git a/src/sdp/ao_header_extract_native.d b/src/sdp/ao_conf_make_meta_native.d
index 7bcf965..7bcf965 100644
--- a/src/sdp/ao_header_extract_native.d
+++ b/src/sdp/ao_conf_make_meta_native.d
diff --git a/src/sdp/ao_header_extract_sdlang.d b/src/sdp/ao_conf_make_meta_sdlang.d
index 16a36e9..16a36e9 100644
--- a/src/sdp/ao_header_extract_sdlang.d
+++ b/src/sdp/ao_conf_make_meta_sdlang.d
diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index 4492e8a..96932eb 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -40,7 +40,6 @@ template ObjectSetter() {
   struct ObjCompositeArr {
     ObjComposite[] oca;
   }
-
   /+ structs setter +/
   struct ObjectAbstractSet {
     import std.conv : to;
diff --git a/src/sdp/ao_rgx.d b/src/sdp/ao_rgx.d
index 4e282ee..bb032ea 100644
--- a/src/sdp/ao_rgx.d
+++ b/src/sdp/ao_rgx.d
@@ -125,10 +125,8 @@ template RgxInit() {
     static inline_al_delimiter_open_and_close_regular   = ctRegex!(`【|】`, "m");
     static inline_notes_delimiter_al_regular            = ctRegex!(`【(.+?)】`, "m");
     static inline_notes_delimiter_al_regular_number_note = ctRegex!(`【(\d+)\s+(.+?)】`, "m");
-    
     static inline_al_delimiter_open_asterisk         = ctRegex!(`【\*`, "m");
     static inline_al_delimiter_open_plus             = ctRegex!(`【\+`, "m");
-    
     static inline_curly_delimiter_open_regular             = ctRegex!(`~\{\s*`, "m");
     static inline_curly_delimiter_close_regular            = ctRegex!(`\s*\}~`, "m");
     static inline_curly_delimiter_open_and_close_regular   = ctRegex!(`~\{\s*|\s*\}~`, "m");