document (metadata & abstraction) struct

- struct replaces tuple
- some direct naming of structs returned
  (instead of use of auto) - minor

1 files changed, 23 insertions, 23 deletions

diff --git a/org/ocda.org b/org/ocda.org
index 2e4bbb0..148edf8 100644
--- a/org/ocda.org
+++ b/org/ocda.org
@@ -75,7 +75,7 @@ mixin docAbstractionFunctions;
 #+HEADER: :noweb yes
 #+BEGIN_SRC d
 <<docAbstractionInit>>
-<<docAbstractionInitSubstitutions>>
+<<docAbstractionInitSubstitutionsDebug>>
 <<docAbstractionMainLoopSrcByLine>>
 <<docAbstractionPostMainLoop>>
 <<docAbstractionReturnsStruct>>
@@ -109,8 +109,8 @@ scope(exit) {
   anchor_tag = "";
 }
 mixin spineNode;
-auto node_para_int_    = node_metadata_para_int;
-auto node_para_str_    = node_metadata_para_str;
+int[string] node_para_int_     = node_metadata_para_int;
+string[string] node_para_str_  = node_metadata_para_str;
 ObjGenericComposite comp_obj_;
 line_occur = [
   "heading"  : 0,
@@ -221,7 +221,7 @@ int cnt1 = 1; int cnt2 = 1; int cnt3 = 1;
 
 *** abstraction init substitutions
 
-#+NAME: docAbstractionInitSubstitutions
+#+NAME: docAbstractionInitSubstitutionsDebug
 #+HEADER: :noweb yes
 #+BEGIN_SRC d
 debug (substitutions) {
@@ -255,7 +255,7 @@ debug (substitutions) {
 #+NAME: docAbstractionMainLoopSrcByLine
 #+HEADER: :noweb yes
 #+BEGIN_SRC d
-auto loopMarkupSrcByLine(
+_loopMarkupSrcByLineStruct loopMarkupSrcByLine(
   char[][]         markup_sourcefile_content,
   string[string]   an_object,
   uint[string]     pith,
@@ -364,7 +364,7 @@ auto loopMarkupSrcByLine(
             ._doc_header_and_make_substitutions_(conf_make_meta)
             ._doc_header_and_make_substitutions_fontface_(conf_make_meta);
           {
-            auto _get = line.txt_by_line_block_quote(an_object, pith);
+            ST_txt_by_line_block_generic _get = line.txt_by_line_block_quote(an_object, pith);
             {
               an_object = _get.this_object;
               pith      = _get.pith;
@@ -377,7 +377,7 @@ auto loopMarkupSrcByLine(
             ._doc_header_and_make_substitutions_fontface_(conf_make_meta)
             .replaceAll(rgx.para_delimiter, mkup.br_line_spaced ~ "$1");
           {
-            auto _get = line.txt_by_line_block_group(an_object, pith);
+            ST_txt_by_line_block_generic _get = line.txt_by_line_block_group(an_object, pith);
             {
               an_object = _get.this_object;
               pith      = _get.pith;
@@ -393,7 +393,7 @@ auto loopMarkupSrcByLine(
               .replaceAll(rgx.spaces_keep, (m.captures[1]).translate([ ' ' : mkup.nbsp ]));
           }
           {
-            auto _get = line.txt_by_line_block_block(an_object, pith);
+            ST_txt_by_line_block_generic _get = line.txt_by_line_block_block(an_object, pith);
             {
               an_object = _get.this_object;
               pith      = _get.pith;
@@ -402,7 +402,7 @@ auto loopMarkupSrcByLine(
           continue;
         } else if (pith["block_is"]    == eN.blk_is.poem) {
           {
-            auto _get = line.txt_by_line_block_poem(an_object, pith, cntr, object_number_poem, conf_make_meta, tag_in_seg);
+            ST_txt_by_line_block_poem _get = line.txt_by_line_block_poem(an_object, pith, cntr, object_number_poem, conf_make_meta, tag_in_seg);
             {
               an_object = _get.this_object;
               pith      = _get.pith;
@@ -436,7 +436,7 @@ auto loopMarkupSrcByLine(
             object_number_poem["start"] = obj_cite_digits.object_number.to!string;
           }
           {
-            auto _get = line.txt_by_line_block_start(pith, dochas, object_number_poem);
+            ST_txt_by_line_block_start _get = line.txt_by_line_block_start(pith, dochas, object_number_poem);
             {
               pith               = _get.pith;
               dochas             = _get.dochas;
@@ -466,7 +466,7 @@ auto loopMarkupSrcByLine(
           || line.matchFirst(rgx.book_index_item_open)
           || pith["section"] == eN.sect.book_index)  {
             { // book_index
-              auto _get = line.flow_book_index_(an_object, book_idx_tmp, pith, opt_action);
+              ST_flow_book_index _get = line.flow_book_index_(an_object, book_idx_tmp, pith, opt_action);
               {
                 an_object = _get.this_object;
                 pith      = _get.pith;
@@ -488,7 +488,7 @@ auto loopMarkupSrcByLine(
               comp_obj_comment.text                   = an_object[an_object_key].strip;
               the_document_body_section               ~= comp_obj_comment;
               {
-                auto _get = txt_by_line_common_reset_(line_occur, an_object, pith);
+                ST_txt_by_line_common_reset _get = txt_by_line_common_reset_(line_occur, an_object, pith);
                 {
                   line_occur = _get.line_occur;
                   an_object  = _get.this_object;
@@ -505,7 +505,7 @@ auto loopMarkupSrcByLine(
               && (pith["make_headings"] == eN.bi.off)) {
                 // heading found
                 {
-                  auto _get = line.flow_heading_found_(heading_match_str, conf_make_meta.make.headings, heading_match_rgx, pith);
+                  ST_flow_heading_found _get = line.flow_heading_found_(heading_match_str, conf_make_meta.make.headings, heading_match_rgx, pith);
                   {
                     heading_match_str = _get.heading_match_str;
                     heading_match_rgx = _get.heading_match_rgx;
@@ -520,7 +520,7 @@ auto loopMarkupSrcByLine(
               ) {
                 // heading make set
                 {
-                  auto _get = line.flow_heading_make_set_(line_occur, heading_match_rgx, pith);
+                  ST_flow_heading_make_set _get = line.flow_heading_make_set_(line_occur, heading_match_rgx, pith);
                   {
                     line      = _get.line;
                     an_object = _get.this_object;
@@ -558,7 +558,7 @@ auto loopMarkupSrcByLine(
                   ._doc_header_and_make_substitutions_(conf_make_meta)
                   ._doc_header_and_make_substitutions_fontface_(conf_make_meta);
                 {
-                  auto _get = line.flow_para_match_(an_object, an_object_key, indent, bullet, pith, line_occur);
+                  ST_flow_para_match _get = line.flow_para_match_(an_object, an_object_key, indent, bullet, pith, line_occur);
                   {
                     an_object     = _get.this_object;
                     an_object_key = _get.this_object_key;
@@ -587,7 +587,7 @@ auto loopMarkupSrcByLine(
         } else if (pith["block_state"] == eN.blk_state.closing) {
           // line empty, with blocks flag
           {
-            auto _get = line.flow_block_flag_line_empty_(
+            ST_flow_block_flag_line_empty _get = line.flow_block_flag_line_empty_(
               an_object,
               bookindex_extract_hash,
               the_document_body_section,
@@ -703,7 +703,7 @@ auto loopMarkupSrcByLine(
             _anchor_tag                   = obj_cite_digits.identifier;
             // (incrementally build toc) table of contents here!
             {
-              auto _get = obj_im.flow_table_of_contents_gather_headings(
+              ST_flow_table_of_contents_gather_headings _get = obj_im.flow_table_of_contents_gather_headings(
                 an_object,
                 conf_make_meta,
                 tag_in_seg,
@@ -724,7 +724,7 @@ auto loopMarkupSrcByLine(
             if (an_object["lev_markup_number"].to!int <= 4) {
               segnames["epub"] ~= tag_in_seg["seg_lv1to4"];
             }
-            auto comp_obj_ = node_construct.node_emitter_heading(
+            ObjGenericComposite comp_obj_ = node_construct.node_emitter_heading(
                 an_object,
                 tag_in_seg,
                 lev_anchor_tag,
@@ -745,7 +745,7 @@ auto loopMarkupSrcByLine(
             the_document_body_section ~= comp_obj_;
             debug(objectrelated1) { writeln(line); } // check
             {
-              auto _get = txt_by_line_common_reset_(line_occur, an_object, pith);
+              ST_txt_by_line_common_reset _get = txt_by_line_common_reset_(line_occur, an_object, pith);
               {
                 line_occur = _get.line_occur;
                 an_object  = _get.this_object;
@@ -766,7 +766,7 @@ auto loopMarkupSrcByLine(
             an_object["bookindex_nugget"] = ("bookindex_nugget" in an_object) ? an_object["bookindex_nugget"] : "";
             bookindex_unordered_hashes = bookindex_extract_hash.bookindex_nugget_hash(an_object["bookindex_nugget"], obj_cite_digits, tag_in_seg);
             an_object["is"] = "para";
-            auto comp_obj_ = node_construct.node_location_emitter(
+            ObjGenericComposite comp_obj_ = node_construct.node_location_emitter(
                 content_non_header,
                 tag_in_seg,
                 lev_anchor_tag,
@@ -798,7 +798,7 @@ auto loopMarkupSrcByLine(
             the_document_body_section                       ~= comp_obj_;
             tag_assoc                                           = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
             {
-              auto _get = txt_by_line_common_reset_(line_occur, an_object, pith);
+              ST_txt_by_line_common_reset _get = txt_by_line_common_reset_(line_occur, an_object, pith);
               {
                 line_occur = _get.line_occur;
                 an_object  = _get.this_object;
@@ -872,7 +872,7 @@ auto loopMarkupSrcByLine(
   return ret;
 }
 { // loopMarkupSrcByLine
-  auto _doc_by_line = loopMarkupSrcByLine(markup_sourcefile_content, an_object, pith);
+  _loopMarkupSrcByLineStruct _doc_by_line = loopMarkupSrcByLine(markup_sourcefile_content, an_object, pith);
   the_document_toc_section      = _doc_by_line.toc;
   the_document_body_section     = _doc_by_line.body;
   the_document_glossary_section = _doc_by_line.glossary;
@@ -1534,7 +1534,7 @@ struct DocHas_ {
     return tag_assoc;
   }
 }
-auto doc_has() {
+DocHas_ doc_has() {
   return DocHas_();
 }
 // the doc to be returned