1 files changed, 13 insertions, 14 deletions
diff --git a/org/output_xmls.org b/org/output_xmls.org
index ec2e5d8..7b86093 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -172,8 +172,8 @@ string _xhtml_anchor_tags(const(string[]) anchor_tags) {
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto header_metadata(Dm)(
-  Dm doc_matters,
+auto header_metadata(M)(
+  M  doc_matters,
 ) {
   string _title="Title";
   string _author="Author";
@@ -227,8 +227,8 @@ auto header_metadata(Dm)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto site_info_button(Dm)(
-  Dm doc_matters,
+auto site_info_button(M)(
+  M  doc_matters,
 ) {
   string _locations;
   if (doc_matters.conf_make_meta.make.home_button_text.length > 0) {
@@ -257,8 +257,8 @@ auto site_info_button(Dm)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto inline_search_form(Dm)(
-  Dm doc_matters,
+auto inline_search_form(M)(
+  M  doc_matters,
 ) {
   string _action="http://www.sisudoc.org/cgi-bin/search.cgi";
   string _db="SiSU.7a.manual";
@@ -287,8 +287,8 @@ auto inline_search_form(Dm)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto html_head(Dm)(
-  Dm doc_matters,
+auto html_head(M)(
+  M  doc_matters,
   string type,
 ) {
   string o;
@@ -340,8 +340,8 @@ auto html_head(Dm)(
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
-auto epub3_seg_head(Dm)(
-  Dm doc_matters,
+auto epub3_seg_head(M)(
+  M  doc_matters,
 ) {
   string html_base = format(q"¶<!DOCTYPE html>
 <html>¶",
@@ -435,8 +435,7 @@ auto inline_images(O)(
     _img_pth = "../../../image/";
   }
   if (_txt.match(rgx.inline_image)) {
-    _txt = (_txt)
-      .replaceAll( // TODO bug where image dimensions (w or h) not given & consequently set to 0; should not be used (calculate earlier, abstraction)
+    _txt = _txt.replaceAll( // TODO bug where image dimensions (w or h) not given & consequently set to 0; should not be used (calculate earlier, abstraction)
         rgx.inline_image,
         ("$1<img src=\""
           ~ _img_pth
@@ -1535,9 +1534,9 @@ void scroll_write_output(M,C)(
 
 #+name: output_html_seg
 #+BEGIN_SRC d
-void seg(D,I)(
+void seg(D,M)(
   auto return ref const D    doc_abstraction,
-  auto return ref I          doc_matters,
+  auto ref              M    doc_matters,
 ) {
   mixin SiSUoutputRgxInit;
   auto rgx = Rgx();