doc structure hash removed, replaced, unused

- doc abstraction changes (use of new associative
  array named "pith" with enum) replaces the
  redundant doc structure associative array

9 files changed, 0 insertions, 126 deletions

diff --git a/org/default_misc.org b/org/default_misc.org
index ab7033f..4e0f78e 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -24,7 +24,6 @@
   default settings
 +/
 module doc_reform.meta.defaults;
-<<meta_defaults_template_init_flags>>
 <<meta_defaults_template_node>>
 <<meta_defaults_template_harvest>>
 <<meta_defaults_template_biblio>>
@@ -33,54 +32,6 @@ module doc_reform.meta.defaults;
 #+END_SRC
 
 ** template: flags regex initialize                            :regex_flags:
-*** flags
-
-#+NAME: meta_defaults_template_init_flags
-#+BEGIN_SRC d
-template spineRgxDocStructFlags() {
-  /+ regex flags +/
-  @safe static int[string] flags_type_init() {
-    int[string] flags_type_init = [
-      "make_headings"                       : 0,
-      "header_make"                         : 0,
-      "header_meta"                         : 0,
-      "heading"                             : 0,
-      "biblio_section"                      : 0,
-      "glossary_section"                    : 0,
-      "blurb_section"                       : 0,
-      "para"                                : 0,
-      "blocks"                              : 0, // 0..2 generic
-      "code"                                : 0, // 0..2
-      "poem"                                : 0, // 0..2
-      "table"                               : 0, // 0..2
-      "group"                               : 0, // 0..2
-      "block"                               : 0, // 0..2
-      "quote"                               : 0, // 0..2
-      "verse_new"                           : 0,
-      "curly_code"                          : 0,
-      "curly_poem"                          : 0,
-      "curly_group"                         : 0,
-      "curly_block"                         : 0,
-      "curly_quote"                         : 0,
-      "curly_table"                         : 0,
-      "curly_table_special_markup"          : 0,
-      "tic_code"                            : 0,
-      "tic_poem"                            : 0,
-      "tic_group"                           : 0,
-      "tic_block"                           : 0,
-      "tic_quote"                           : 0,
-      "tic_table"                           : 0,
-      "ocn_status"                          : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings
-      "ocn_status_off_for_multiple_objects" : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings
-      "heading_status"                      : 0,
-      "heading_off_for_multiple_objects"    : 0,
-      "book_index"                          : 0,
-    ];
-    return flags_type_init;
-  }
-}
-#+END_SRC
-
 *** node
 
 #+NAME: meta_defaults_template_node
diff --git a/org/in_source_files.org b/org/in_source_files.org
index 49c4a5e..84702fe 100644
--- a/org/in_source_files.org
+++ b/org/in_source_files.org
@@ -355,7 +355,6 @@ template spineRawMarkupContent() {
       char[][] markup_sourcefile_insert_content,
       string   fn_src
     ) {
-      mixin spineRgxDocStructFlags;
       <<meta_inserts_scan>>
       foreach (line; markup_sourcefile_insert_content) {
         <<meta_inserts_scan_loop>>
@@ -368,7 +367,6 @@ template spineRawMarkupContent() {
       string   fn_src
     ) {
       import std.algorithm;
-      mixin spineRgxDocStructFlags;
       <<meta_master_doc_scan_for_insert_filenames>>
       foreach (line; sourcefile_body_content) {
         <<meta_master_doc_scan_for_insert_filenames_loop>>
@@ -518,7 +516,6 @@ split is on first match of level A~ (which is required)
 char[][] contents_insert;
 int code_block_status     = 0;
 enum codeBlock { off, curly, tic, }
-int[string] type = flags_type_init;
 auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm);
 auto markup_src_file_path = fn_pth_full.captures[1];
 #+END_SRC
@@ -528,32 +525,22 @@ auto markup_src_file_path = fn_pth_full.captures[1];
 #+NAME: meta_inserts_scan_loop
 #+BEGIN_SRC d
 if (code_block_status == codeBlock.curly) {
-  type["header_make"] = 0;
-  type["header_meta"] = 0;
   if (line.matchFirst(rgx.block_curly_code_close)) {
     code_block_status = codeBlock.off;
   }
   contents_insert ~= line;
 } else if (line.matchFirst(rgx.block_curly_code_open)) {
   code_block_status   = codeBlock.curly;
-  type["header_make"] = 0;
-  type["header_meta"] = 0;
   contents_insert ~= line;
 } else if (code_block_status == codeBlock.tic) {
-  type["header_make"] = 0;
-  type["header_meta"] = 0;
   if (line.matchFirst(rgx.block_tic_close)) {
     code_block_status = codeBlock.off;
   }
   contents_insert ~= line;
 } else if (line.matchFirst(rgx.block_tic_code_open)) {
   code_block_status   = codeBlock.tic;
-  type["header_make"] = 0;
-  type["header_meta"] = 0;
   contents_insert ~= line;
 } else if (auto m = line.match(rgx.insert_src_fn_ssi_or_sst)) {
-  type["header_make"] = 0;
-  type["header_meta"] = 0;
   auto insert_fn = m.captures[2];
   auto insert_sub_pth = m.captures[1];
   auto fn_src_insert
@@ -584,8 +571,6 @@ if (code_block_status == codeBlock.curly) {
          - build image list, search for any image files to add to image list
   +/
 } else {
-  type["header_make"] = 0;
-  type["header_meta"] = 0;
   contents_insert ~= line; // images to extract for image list?
   if (_opt_action.source || _opt_action.pod) {
     string[] _image_linelist = _extract_images(line);
diff --git a/org/metaverse.org b/org/metaverse.org
index 86269bb..683ed86 100644
--- a/org/metaverse.org
+++ b/org/metaverse.org
@@ -591,7 +591,6 @@ scope(exit) {
 
 #+NAME: abs_init_rest
 #+BEGIN_SRC d
-mixin spineRgxDocStructFlags;
 mixin spineNode;
 auto node_para_int_    = node_metadata_para_int;
 auto node_para_str_    = node_metadata_para_str;
diff --git a/org/spine.org b/org/spine.org
index b8f6609..bb2cb6e 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -302,7 +302,6 @@ mixin CompileTimeInfo;
 #+BEGIN_SRC d
 mixin spineRgxIn;
 mixin spineBiblio;
-mixin spineRgxDocStructFlags;
 mixin outputHub;
 #+END_SRC
 
diff --git a/src/doc_reform/io_in/read_source_files.d b/src/doc_reform/io_in/read_source_files.d
index 349729d..dfb9b2c 100644
--- a/src/doc_reform/io_in/read_source_files.d
+++ b/src/doc_reform/io_in/read_source_files.d
@@ -173,41 +173,29 @@ template spineRawMarkupContent() {
       char[][] markup_sourcefile_insert_content,
       string   fn_src
     ) {
-      mixin spineRgxDocStructFlags;
       char[][] contents_insert;
       int code_block_status     = 0;
       enum codeBlock { off, curly, tic, }
-      int[string] type = flags_type_init;
       auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm);
       auto markup_src_file_path = fn_pth_full.captures[1];
       foreach (line; markup_sourcefile_insert_content) {
         if (code_block_status == codeBlock.curly) {
-          type["header_make"] = 0;
-          type["header_meta"] = 0;
           if (line.matchFirst(rgx.block_curly_code_close)) {
             code_block_status = codeBlock.off;
           }
           contents_insert ~= line;
         } else if (line.matchFirst(rgx.block_curly_code_open)) {
           code_block_status   = codeBlock.curly;
-          type["header_make"] = 0;
-          type["header_meta"] = 0;
           contents_insert ~= line;
         } else if (code_block_status == codeBlock.tic) {
-          type["header_make"] = 0;
-          type["header_meta"] = 0;
           if (line.matchFirst(rgx.block_tic_close)) {
             code_block_status = codeBlock.off;
           }
           contents_insert ~= line;
         } else if (line.matchFirst(rgx.block_tic_code_open)) {
           code_block_status   = codeBlock.tic;
-          type["header_make"] = 0;
-          type["header_meta"] = 0;
           contents_insert ~= line;
         } else if (auto m = line.match(rgx.insert_src_fn_ssi_or_sst)) {
-          type["header_make"] = 0;
-          type["header_meta"] = 0;
           auto insert_fn = m.captures[2];
           auto insert_sub_pth = m.captures[1];
           auto fn_src_insert
@@ -238,8 +226,6 @@ template spineRawMarkupContent() {
                  - build image list, search for any image files to add to image list
           +/
         } else {
-          type["header_make"] = 0;
-          type["header_meta"] = 0;
           contents_insert ~= line; // images to extract for image list?
           if (_opt_action.source || _opt_action.pod) {
             string[] _image_linelist = _extract_images(line);
@@ -261,7 +247,6 @@ template spineRawMarkupContent() {
       string   fn_src
     ) {
       import std.algorithm;
-      mixin spineRgxDocStructFlags;
       char[][] contents;
       int code_block_status     = 0;
       enum codeBlock { off, curly, tic, }
diff --git a/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d
index e592be7..33149bf 100644
--- a/src/doc_reform/meta/defaults.d
+++ b/src/doc_reform/meta/defaults.d
@@ -2,48 +2,6 @@
   default settings
 +/
 module doc_reform.meta.defaults;
-template spineRgxDocStructFlags() {
-  /+ regex flags +/
-  @safe static int[string] flags_type_init() {
-    int[string] flags_type_init = [
-      "make_headings"                       : 0,
-      "header_make"                         : 0,
-      "header_meta"                         : 0,
-      "heading"                             : 0,
-      "biblio_section"                      : 0,
-      "glossary_section"                    : 0,
-      "blurb_section"                       : 0,
-      "para"                                : 0,
-      "blocks"                              : 0, // 0..2 generic
-      "code"                                : 0, // 0..2
-      "poem"                                : 0, // 0..2
-      "table"                               : 0, // 0..2
-      "group"                               : 0, // 0..2
-      "block"                               : 0, // 0..2
-      "quote"                               : 0, // 0..2
-      "verse_new"                           : 0,
-      "curly_code"                          : 0,
-      "curly_poem"                          : 0,
-      "curly_group"                         : 0,
-      "curly_block"                         : 0,
-      "curly_quote"                         : 0,
-      "curly_table"                         : 0,
-      "curly_table_special_markup"          : 0,
-      "tic_code"                            : 0,
-      "tic_poem"                            : 0,
-      "tic_group"                           : 0,
-      "tic_block"                           : 0,
-      "tic_quote"                           : 0,
-      "tic_table"                           : 0,
-      "ocn_status"                          : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings
-      "ocn_status_off_for_multiple_objects" : 0, // 0 object_number; 1 no object_number; 2 no object_number & dummy headings
-      "heading_status"                      : 0,
-      "heading_off_for_multiple_objects"    : 0,
-      "book_index"                          : 0,
-    ];
-    return flags_type_init;
-  }
-}
 template spineNode() {
   @safe static string[string] node_metadata_heading_str() {
     string[string] _node = [
diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d
index ebc5344..db21087 100644
--- a/src/doc_reform/meta/metadoc.d
+++ b/src/doc_reform/meta/metadoc.d
@@ -15,7 +15,6 @@ template spineAbstraction() {
     doc_reform.io_out.hub;
   mixin spineRgxIn;
   mixin spineBiblio;
-  mixin spineRgxDocStructFlags;
   mixin outputHub;
   enum headBody { header, body_content, insert_file_list, image_list }
   enum makeMeta { make, meta }
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index 9817fac..64e4b85 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -403,7 +403,6 @@ template docAbstraction() {
       previous_length=0;
       reset_note_numbers=true;
     }
-    mixin spineRgxDocStructFlags;
     mixin spineNode;
     auto node_para_int_    = node_metadata_para_int;
     auto node_para_str_    = node_metadata_para_str;
diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d
index 01b7d8e..409f460 100755
--- a/src/doc_reform/spine.d
+++ b/src/doc_reform/spine.d
@@ -87,7 +87,6 @@ string program_name = "spine";
 @system void main(string[] args) {
   mixin spineRgxIn;
   mixin spineBiblio;
-  mixin spineRgxDocStructFlags;
   mixin outputHub;
   auto hvst = spineHarvest!();
   string flag_action;