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

1 files changed, 32 insertions, 34 deletions

diff --git a/org/out_xmls.org b/org/out_xmls.org
index 8821cca..5cbe430 100644
--- a/org/out_xmls.org
+++ b/org/out_xmls.org
@@ -262,9 +262,7 @@ string inline_search_form(M)(
     _db,
     );
   } else {
-    _form = format(q"┃%s┃",
-      "",
-    );
+    _form = format(q"┃%s┃", "");
   }
   o = format(q"┃<div class="flex-menu-option">%s
     </div>┃",
@@ -598,7 +596,7 @@ string inline_notes_scroll(O,M)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto inline_notes_seg(O,M)(
+Tuple!(string, string[]) inline_notes_seg(O,M)(
   string          _txt,
   const        O  obj,
                M  doc_matters,
@@ -656,7 +654,7 @@ auto inline_notes_seg(O,M)(
       writeln(__LINE__, " endnote: ", obj.metainfo.is_a, ": ", obj.text);
     }
   }
-  auto t = tuple(
+  Tuple!(string, string[]) t = tuple(
     _txt,
     _endnotes,
   );
@@ -930,7 +928,7 @@ string heading_scroll(O,M)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto heading_seg(O,M)(
+Tuple!(string, string[]) heading_seg(O,M)(
   string          _txt,
   const        O  obj,
                M  doc_matters,
@@ -941,7 +939,7 @@ auto heading_seg(O,M)(
   _txt = t[0];
   string[] _endnotes = t[1];
   string o = heading(_txt, obj, doc_matters, _xml_type);
-  auto u = tuple(
+  Tuple!(string, string[]) u = tuple(
     o,
     _endnotes,
   );
@@ -1025,7 +1023,7 @@ string para_scroll(O,M)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto para_seg(O,M)(
+Tuple!(string, string[]) para_seg(O,M)(
   string          _txt,
   const        O  obj,
                M  doc_matters,
@@ -1036,7 +1034,7 @@ auto para_seg(O,M)(
   _txt = t[0].to!string;
   string[] _endnotes = t[1];
   string o = para(_txt, obj, doc_matters);
-  auto u = tuple(
+  Tuple!(string, string[]) u = tuple(
     o,
     _endnotes,
   );
@@ -1107,7 +1105,7 @@ string quote_scroll(O,M)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto quote_seg(O,M)(
+Tuple!(string, string[]) quote_seg(O,M)(
   string          _txt,
   const        O  obj,
                M  doc_matters,
@@ -1118,7 +1116,7 @@ auto quote_seg(O,M)(
   _txt = t[0].to!string;
   string[] _endnotes = t[1];
   string o = quote(_txt, obj, doc_matters);
-  auto u = tuple(
+  Tuple!(string, string[]) u = tuple(
     o,
     _endnotes,
   );
@@ -1190,7 +1188,7 @@ string group_scroll(O,M)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto group_seg(O,M)(
+Tuple!(string, string[]) group_seg(O,M)(
   string          _txt,
   const        O  obj,
                M  doc_matters,
@@ -1201,7 +1199,7 @@ auto group_seg(O,M)(
   _txt = t[0].to!string;
   string[] _endnotes = t[1];
   string o = group(_txt, obj, doc_matters);
-  auto u = tuple(
+  Tuple!(string, string[]) u = tuple(
     o,
     _endnotes,
   );
@@ -1269,7 +1267,7 @@ string block_scroll(O,M)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto block_seg(O,M)(
+Tuple!(string, string[]) block_seg(O,M)(
   string          _txt,
   const        O  obj,
                M  doc_matters,
@@ -1280,7 +1278,7 @@ auto block_seg(O,M)(
   _txt = t[0].to!string;
   string[] _endnotes = t[1];
   string o = block(_txt, obj, doc_matters);
-  auto u = tuple(
+  Tuple!(string, string[]) u = tuple(
     o,
     _endnotes,
   );
@@ -1348,7 +1346,7 @@ string verse_scroll(O,M)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto verse_seg(O,M)(
+Tuple!(string, string[]) verse_seg(O,M)(
   string          _txt,
   const        O  obj,
                M  doc_matters,
@@ -1359,7 +1357,7 @@ auto verse_seg(O,M)(
   _txt = t[0].to!string;
   string[] _endnotes = t[1];
   string o = verse(_txt, obj, doc_matters);
-  auto u = tuple(
+  Tuple!(string, string[]) u = tuple(
     o,
     _endnotes,
   );
@@ -1443,7 +1441,7 @@ align="left|right|center"
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto tablarize(O)(
+Tuple!(string, string) tablarize(O)(
   string            _txt,
   const        O    obj,
 ) @safe {
@@ -1453,24 +1451,24 @@ auto tablarize(O)(
   string _tablenote;
   foreach(row_idx, row; _table_rows) {
     _table_cols = row.split(rgx.table_delimiter_col);
-      _table ~= "<tr>";
-      foreach(col_idx, cell; _table_cols) {
-        if ((_table_cols.length == 1)
-        && (_table_rows.length <= row_idx+2)) {
-          _tablenote ~= cell;
-        } else {
-          string _col_is = (row_idx == 0 && obj.table.heading) ? "th" : "td";
-          string _align = ("style=\"text-align:"
-          ~ ((obj.table.column_aligns[col_idx] == "l")
-          ? "left\"" : "right\""));
-          _table ~= "<" ~ _col_is ~ " width=\"" ~ obj.table.column_widths[col_idx].to!string ~ "%\" " ~ _align ~ ">";
-          _table ~= cell;
-          _table ~= "</" ~ _col_is ~ ">";
-        }
+    _table ~= "<tr>";
+    foreach(col_idx, cell; _table_cols) {
+      if ((_table_cols.length == 1)
+      && (_table_rows.length <= row_idx+2)) {
+        _tablenote ~= cell;
+      } else {
+        string _col_is = (row_idx == 0 && obj.table.heading) ? "th" : "td";
+        string _align = ("style=\"text-align:"
+        ~ ((obj.table.column_aligns[col_idx] == "l")
+        ? "left\"" : "right\""));
+        _table ~= "<" ~ _col_is ~ " width=\"" ~ obj.table.column_widths[col_idx].to!string ~ "%\" " ~ _align ~ ">";
+        _table ~= cell;
+        _table ~= "</" ~ _col_is ~ ">";
       }
-      _table ~= "</tr>";
     }
-  auto t = tuple(
+    _table ~= "</tr>";
+  }
+  Tuple!(string, string) t = tuple(
     _table,
     _tablenote,
   );