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

1 files changed, 12 insertions, 14 deletions

diff --git a/org/metaverse.org b/org/metaverse.org
index 500b6ac..c7f3481 100644
--- a/org/metaverse.org
+++ b/org/metaverse.org
@@ -1550,7 +1550,6 @@ if (the_document_body_section.length > 0) {
 #+BEGIN_SRC d
 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) {
@@ -1766,7 +1765,6 @@ auto bi_tuple
     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) {
@@ -5402,7 +5400,7 @@ static struct ObjInlineMarkupMunge {
 
 #+name: meta_emitters_obj_inline_markup_munge
 #+BEGIN_SRC d
-  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;
@@ -5458,7 +5456,7 @@ static struct ObjInlineMarkupMunge {
     } 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,
@@ -5472,7 +5470,7 @@ static struct ObjInlineMarkupMunge {
 
 #+name: meta_emitters_obj_inline_markup_munge
 #+BEGIN_SRC d
-  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 {
@@ -5506,7 +5504,7 @@ static struct ObjInlineMarkupMunge {
       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);
@@ -5519,7 +5517,7 @@ static struct ObjInlineMarkupMunge {
         writeln(m.hit);
       }
     }
-    auto t = tuple(
+    Tuple!(string, bool, bool, bool, bool, bool) t = tuple(
       obj_txt_out,
       ftn[1],
       ftn[2],
@@ -5530,7 +5528,7 @@ static struct ObjInlineMarkupMunge {
     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() {
@@ -5551,7 +5549,7 @@ static struct ObjInlineMarkupMunge {
      .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);
@@ -5578,7 +5576,7 @@ static struct ObjInlineMarkupMunge {
     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);
@@ -5614,7 +5612,7 @@ static struct ObjInlineMarkupMunge {
 #+BEGIN_SRC d
   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() {
@@ -5634,7 +5632,7 @@ static struct ObjInlineMarkupMunge {
 #+BEGIN_SRC d
   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() {
@@ -5654,7 +5652,7 @@ static struct ObjInlineMarkupMunge {
 #+BEGIN_SRC d
   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() {
@@ -5809,7 +5807,7 @@ static struct ObjInlineMarkup {
       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"],