0.26.4 file renames, cleaning, reorganisation

1 files changed, 95 insertions, 95 deletions

diff --git a/org/output_xmls.org b/org/output_xmls.org
index 122b15c..0aa50d5 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -98,8 +98,8 @@ string div_delimit(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 string special_characters(O)(
-  auto ref const O           obj,
-  string                     _txt
+  const  O         obj,
+  string           _txt
 ){
   _txt = (_txt)
     .replaceAll(rgx.xhtml_ampersand,    "&")
@@ -421,10 +421,10 @@ auto tail() {
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_images(O)(
-  auto ref const O obj,
-  string                  _txt,
-  string                  _suffix    = ".html",
-  string                  _xml_type = "seg",
+  const  O         obj,
+  string           _txt,
+  string           _suffix    = ".html",
+  string           _xml_type = "seg",
 ) {
   string _img_pth;
   if (_xml_type == "epub") {
@@ -450,10 +450,10 @@ auto inline_images(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_links(O)(
-  auto ref const O obj,
-  string                  _txt,
-  string                  _suffix    = ".html",
-  string                  _xml_type = "seg",
+  const  O         obj,
+  string           _txt,
+  string           _suffix    = ".html",
+  string           _xml_type = "seg",
 ) {
   if (obj.has.inline_links) {
     if ((_txt.match(rgx.mark_internal_site_lnk))
@@ -502,8 +502,8 @@ auto inline_links(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_notes_scroll(O)(
-  auto ref const O   obj,
-  string                    _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   if (obj.has.inline_notes_reg) {
     _txt = font_face(_txt);
@@ -531,8 +531,8 @@ auto inline_notes_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_notes_seg(O)(
-  auto ref const O     obj,
-  string                      _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   string[] _endnotes;
   if (obj.has.inline_notes_reg) {
@@ -576,9 +576,9 @@ auto inline_notes_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_markup_scroll(O)(
-  auto ref const O  obj,
-  string                   _txt,
-  string                   _suffix = ".html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
 ) {
   _txt = inline_images(obj, _txt, _suffix, "scroll");
   _txt = inline_links(obj, _txt, _suffix, "scroll");
@@ -592,10 +592,10 @@ auto inline_markup_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto inline_markup_seg(O)(
-  auto ref const O  obj,
-  string                   _txt,
-  string                   _suffix = ".html",
-  string                   _xml_type = "seg",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "seg",
 ) {
   _txt = inline_images(obj, _txt, _suffix, _xml_type);
   _txt = inline_links(obj, _txt, _suffix, _xml_type);
@@ -610,7 +610,7 @@ auto inline_markup_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 string lev4_heading_subtoc(O)(
-  auto ref const O    obj,
+  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 ref const O    obj,
+  const  O         obj,
 ) {
   string prev, next, toc;
   if (obj.tags.segment_anchor_tag == "toc") {
@@ -726,9 +726,9 @@ auto nav_pre_next_svg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto heading(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _xml_type = "html",
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   string _horizontal_rule = "<hr />";
@@ -781,9 +781,9 @@ auto heading(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto heading_scroll(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -797,10 +797,10 @@ auto heading_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto heading_seg(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
   _txt = t[0];
@@ -820,8 +820,8 @@ auto heading_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto para(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = font_face(_txt);
@@ -865,9 +865,9 @@ auto para(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto para_scroll(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -881,10 +881,10 @@ auto para_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto para_seg(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
   _txt = t[0].to!string;
@@ -904,8 +904,8 @@ auto para_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto quote(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   _txt = font_face(_txt);
   string o;
@@ -941,9 +941,9 @@ auto quote(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto quote_scroll(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -957,10 +957,10 @@ auto quote_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto quote_seg(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
   _txt = t[0].to!string;
@@ -980,8 +980,8 @@ auto quote_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto group(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   _txt = font_face(_txt);
   string o;
@@ -1017,10 +1017,10 @@ auto group(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto group_scroll(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1034,10 +1034,10 @@ auto group_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto group_seg(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
   _txt = t[0].to!string;
@@ -1057,8 +1057,8 @@ auto group_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto block(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   _txt = font_face(_txt);
   string o;
@@ -1090,10 +1090,10 @@ auto block(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto block_scroll(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1107,10 +1107,10 @@ auto block_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto block_seg(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
   _txt = t[0].to!string;
@@ -1130,8 +1130,8 @@ auto block_seg(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto verse(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   _txt = font_face(_txt);
   string o;
@@ -1163,10 +1163,10 @@ auto verse(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto verse_scroll(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1180,10 +1180,10 @@ auto verse_scroll(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto verse_seg(O)(
-  auto ref const O    obj,
-  string                     _txt,
-  string                     _suffix = ".html",
-  string                     _xml_type = "html",
+  const  O         obj,
+  string           _txt,
+  string           _suffix = ".html",
+  string           _xml_type = "html",
 ) {
   auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
   _txt = t[0].to!string;
@@ -1202,8 +1202,8 @@ auto verse_seg(O)(
 #+name: xhtml_format_objects_code
 #+BEGIN_SRC d
 auto code(O)(
-  auto ref const O  obj,
-  string                   _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   string o;
   if (obj.metainfo.object_number.empty) {
@@ -1243,8 +1243,8 @@ align="left|right|center"
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto tablarize(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   string[] _table_rows = (_txt).split(rgx.table_delimiter_row);
   string[] _table_cols;
@@ -1282,8 +1282,8 @@ auto tablarize(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto table(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const  O         obj,
+  string           _txt,
 ) {
   auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
   _txt = font_face(_txt);
@@ -1317,8 +1317,8 @@ auto table(O)(
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
 auto endnote(O)(
-  auto ref const O    obj,
-  string                     _txt,
+  const O          obj,
+  string           _txt,
 ) {
   string o;
   o = format(q"¶    <p class="%s" indent="h%si%s">
@@ -1354,8 +1354,8 @@ template outputHTML() {
 #+name: output_html_scroll
 #+BEGIN_SRC d
 void scroll(D,I)(
-  auto ref const D    doc_abstraction,
-  auto ref       I    doc_matters,
+  const D    doc_abstraction,
+        I    doc_matters,
 ) {
   mixin SiSUoutputRgxInit;
   auto xhtml_format = outputXHTMLs();
@@ -1535,8 +1535,8 @@ void scroll_write_output(M,C)(
 #+name: output_html_seg
 #+BEGIN_SRC d
 void seg(D,M)(
-  auto ref const D    doc_abstraction,
-  auto ref              M    doc_matters,
+  const D    doc_abstraction,
+        M    doc_matters,
 ) {
   mixin SiSUoutputRgxInit;
   auto rgx = Rgx();
@@ -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 ref const D    doc_abstraction,
-  auto ref I          doc_matters,
+  const D    doc_abstraction,
+        I    doc_matters,
 ) {
   mixin SiSUoutputRgxInit;
   auto xhtml_format = outputXHTMLs();