reconsider unecessary "return ref"

8 files changed, 127 insertions, 127 deletions

diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 58e612e..e8a29bf 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -333,7 +333,7 @@ light html objects
 #+name: sanitize_and_munge_inline_html
 #+BEGIN_SRC d
 auto munge_html(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _html_special_characters(string _txt){
     _txt = _txt
@@ -440,7 +440,7 @@ string html_font_face(string _txt){
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_heading(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _txt = munge_html(obj);
   string o = format(q"¶<p class="%s"><b>
@@ -458,7 +458,7 @@ auto html_heading(O)(
 ##+name: prepare_objects_html
 #+BEGIN_SRC d
 auto html_heading(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string o;
   string _txt = munge_html(obj);
@@ -479,7 +479,7 @@ auto html_heading(O)(
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_para(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _txt = munge_html(obj);
   _txt = (obj.attrib.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
@@ -500,7 +500,7 @@ auto html_para(O)(
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_quote(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _txt = munge_html(obj);
   string o = format(q"¶<p class="%s">
@@ -518,7 +518,7 @@ auto html_quote(O)(
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_group(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _txt = munge_html(obj);
   string o = format(q"¶<p class="%s">
@@ -536,7 +536,7 @@ auto html_group(O)(
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_block(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _txt = munge_html(obj);
   string o = format(q"¶
@@ -553,7 +553,7 @@ auto html_block(O)(
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_verse(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _txt = munge_html(obj);
   string o = format(q"¶<p class="%s">%s</p>¶",
@@ -569,7 +569,7 @@ auto html_verse(O)(
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_code(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string _txt = html_special_characters_code(obj.text);
   string o = format(q"¶<p class="%s">%s</p>¶",
@@ -585,10 +585,10 @@ auto html_code(O)(
 #+name: html_objects
 #+BEGIN_SRC d
 auto html_table(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   auto _tablarize(O)(
-    auto return ref const O    obj,
+    auto ref const O    obj,
     string                     _txt,
   ) {
     string[] _table_rows = _txt.split(rgx.table_delimiter_row);
@@ -689,8 +689,8 @@ work out
 #+name: sqlite_load_object
 #+BEGIN_SRC d
 auto sqlite_load_string(O,Dm)(
-  auto return ref const O     obj,
-  auto return ref       Dm    doc_matters,
+  auto ref const O     obj,
+  auto ref       Dm    doc_matters,
 ) {
   string o;
   return o;
@@ -700,8 +700,8 @@ auto sqlite_load_string(O,Dm)(
 #+name: sqlite_load_object
 #+BEGIN_SRC d
 auto postgresql_load_string(O,Dm)(
-  auto return ref const O     obj,
-  auto return ref       Dm    doc_matters,
+  auto ref const O     obj,
+  auto ref       Dm    doc_matters,
 ) {
   string o;
   return o;
@@ -711,7 +711,7 @@ auto postgresql_load_string(O,Dm)(
 #+name: sqlite_load_object
 #+BEGIN_SRC d
 string sqlite_statement(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _html,
 ) {
@@ -731,7 +731,7 @@ string sqlite_statement(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto heading(O)(
-  auto return ref const O      obj,
+  auto ref const O      obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -756,7 +756,7 @@ auto heading(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto para(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -781,7 +781,7 @@ auto para(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto quote(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -805,7 +805,7 @@ auto quote(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto group(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -830,7 +830,7 @@ auto group(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto block(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -855,7 +855,7 @@ auto block(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto verse(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -880,7 +880,7 @@ auto verse(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto code(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -905,7 +905,7 @@ auto code(O)(
 #+name: hub_format_and_sqlite_load_objects
 #+BEGIN_SRC d
 auto table(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
 ) {
   string[string] obj_txt = [
     "text": generic_munge_sanitize_text_for_search(obj.text),
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 27c3f2f..122b15c 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -98,7 +98,7 @@ string div_delimit(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 string special_characters(O)(
-  auto return ref const O    obj,
+  auto ref const O           obj,
   string                     _txt
 ){
   _txt = (_txt)
@@ -421,7 +421,7 @@ auto tail() {
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_images(O)(
-  auto return ref const O obj,
+  auto ref const O obj,
   string                  _txt,
   string                  _suffix    = ".html",
   string                  _xml_type = "seg",
@@ -450,7 +450,7 @@ auto inline_images(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_links(O)(
-  auto return ref const O obj,
+  auto ref const O obj,
   string                  _txt,
   string                  _suffix    = ".html",
   string                  _xml_type = "seg",
@@ -502,7 +502,7 @@ auto inline_links(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_notes_scroll(O)(
-  auto return ref const O   obj,
+  auto ref const O   obj,
   string                    _txt,
 ) {
   if (obj.has.inline_notes_reg) {
@@ -531,7 +531,7 @@ auto inline_notes_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_notes_seg(O)(
-  auto return ref const O     obj,
+  auto ref const O     obj,
   string                      _txt,
 ) {
   string[] _endnotes;
@@ -576,7 +576,7 @@ auto inline_notes_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_markup_scroll(O)(
-  auto return ref const O  obj,
+  auto ref const O  obj,
   string                   _txt,
   string                   _suffix = ".html",
 ) {
@@ -592,7 +592,7 @@ auto inline_markup_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_markup_seg(O)(
-  auto return ref const O  obj,
+  auto ref const O  obj,
   string                   _txt,
   string                   _suffix = ".html",
   string                   _xml_type = "seg",
@@ -610,7 +610,7 @@ auto inline_markup_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 string lev4_heading_subtoc(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   char[] lev4_subtoc;
   lev4_subtoc ~= "  <div class=\"nav\">\n";
@@ -642,7 +642,7 @@ string lev4_heading_subtoc(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto nav_pre_next_svg(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
 ) {
   string prev, next, toc;
   if (obj.tags.segment_anchor_tag == "toc") {
@@ -726,7 +726,7 @@ auto nav_pre_next_svg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto heading(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _xml_type = "html",
 ) {
@@ -781,7 +781,7 @@ auto heading(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto heading_scroll(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
 ) {
@@ -797,7 +797,7 @@ auto heading_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto heading_seg(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -820,7 +820,7 @@ auto heading_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto para(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
@@ -865,7 +865,7 @@ auto para(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto para_scroll(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
 ) {
@@ -881,7 +881,7 @@ auto para_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto para_seg(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -904,7 +904,7 @@ auto para_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto quote(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   _txt = font_face(_txt);
@@ -941,7 +941,7 @@ auto quote(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto quote_scroll(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
 ) {
@@ -957,7 +957,7 @@ auto quote_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto quote_seg(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -980,7 +980,7 @@ auto quote_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto group(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   _txt = font_face(_txt);
@@ -1017,7 +1017,7 @@ auto group(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto group_scroll(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -1034,7 +1034,7 @@ auto group_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto group_seg(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -1057,7 +1057,7 @@ auto group_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto block(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   _txt = font_face(_txt);
@@ -1090,7 +1090,7 @@ auto block(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto block_scroll(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -1107,7 +1107,7 @@ auto block_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto block_seg(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -1130,7 +1130,7 @@ auto block_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto verse(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   _txt = font_face(_txt);
@@ -1163,7 +1163,7 @@ auto verse(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto verse_scroll(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -1180,7 +1180,7 @@ auto verse_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto verse_seg(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
   string                     _suffix = ".html",
   string                     _xml_type = "html",
@@ -1202,7 +1202,7 @@ auto verse_seg(O)(
 #+name: xhtml_format_objects_code
 #+BEGIN_SRC d
 auto code(O)(
-  auto return ref const O  obj,
+  auto ref const O  obj,
   string                   _txt,
 ) {
   string o;
@@ -1243,7 +1243,7 @@ align="left|right|center"
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto tablarize(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   string[] _table_rows = (_txt).split(rgx.table_delimiter_row);
@@ -1282,7 +1282,7 @@ auto tablarize(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto table(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
@@ -1317,7 +1317,7 @@ auto table(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto endnote(O)(
-  auto return ref const O    obj,
+  auto ref const O    obj,
   string                     _txt,
 ) {
   string o;
@@ -1354,8 +1354,8 @@ template outputHTML() {
 #+name: output_html_scroll
 #+BEGIN_SRC d
 void scroll(D,I)(
-  auto return ref const D    doc_abstraction,
-  auto return ref I          doc_matters,
+  auto ref const D    doc_abstraction,
+  auto ref       I    doc_matters,
 ) {
   mixin SiSUoutputRgxInit;
   auto xhtml_format = outputXHTMLs();
@@ -1535,7 +1535,7 @@ void scroll_write_output(M,C)(
 #+name: output_html_seg
 #+BEGIN_SRC d
 void seg(D,M)(
-  auto return ref const D    doc_abstraction,
+  auto ref const D    doc_abstraction,
   auto ref              M    doc_matters,
 ) {
   mixin SiSUoutputRgxInit;
@@ -1804,7 +1804,7 @@ void seg_write_output(M,D,E)(
 #+name: output_html_css
 #+BEGIN_SRC d
 void css(M)(
-  auto return ref M          doc_matters,
+  auto ref              M    doc_matters,
 ) {
   auto css = SiSUcss();
   auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language);
@@ -1828,7 +1828,7 @@ void css(M)(
 #+name: copy_html_images
 #+BEGIN_SRC d
 void images_cp(M)(
-  auto return ref M          doc_matters,
+  auto ref              M    doc_matters,
 ) {
   { /+ (copy html images) +/
 
@@ -2216,8 +2216,8 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
 #+name: output_epub3_xhtml_seg
 #+BEGIN_SRC d
 void outputEPub3(D,I)(
-  auto return ref const D    doc_abstraction,
-  auto return ref I          doc_matters,
+  auto ref const D    doc_abstraction,
+  auto ref I          doc_matters,
 ) {
   mixin SiSUoutputRgxInit;
   auto xhtml_format = outputXHTMLs();
diff --git a/org/sdp.org b/org/sdp.org
index fe560e1..fe34840 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -943,8 +943,8 @@ debug(steps) {
 module sdp.meta.metadoc_summary;
 template SiSUabstractionSummary() {
   auto SiSUabstractionSummary(S,T)(
-    auto return ref const S  doc_abstraction,
-    auto return ref       T  doc_matters,
+    auto ref const S  doc_abstraction,
+    auto ref       T  doc_matters,
   ) {
     <<metadoc_summary_imports>>
     mixin InternalMarkup;
diff --git a/src/sdp/meta/metadoc_summary.d b/src/sdp/meta/metadoc_summary.d
index f278f90..2ac2454 100644
--- a/src/sdp/meta/metadoc_summary.d
+++ b/src/sdp/meta/metadoc_summary.d
@@ -1,8 +1,8 @@
 module sdp.meta.metadoc_summary;
 template SiSUabstractionSummary() {
   auto SiSUabstractionSummary(S,T)(
-    auto return ref const S  doc_abstraction,
-    auto return ref       T  doc_matters,
+    auto ref const S  doc_abstraction,
+    auto ref       T  doc_matters,
   ) {
     import
       sdp.meta.defaults,
diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d
index dce1b0c..9389e58 100644
--- a/src/sdp/output/epub3.d
+++ b/src/sdp/output/epub3.d
@@ -293,8 +293,8 @@ template outputEPub3() {
   }
   
   void outputEPub3(D,I)(
-    auto return ref const D    doc_abstraction,
-    auto return ref I          doc_matters,
+    auto ref const D    doc_abstraction,
+    auto ref I          doc_matters,
   ) {
     mixin SiSUoutputRgxInit;
     auto xhtml_format = outputXHTMLs();
diff --git a/src/sdp/output/html.d b/src/sdp/output/html.d
index 46cd4ee..d783579 100644
--- a/src/sdp/output/html.d
+++ b/src/sdp/output/html.d
@@ -13,8 +13,8 @@ template outputHTML() {
     sdp.output.xmls_css;
   mixin outputXHTMLs;
   void scroll(D,I)(
-    auto return ref const D    doc_abstraction,
-    auto return ref I          doc_matters,
+    auto ref const D    doc_abstraction,
+    auto ref       I    doc_matters,
   ) {
     mixin SiSUoutputRgxInit;
     auto xhtml_format = outputXHTMLs();
@@ -181,7 +181,7 @@ template outputHTML() {
     writeln(" ", pth_html.fn_scroll(doc_matters.src.filename));
   }
   void seg(D,M)(
-    auto return ref const D    doc_abstraction,
+    auto ref const D    doc_abstraction,
     auto ref              M    doc_matters,
   ) {
     mixin SiSUoutputRgxInit;
@@ -438,7 +438,7 @@ template outputHTML() {
     writeln(" ", pth_html.fn_seg(doc_matters.src.filename, "toc"));
   }
   void css(M)(
-    auto return ref M          doc_matters,
+    auto ref              M    doc_matters,
   ) {
     auto css = SiSUcss();
     auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language);
@@ -456,7 +456,7 @@ template outputHTML() {
     }
   }
   void images_cp(M)(
-    auto return ref M          doc_matters,
+    auto ref              M    doc_matters,
   ) {
     { /+ (copy html images) +/
   
diff --git a/src/sdp/output/sqlite.d b/src/sdp/output/sqlite.d
index 636fe6f..f805392 100644
--- a/src/sdp/output/sqlite.d
+++ b/src/sdp/output/sqlite.d
@@ -158,7 +158,7 @@ template SQLiteFormatAndLoadObject() {
         return _txt;
       }
       auto munge_html(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _html_special_characters(string _txt){
           _txt = _txt
@@ -240,7 +240,7 @@ template SQLiteFormatAndLoadObject() {
         return _txt;
       }
       auto html_heading(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _txt = munge_html(obj);
         string o = format(q"¶<p class="%s"><b>
@@ -252,7 +252,7 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto html_para(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _txt = munge_html(obj);
         _txt = (obj.attrib.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
@@ -267,7 +267,7 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto html_quote(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _txt = munge_html(obj);
         string o = format(q"¶<p class="%s">
@@ -279,7 +279,7 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto html_group(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _txt = munge_html(obj);
         string o = format(q"¶<p class="%s">
@@ -291,7 +291,7 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto html_block(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _txt = munge_html(obj);
         string o = format(q"¶
@@ -302,7 +302,7 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto html_verse(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _txt = munge_html(obj);
         string o = format(q"¶<p class="%s">%s</p>¶",
@@ -312,7 +312,7 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto html_code(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
       ) {
         string _txt = html_special_characters_code(obj.text);
         string o = format(q"¶<p class="%s">%s</p>¶",
@@ -322,10 +322,10 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto html_table(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         auto _tablarize(O)(
-          auto return ref const O    obj,
+          auto ref const O    obj,
           string                     _txt,
         ) {
           string[] _table_rows = _txt.split(rgx.table_delimiter_row);
@@ -382,21 +382,21 @@ template SQLiteFormatAndLoadObject() {
         return o;
       }
       auto sqlite_load_string(O,Dm)(
-        auto return ref const O     obj,
-        auto return ref       Dm    doc_matters,
+        auto ref const O     obj,
+        auto ref       Dm    doc_matters,
       ) {
         string o;
         return o;
       }
       auto postgresql_load_string(O,Dm)(
-        auto return ref const O     obj,
-        auto return ref       Dm    doc_matters,
+        auto ref const O     obj,
+        auto ref       Dm    doc_matters,
       ) {
         string o;
         return o;
       }
       string sqlite_statement(O)(
-        auto return ref const O    obj,
+        auto ref const O    obj,
         string                     _txt,
         string                     _html,
       ) {
@@ -410,7 +410,7 @@ template SQLiteFormatAndLoadObject() {
         return _sql;
       }
       auto heading(O)(
-        auto return ref const O      obj,
+        auto ref const O      obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -429,7 +429,7 @@ template SQLiteFormatAndLoadObject() {
         return obj_txt;
       }
       auto para(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -448,7 +448,7 @@ template SQLiteFormatAndLoadObject() {
         return obj_txt;
       }
       auto quote(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -467,7 +467,7 @@ template SQLiteFormatAndLoadObject() {
         return obj_txt;
       }
       auto group(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -486,7 +486,7 @@ template SQLiteFormatAndLoadObject() {
         return obj_txt;
       }
       auto block(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -505,7 +505,7 @@ template SQLiteFormatAndLoadObject() {
         return obj_txt;
       }
       auto verse(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -524,7 +524,7 @@ template SQLiteFormatAndLoadObject() {
         return obj_txt;
       }
       auto code(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
@@ -543,7 +543,7 @@ template SQLiteFormatAndLoadObject() {
         return obj_txt;
       }
       auto table(O)(
-        auto return ref const O     obj,
+        auto ref const O     obj,
       ) {
         string[string] obj_txt = [
           "text": generic_munge_sanitize_text_for_search(obj.text),
diff --git a/src/sdp/output/xmls.d b/src/sdp/output/xmls.d
index e977e6c..e389c5c 100644
--- a/src/sdp/output/xmls.d
+++ b/src/sdp/output/xmls.d
@@ -51,7 +51,7 @@ template outputXHTMLs() {
       return delimit;
     }
     string special_characters(O)(
-      auto return ref const O    obj,
+      auto ref const O           obj,
       string                     _txt
     ){
       _txt = (_txt)
@@ -312,7 +312,7 @@ template outputXHTMLs() {
       return o;
     }
     auto inline_images(O)(
-      auto return ref const O obj,
+      auto ref const O obj,
       string                  _txt,
       string                  _suffix    = ".html",
       string                  _xml_type = "seg",
@@ -335,7 +335,7 @@ template outputXHTMLs() {
       return _txt;
     }
     auto inline_links(O)(
-      auto return ref const O obj,
+      auto ref const O obj,
       string                  _txt,
       string                  _suffix    = ".html",
       string                  _xml_type = "seg",
@@ -381,7 +381,7 @@ template outputXHTMLs() {
       return _txt;
     }
     auto inline_notes_scroll(O)(
-      auto return ref const O   obj,
+      auto ref const O   obj,
       string                    _txt,
     ) {
       if (obj.has.inline_notes_reg) {
@@ -404,7 +404,7 @@ template outputXHTMLs() {
       return _txt;
     }
     auto inline_notes_seg(O)(
-      auto return ref const O     obj,
+      auto ref const O     obj,
       string                      _txt,
     ) {
       string[] _endnotes;
@@ -443,7 +443,7 @@ template outputXHTMLs() {
       return t;
     }
     auto inline_markup_scroll(O)(
-      auto return ref const O  obj,
+      auto ref const O  obj,
       string                   _txt,
       string                   _suffix = ".html",
     ) {
@@ -453,7 +453,7 @@ template outputXHTMLs() {
       return _txt;
     }
     auto inline_markup_seg(O)(
-      auto return ref const O  obj,
+      auto ref const O  obj,
       string                   _txt,
       string                   _suffix = ".html",
       string                   _xml_type = "seg",
@@ -464,7 +464,7 @@ template outputXHTMLs() {
       return t;
     }
     string lev4_heading_subtoc(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
     ) {
       char[] lev4_subtoc;
       lev4_subtoc ~= "  <div class=\"nav\">\n";
@@ -490,7 +490,7 @@ template outputXHTMLs() {
       return lev4_subtoc.to!string;
     }
     auto nav_pre_next_svg(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
     ) {
       string prev, next, toc;
       if (obj.tags.segment_anchor_tag == "toc") {
@@ -567,7 +567,7 @@ template outputXHTMLs() {
       return bar();
     }
     auto heading(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _xml_type = "html",
     ) {
@@ -616,7 +616,7 @@ template outputXHTMLs() {
       return o;
     }
     auto heading_scroll(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
     ) {
@@ -626,7 +626,7 @@ template outputXHTMLs() {
       return o;
     }
     auto heading_seg(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -642,7 +642,7 @@ template outputXHTMLs() {
       return u;
     }
     auto para(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
@@ -681,7 +681,7 @@ template outputXHTMLs() {
       return o;
     }
     auto para_scroll(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
     ) {
@@ -691,7 +691,7 @@ template outputXHTMLs() {
       return o;
     }
     auto para_seg(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -707,7 +707,7 @@ template outputXHTMLs() {
       return u;
     }
     auto quote(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       _txt = font_face(_txt);
@@ -738,7 +738,7 @@ template outputXHTMLs() {
       return o;
     }
     auto quote_scroll(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
     ) {
@@ -748,7 +748,7 @@ template outputXHTMLs() {
       return o;
     }
     auto quote_seg(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -764,7 +764,7 @@ template outputXHTMLs() {
       return u;
     }
     auto group(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       _txt = font_face(_txt);
@@ -795,7 +795,7 @@ template outputXHTMLs() {
       return o;
     }
     auto group_scroll(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -806,7 +806,7 @@ template outputXHTMLs() {
       return o;
     }
     auto group_seg(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -822,7 +822,7 @@ template outputXHTMLs() {
       return u;
     }
     auto block(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       _txt = font_face(_txt);
@@ -849,7 +849,7 @@ template outputXHTMLs() {
       return o;
     }
     auto block_scroll(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -860,7 +860,7 @@ template outputXHTMLs() {
       return o;
     }
     auto block_seg(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -876,7 +876,7 @@ template outputXHTMLs() {
       return u;
     }
     auto verse(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       _txt = font_face(_txt);
@@ -903,7 +903,7 @@ template outputXHTMLs() {
       return o;
     }
     auto verse_scroll(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -914,7 +914,7 @@ template outputXHTMLs() {
       return o;
     }
     auto verse_seg(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
       string                     _suffix = ".html",
       string                     _xml_type = "html",
@@ -930,7 +930,7 @@ template outputXHTMLs() {
       return u;
     }
     auto tablarize(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       string[] _table_rows = (_txt).split(rgx.table_delimiter_row);
@@ -963,7 +963,7 @@ template outputXHTMLs() {
       return t;
     }
     auto table(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
@@ -992,7 +992,7 @@ template outputXHTMLs() {
       return o;
     }
     auto endnote(O)(
-      auto return ref const O    obj,
+      auto ref const O    obj,
       string                     _txt,
     ) {
       string o;
@@ -1007,7 +1007,7 @@ template outputXHTMLs() {
       return o;
     }
     auto code(O)(
-      auto return ref const O  obj,
+      auto ref const O  obj,
       string                   _txt,
     ) {
       string o;