flow, rename functions with multiple return values

1 files changed, 53 insertions, 53 deletions

diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org
index 677f353..f657eb8 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -689,7 +689,7 @@ if (!line.empty) {
 #+name: abs_in_loop_body_00_code_block
 #+BEGIN_SRC d
 /+ block object: code +/
-line.txt_block_code(an_object, obj_type_status);
+line.flow_txt_block_code(an_object, obj_type_status);
 continue;
 #+END_SRC
 
@@ -722,7 +722,7 @@ if ((line.matchFirst(rgx.heading_biblio)
   obj_type_status["biblio_section"]   = State.on;
   obj_type_status["blurb_section"]    = State.off;
   if (opt_action.backmatter && opt_action.section_biblio) {
-    line.txt_block_biblio(obj_type_status, bib_entry, biblio_entry_str_json, biblio_arr_json);
+    line.flow_txt_block_biblio(obj_type_status, bib_entry, biblio_entry_str_json, biblio_arr_json);
     debug(bibliobuild) {
       writeln("-  ", biblio_entry_str_json);
       writeln("-> ", biblio_arr_json.length);
@@ -819,7 +819,7 @@ if there is a glossary section you need to:
       tag_assoc[comp_obj_heading_.tags.anchor_tag_html]["seg_lv4"]              = comp_obj_heading_.tags.in_segment_html;
       tag_assoc[comp_obj_heading_.tags.segment_anchor_tag_epub]["seg_lv1_to_4"] = comp_obj_heading_.tags.segment_anchor_tag_epub;
     } else {
-      line._para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
+      line.flow_para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
       comp_obj_para                               = comp_obj_para.init;
       comp_obj_para.metainfo.is_of_part           = "backmatter";
       comp_obj_para.metainfo.is_of_section        = "glossary";
@@ -980,7 +980,7 @@ if there is a blurb section you need to:
       tag_assoc[comp_obj_heading_.tags.anchor_tag_html]["seg_lv4"]              = comp_obj_heading_.tags.in_segment_html;
       tag_assoc[comp_obj_heading_.tags.segment_anchor_tag_epub]["seg_lv1_to_4"] = comp_obj_heading_.tags.segment_anchor_tag_epub;
     } else {
-      line._para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
+      line.flow_para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
       comp_obj_para                               = comp_obj_para.init;
       comp_obj_para.metainfo.is_of_part           = "backmatter";
       comp_obj_para.metainfo.is_of_section        = "blurb";
@@ -1011,7 +1011,7 @@ if there is a blurb section you need to:
   line = line
     ._doc_header_and_make_substitutions_(conf_make_meta)
     ._doc_header_and_make_substitutions_fontface_(conf_make_meta);
-  line.txt_block_quote(an_object, obj_type_status);
+  line.flow_txt_block_quote(an_object, obj_type_status);
   continue;
 #+END_SRC
 
@@ -1025,7 +1025,7 @@ if there is a blurb section you need to:
     ._doc_header_and_make_substitutions_(conf_make_meta)
     ._doc_header_and_make_substitutions_fontface_(conf_make_meta)
     .replaceAll(rgx.para_delimiter, mkup.br_paragraph ~ "$1");
-  line.txt_block_group(an_object, obj_type_status);
+  line.flow_txt_block_group(an_object, obj_type_status);
   continue;
 #+END_SRC
 
@@ -1041,7 +1041,7 @@ if there is a blurb section you need to:
     line = line
       .replaceAll(rgx.spaces_keep, (m.captures[1]).translate([ ' ' : mkup.nbsp ]));
   }
-  line.txt_block_block(an_object, obj_type_status);
+  line.flow_txt_block_block(an_object, obj_type_status);
   continue;
 #+END_SRC
 
@@ -1050,7 +1050,7 @@ if there is a blurb section you need to:
 #+name: abs_in_loop_body_non_code_obj
 #+BEGIN_SRC d
 } else if (obj_type_status["poem"] == TriState.on) {                           /+ within block object: poem +/
-  line.txt_block_poem(an_object, obj_type_status, cntr, object_number_poem, conf_make_meta, tag_in_seg);
+  line.flow_txt_block_poem(an_object, obj_type_status, cntr, object_number_poem, conf_make_meta, tag_in_seg);
   continue;
 #+END_SRC
 
@@ -1059,7 +1059,7 @@ if there is a blurb section you need to:
 #+name: abs_in_loop_body_non_code_obj
 #+BEGIN_SRC d
 } else if (obj_type_status["table"] == TriState.on) {                          /+ within block object: table +/
-  line.txt_block_table(an_object, obj_type_status, conf_make_meta);
+  line.flow_txt_block_table(an_object, obj_type_status, conf_make_meta);
   continue;
 #+END_SRC
 
@@ -1085,7 +1085,7 @@ if (line.matchFirst(rgx.block_poem_open)) {                                    /
   processing.remove("verse");
   object_number_poem["start"] = obj_cite_digits.object_number.to!string;
 }
-line.txt_block_start(obj_type_status, object_number_poem);
+line.flow_txt_block_start(obj_type_status, object_number_poem);
 continue;
 #+END_SRC
 
@@ -1125,7 +1125,7 @@ if (obj_type_status["blocks"] == TriState.closing) {
 if (line.matchFirst(rgx.book_index)
 || line.matchFirst(rgx.book_index_open)
 || obj_type_status["book_index"] == State.on )  {                              /+ book_index +/
-  line._book_index_(book_idx_tmp, an_object, obj_type_status, opt_action);
+  line.flow_book_index_(book_idx_tmp, an_object, obj_type_status, opt_action);
 #+END_SRC
 
 ******* not book index [+1]
@@ -1152,7 +1152,7 @@ if (line.matchFirst(rgx.book_index)
     comp_obj_comment.metainfo.is_a          = "comment";
     comp_obj_comment.text                   = an_object[an_object_key].strip;
     the_document_body_section               ~= comp_obj_comment;
-    _common_reset_(line_occur, an_object, obj_type_status);
+    flow_common_reset_(line_occur, an_object, obj_type_status);
     processing.remove("verse");
     ++cntr;
 #+END_SRC
@@ -1167,14 +1167,14 @@ if (line.matchFirst(rgx.book_index)
   && (obj_type_status["heading"] == State.off))) {                             /+ heading or para but neither flag nor line exists +/
     if ((conf_make_meta.make.headings.length > 2)
     && (obj_type_status["make_headings"] == State.off)) {                      /+ heading found +/
-      line._heading_found_(conf_make_meta.make.headings, heading_match_str, heading_match_rgx, obj_type_status);
+      line.flow_heading_found_(conf_make_meta.make.headings, heading_match_str, heading_match_rgx, obj_type_status);
     }
     if ((obj_type_status["make_headings"] == State.on)
     && ((line_occur["para"] == State.off)
     && (line_occur["heading"] == State.off))
     && ((obj_type_status["para"] == State.off)
     && (obj_type_status["heading"] == State.off))) {                           /+ heading make set +/
-      line = line._heading_make_set_(line_occur, heading_match_rgx, obj_type_status);
+      line = line.flow_heading_make_set_(line_occur, heading_match_rgx, obj_type_status);
     }
     /+ TODO node info: all headings identified at this point,
        - extract node info here??
@@ -1184,13 +1184,13 @@ if (line.matchFirst(rgx.book_index)
     +/
     if (line.matchFirst(rgx.heading)) {                                        /+ heading match +/
       line = line._doc_header_and_make_substitutions_(conf_make_meta);
-      line._heading_matched_(line_occur, an_object, an_object_key, lv, collapsed_lev, obj_type_status, conf_make_meta);
+      line.flow_heading_matched_(line_occur, an_object, an_object_key, lv, collapsed_lev, obj_type_status, conf_make_meta);
     } else if (line_occur["para"] == State.off) {                              /+ para match +/
       an_object_key="body_nugget";
       line = line
         ._doc_header_and_make_substitutions_(conf_make_meta)
         ._doc_header_and_make_substitutions_fontface_(conf_make_meta);
-      line._para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
+      line.flow_para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
     }
 #+END_SRC
 
@@ -1227,7 +1227,7 @@ if (line.matchFirst(rgx.book_index)
 
 #+name: abs_in_loop_body_not_block_obj_line_empty_blocks_flags
 #+BEGIN_SRC d
-_block_flag_line_empty_(
+flow_block_flag_line_empty_(
   bookindex_extract_hash,
   line,
   an_object,
@@ -1340,7 +1340,7 @@ if ((obj_type_status["heading"] == State.on)
     = bookindex_extract_hash.bookindex_nugget_hash(an_object["bookindex_nugget"], obj_cite_digits, tag_in_seg);
   /+ (incrementally build toc) table of contents here! +/
   _anchor_tag                   = obj_cite_digits.identifier;
-  the_table_of_contents_section = obj_im.table_of_contents_gather_headings(
+  the_table_of_contents_section = obj_im.flow_table_of_contents_gather_headings(
     an_object,
     conf_make_meta,
     tag_in_seg,
@@ -1385,7 +1385,7 @@ if ((obj_type_status["heading"] == State.on)
   debug(objectrelated1) { // check
     writeln(line);
   }
-  _common_reset_(line_occur, an_object, obj_type_status);
+  flow_common_reset_(line_occur, an_object, obj_type_status);
   an_object.remove("lev");
   an_object.remove("lev_markup_number");
   processing.remove("verse");
@@ -1447,7 +1447,7 @@ if ((obj_type_status["heading"] == State.on)
   comp_obj_para.has.image_without_dimensions                = substantive_obj_misc_tuple[sObj.image_no_dimensions];
   the_document_body_section                                 ~= comp_obj_para;
   tag_assoc                                                 = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
-  _common_reset_(line_occur, an_object, obj_type_status);
+  flow_common_reset_(line_occur, an_object, obj_type_status);
   indent=[
     "hang_position" : 0,
     "base_position" : 0,
@@ -1581,7 +1581,7 @@ debug(glossary) {
 auto biblio_unsorted_incomplete = biblio_arr_json.dup;
 auto biblio = Bibliography();
 auto biblio_ordered
-  = biblio._bibliography_(biblio_unsorted_incomplete, bib_arr_json);
+  = biblio.flow_bibliography_(biblio_unsorted_incomplete, bib_arr_json);
 #+END_SRC
 
 #+name: abs_post
@@ -3050,7 +3050,7 @@ static auto object_reset(O)(O an_object) {
 
 #+name: abs_functions_header_set_common
 #+BEGIN_SRC d
-auto _common_reset_(L,O,T)(
+auto flow_common_reset_(L,O,T)(
   return ref L line_occur,
   return ref O an_object,
   return ref T obj_type_status
@@ -3202,7 +3202,7 @@ auto _doc_header_and_make_substitutions_fontface_(L,CMM)(
 
 #+name: abs_functions_block
 #+BEGIN_SRC d
-void txt_block_start(L,T,N)(
+void flow_txt_block_start(L,T,N)(
              L line,
   return ref T obj_type_status,
   return ref N object_number_poem
@@ -3455,7 +3455,7 @@ void txt_block_start(L,T,N)(
 
 #+name: abs_functions_block_code
 #+BEGIN_SRC d
-void txt_block_code(L,O,T)(
+void flow_txt_block_code(L,O,T)(
              L line,
   return ref O an_object,
   return ref T obj_type_status
@@ -3567,7 +3567,7 @@ final string biblio_tag_map_(A)(A abr) {
 
 #+name: abs_functions_block_biblio
 #+BEGIN_SRC d
-void txt_block_biblio(
+void flow_txt_block_biblio(
   char[]                 line,
   return ref int[string] obj_type_status,
   return ref int         bib_entry,
@@ -3702,7 +3702,7 @@ void txt_block_biblio(
 
 #+name: abs_functions_block_quote
 #+BEGIN_SRC d
-void txt_block_quote(L,O,T)(
+void flow_txt_block_quote(L,O,T)(
              L line,
   return ref O an_object,
   return ref T obj_type_status
@@ -3754,7 +3754,7 @@ void txt_block_quote(L,O,T)(
 
 #+name: abs_functions_block_group
 #+BEGIN_SRC d
-void txt_block_group(L,O,T)(
+void flow_txt_block_group(L,O,T)(
              L line,
   return ref O an_object,
   return ref T obj_type_status
@@ -3807,7 +3807,7 @@ void txt_block_group(L,O,T)(
 
 #+name: abs_functions_block_block
 #+BEGIN_SRC d
-void txt_block_block(L,O,T)(
+void flow_txt_block_block(L,O,T)(
              L line,
   return ref O an_object,
   return ref T obj_type_status
@@ -3858,7 +3858,7 @@ why extra object stuff only in poem/verse?
 
 #+name: abs_functions_block_poem
 #+BEGIN_SRC d
-void txt_block_poem(L,O,T,C,N,CMM,Ts)(
+void flow_txt_block_poem(L,O,T,C,N,CMM,Ts)(
              L   line,
   return ref O   an_object,
   return ref T   obj_type_status,
@@ -4128,7 +4128,7 @@ you need:
 
 #+name: abs_functions_block_table
 #+BEGIN_SRC d
-void txt_block_table(L,O,T,CMM)(
+void flow_txt_block_table(L,O,T,CMM)(
              L   line,
   return ref O   an_object,
   return ref T   obj_type_status,
@@ -4159,7 +4159,7 @@ void txt_block_table(L,O,T,CMM)(
       obj_type_status["blocks"]                     = TriState.off;
       obj_type_status["table"]                      = TriState.off;
       obj_type_status["curly_table_special_markup"] = TriState.off;
-      _table_closed_make_special_notation_table_(
+      flow_table_closed_make_special_notation_table_(
         line,
         an_object,
         the_document_body_section,
@@ -4203,7 +4203,7 @@ process and use an_object["table_head"] (then empty it)
 
 #+name: abs_functions_block_line_status_empty
 #+BEGIN_SRC d
-void _table_closed_make_special_notation_table_(N,CMM)(
+void flow_table_closed_make_special_notation_table_(N,CMM)(
   char[]                           line,
   return ref string[string]        an_object,
   return ref ObjGenericComposite[] the_document_body_section,
@@ -4237,8 +4237,8 @@ void _table_closed_make_special_notation_table_(N,CMM)(
     comp_obj_block.tags.epub_segment_anchor_tag_is = tag_in_seg["seg_lv1_to_4"];
     comp_obj_block.metainfo.o_n_book_index         = obj_cite_digits.bkidx;
     comp_obj_block.metainfo.object_number_type     = obj_cite_digits.type;
-    comp_obj_block                                 = comp_obj_block.table_instructions(an_object["table_head"]);
-    comp_obj_block                                 = comp_obj_block.table_substantive_munge_special(an_object["substantive"]);
+    comp_obj_block                                 = comp_obj_block.flow_table_instructions(an_object["table_head"]);
+    comp_obj_block                                 = comp_obj_block.flow_table_substantive_munge_special(an_object["substantive"]);
     the_document_body_section                      ~= comp_obj_block;
     object_reset(an_object);
     processing.remove("verse");
@@ -4252,7 +4252,7 @@ void _table_closed_make_special_notation_table_(N,CMM)(
 
 #+name: abs_functions_block_line_status_empty
 #+BEGIN_SRC d
-void _block_flag_line_empty_(B,N,CMM,Ts)(
+void flow_block_flag_line_empty_(B,N,CMM,Ts)(
   B                                   bookindex_extract_hash,
   char[]                              line,
   return ref string[string]           an_object,
@@ -4577,8 +4577,8 @@ void _block_flag_line_empty_(B,N,CMM,Ts)(
     comp_obj_block.tags.epub_segment_anchor_tag_is = tag_in_seg["seg_lv1_to_4"];
     comp_obj_block.metainfo.o_n_book_index         = obj_cite_digits.bkidx;
     comp_obj_block.metainfo.object_number_type     = obj_cite_digits.type;
-    comp_obj_block                                 = comp_obj_block.table_instructions(an_object["table_head"]);
-    comp_obj_block                                 = comp_obj_block.table_substantive_munge(an_object["substantive"]);
+    comp_obj_block                                 = comp_obj_block.flow_table_instructions(an_object["table_head"]);
+    comp_obj_block                                 = comp_obj_block.flow_table_substantive_munge(an_object["substantive"]);
     the_document_body_section                      ~= comp_obj_block;
     obj_type_status["blocks"]                      = TriState.off;
     obj_type_status["table"]                       = TriState.off;
@@ -4599,7 +4599,7 @@ void _block_flag_line_empty_(B,N,CMM,Ts)(
 
 #+name: abs_functions_book_index
 #+BEGIN_SRC d
-auto _book_index_(L,I,O,T,B)(
+auto flow_book_index_(L,I,O,T,B)(
   L      line,
   return ref I  book_idx_tmp,
   return ref O  an_object,
@@ -4661,7 +4661,7 @@ auto _book_index_(L,I,O,T,B)(
 
 #+name: abs_functions_heading
 #+BEGIN_SRC d
-auto _heading_found_(L,X,H,R,T)(
+auto flow_heading_found_(L,X,H,R,T)(
   L     line,
   X     _make_unmarked_headings,
   return ref H heading_match_str,
@@ -4754,7 +4754,7 @@ auto _heading_found_(L,X,H,R,T)(
 
 #+name: abs_functions_heading
 #+BEGIN_SRC d
-auto _heading_make_set_(L,C,R,T)(
+auto flow_heading_make_set_(L,C,R,T)(
              L line,
              C line_occur,
   return ref R heading_match_rgx,
@@ -4822,7 +4822,7 @@ auto _heading_make_set_(L,C,R,T)(
 
 #+name: abs_functions_heading
 #+BEGIN_SRC d
-auto _heading_matched_(L,C,O,K,Lv,Lc,T,CMM)(
+auto flow_heading_matched_(L,C,O,K,Lv,Lc,T,CMM)(
              L   line,
   return ref C   line_occur,
   return ref O   an_object,
@@ -4982,7 +4982,7 @@ auto _heading_matched_(L,C,O,K,Lv,Lc,T,CMM)(
 
 #+name: abs_functions_para
 #+BEGIN_SRC d
-void _para_match_(L,O,K,I,B,T,C)(
+void flow_para_match_(L,O,K,I,B,T,C)(
              L  line,
   return ref O  an_object,
   return ref K  an_object_key,
@@ -5078,7 +5078,7 @@ auto font_faces_line(T)(
 
 #+name: abs_functions_table
 #+BEGIN_SRC d
-auto table_instructions(O,H)(
+auto flow_table_instructions(O,H)(
   return ref O  table_object,
   return ref H  table_head,
 ) {
@@ -5109,7 +5109,7 @@ auto table_instructions(O,H)(
 
 #+name: abs_functions_table
 #+BEGIN_SRC d
-auto table_array_munge(O,T)(
+auto flow_table_array_munge(O,T)(
   return ref O  table_object,
   return ref T  table_array,
 ) {
@@ -5239,7 +5239,7 @@ auto table_array_munge(O,T)(
 
 #+name: abs_functions_table
 #+BEGIN_SRC d
-auto table_substantive_munge(O,T)(
+auto flow_table_substantive_munge(O,T)(
   return ref O  table_object,
   return ref T  table_substantive,
 ) {
@@ -5252,7 +5252,7 @@ auto table_substantive_munge(O,T)(
     _table_cols = col.split(rgx.table_col_delimiter);
     _table ~= _table_cols;
   }
-  table_object = table_object.table_array_munge(_table);
+  table_object = table_object.flow_table_array_munge(_table);
   return table_object;
 }
 #+END_SRC
@@ -5261,7 +5261,7 @@ auto table_substantive_munge(O,T)(
 
 #+name: abs_functions_table
 #+BEGIN_SRC d
-auto table_substantive_munge_special(O,T)(
+auto flow_table_substantive_munge_special(O,T)(
   return ref O  table_object,
   return ref T  table_substantive,
 ) {
@@ -5274,7 +5274,7 @@ auto table_substantive_munge_special(O,T)(
     _table_cols = col.split(rgx.table_col_delimiter_special);
     _table ~= _table_cols;
   }
-  table_object = table_object.table_array_munge(_table);
+  table_object = table_object.flow_table_array_munge(_table);
   return table_object;
 }
 #+END_SRC
@@ -5898,7 +5898,7 @@ static struct ObjInlineMarkup {
      "");
    return heading_toc_;
   };
-  auto table_of_contents_gather_headings(O,CMM,Ts,Ta,X,Toc)(
+  auto flow_table_of_contents_gather_headings(O,CMM,Ts,Ta,X,Toc)(
     O            obj_,
     CMM          conf_make_meta,
     Ts           tag_in_seg,
@@ -7110,7 +7110,7 @@ struct Bibliography {
 
 #+name: meta_emitters_bibliography
 #+BEGIN_SRC d
-  public JSONValue[] _bibliography_(Bi,BJ)(
+  public JSONValue[] flow_bibliography_(Bi,BJ)(
     return ref Bi biblio_unsorted_incomplete,
     return ref BJ bib_arr_json
   )
@@ -7122,12 +7122,12 @@ struct Bibliography {
  }
   body {
     JSONValue[] biblio_unsorted
-      = _biblio_unsorted_complete_(biblio_unsorted_incomplete, bib_arr_json);
+      = flow_biblio_unsorted_complete_(biblio_unsorted_incomplete, bib_arr_json);
     biblio_arr_json = [];
     biblio_unsorted_incomplete = [];
     JSONValue[] biblio_sorted__ = biblio_sort(biblio_unsorted);
-    biblio_debug(biblio_sorted__);
     debug(biblio0) {
+      biblio_debug(biblio_sorted__);
       writeln("---");
       writeln("unsorted incomplete: ", biblio_unsorted_incomplete.length);
       writeln("json:                ", bib_arr_json.length);
@@ -7148,7 +7148,7 @@ struct Bibliography {
 
 #+name: meta_emitters_bibliography
 #+BEGIN_SRC d
-  final private JSONValue[] _biblio_unsorted_complete_(Bi,BJ)(
+  final private JSONValue[] flow_biblio_unsorted_complete_(Bi,BJ)(
     Bi            biblio_unordered,
     return ref BJ bib_arr_json
   ) {