specify Tuple content for read in files, remove traits.std

1 files changed, 12 insertions, 14 deletions

diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index 5e61237..99de32c 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -1186,7 +1186,6 @@ template docAbstraction() {
                                                                                 /+ ↓ post loop markup document/text +/
     auto en_tuple
       = note_section.endnote_objects(obj_cite_digits, opt_action);
-    static assert(!isTypeTuple!(en_tuple));
     auto the_endnotes_section = en_tuple[0];
     obj_cite_digits = en_tuple[1];
     debug(endnotes) {
@@ -1338,7 +1337,6 @@ template docAbstraction() {
         opt_action,
       );
     destroy(bookindex_unordered_hashes);
-    static assert(!isTypeTuple!(bi_tuple));
     auto the_bookindex_section = bi_tuple[0];
     obj_cite_digits = bi_tuple[1];
     debug(bookindex) {
@@ -4327,7 +4325,7 @@ template docAbstraction() {
       }
       return obj_txt_in;
     }
-    auto footnotes_endnotes_markup_and_number_or_stars()(string obj_txt_in, bool reset_note_numbers) @safe {
+    Tuple!(string, bool, bool, bool) footnotes_endnotes_markup_and_number_or_stars()(string obj_txt_in, bool reset_note_numbers) @safe {
       /+ endnotes (regular) +/
       bool flg_notes_reg  = false;
       bool flg_notes_star = false;
@@ -4383,7 +4381,7 @@ template docAbstraction() {
       } else {
         obj_txt_out = obj_txt_in;
       }
-      auto t = tuple(
+      Tuple!(string, bool, bool, bool) t = tuple(
         obj_txt_out,
         flg_notes_reg,
         flg_notes_star,
@@ -4391,7 +4389,7 @@ template docAbstraction() {
       );
       return t;
     }
-    private auto object_notes_and_links_()(
+    private Tuple!(string, bool, bool, bool, bool, bool) object_notes_and_links_()(
       string obj_txt_in,
       bool reset_note_numbers=false
     ) @safe {
@@ -4425,7 +4423,7 @@ template docAbstraction() {
         obj_txt_in = obj_txt_in
           .replaceAll(rgx.para_inline_link_anchor, "┃$1┃");
       }
-      auto ftn = footnotes_endnotes_markup_and_number_or_stars(obj_txt_in, reset_note_numbers);
+      Tuple!(string, bool, bool, bool) ftn = footnotes_endnotes_markup_and_number_or_stars(obj_txt_in, reset_note_numbers);
       obj_txt_out = ftn[0];
       debug(footnotes) {
         writeln(obj_txt_out, tail);
@@ -4438,7 +4436,7 @@ template docAbstraction() {
           writeln(m.hit);
         }
       }
-      auto t = tuple(
+      Tuple!(string, bool, bool, bool, bool, bool) t = tuple(
         obj_txt_out,
         ftn[1],
         ftn[2],
@@ -4449,7 +4447,7 @@ template docAbstraction() {
       return t;
     }
     auto init() {
-      auto t = object_notes_and_links_("");
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_("");
       return t;
     }
     invariant() {
@@ -4462,7 +4460,7 @@ template docAbstraction() {
        .replaceFirst(rgx.heading, "")
        .replaceFirst(rgx.object_number_off_all, "")
        .strip;
-      auto t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers);
       debug(munge) {
         writeln(__LINE__);
         writeln(obj_txt_in);
@@ -4477,7 +4475,7 @@ template docAbstraction() {
       obj_txt["munge"]=(obj_txt_in)
         .replaceFirst(rgx.para_attribs, "")
         .replaceFirst(rgx.object_number_off_all, "");
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       debug(munge) {
         writeln(__LINE__);
         writeln(obj_txt_in);
@@ -4494,21 +4492,21 @@ template docAbstraction() {
     }
     auto munge_group(string obj_txt_in) @safe {
       obj_txt["munge"]=obj_txt_in;
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       return t;
     }
     invariant() {
     }
     auto munge_block()(string obj_txt_in) @safe {
       obj_txt["munge"]=obj_txt_in;
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       return t;
     }
     invariant() {
     }
     auto munge_verse()(string obj_txt_in) @safe {
       obj_txt["munge"]=obj_txt_in;
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       return t;
     }
     invariant() {
@@ -4618,7 +4616,7 @@ template docAbstraction() {
         obj_notes_and_links["image_no_dimensions"] = x[5];
         break;
       }
-      auto t = tuple(
+      Tuple!(string, string, bool, bool, bool, bool) t = tuple(
         obj_txt["munge"],
         anchor_tag,
         obj_notes_and_links["notes_reg"],