From 9c42b4567f35aceacce1298a6d4789d6789e5bfe Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 17 Dec 2019 13:22:51 -0500
Subject: specify Tuple content for read in files, remove traits.std

---
 org/out_odt.org | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'org/out_odt.org')

diff --git a/org/out_odt.org b/org/out_odt.org
index 59e731c..3092aa5 100644
--- a/org/out_odt.org
+++ b/org/out_odt.org
@@ -373,13 +373,13 @@ string _font_face(string _txt){
     .replaceAll(rgx.inline_strike,      "<del>$1</del>")
     .replaceAll(rgx.inline_insert,      "<ins>$1</ins>")
     .replaceAll(rgx.inline_cite,        "<cite>$1</cite>")
-    .replaceAll(rgx.inline_emphasis,    format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃","$1"))
-    .replaceAll(rgx.inline_bold,        format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃","$1"))
-    .replaceAll(rgx.inline_italics,     format(q"┃<text:span text:style-name="Span_italic">%s</text:span>┃","$1"))
-    .replaceAll(rgx.inline_underscore,  format(q"┃<text:span text:style-name="Span_underscore">%s</text:span>┃","$1"))
+    .replaceAll(rgx.inline_emphasis,    format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃",       "$1"))
+    .replaceAll(rgx.inline_bold,        format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃",       "$1"))
+    .replaceAll(rgx.inline_italics,     format(q"┃<text:span text:style-name="Span_italic">%s</text:span>┃",     "$1"))
+    .replaceAll(rgx.inline_underscore,  format(q"┃<text:span text:style-name="Span_underscore">%s</text:span>┃", "$1"))
     .replaceAll(rgx.inline_superscript, format(q"┃<text:span text:style-name="Span_superscript">%s</text:span>┃","$1"))
-    .replaceAll(rgx.inline_subscript,   format(q"┃<text:span text:style-name="Span_subscript">%s</text:span>┃","$1"))
-    .replaceAll(rgx.inline_mono,        format(q"┃<text:span text:style-name="Span_monospace">%s</text:span>┃","$1"));
+    .replaceAll(rgx.inline_subscript,   format(q"┃<text:span text:style-name="Span_subscript">%s</text:span>┃",  "$1"))
+    .replaceAll(rgx.inline_mono,        format(q"┃<text:span text:style-name="Span_monospace">%s</text:span>┃",  "$1"));
   return _txt;
 }
 #+END_SRC
@@ -764,7 +764,7 @@ string code(O,M)(
 
 #+name: odt_format_objects
 #+BEGIN_SRC d
-auto tablarize(O)(
+Tuple!(string, string) tablarize(O)(
   const        O    obj,
   string            _txt,
 ) @safe {
@@ -792,7 +792,7 @@ auto tablarize(O)(
       }
       _table ~= "</table:table-row>";
     }
-  auto t = tuple(
+  Tuple!(string, string) t = tuple(
     _table,
     _tablenote,
   );
@@ -814,7 +814,7 @@ string table(O,M)(
   assert(obj.metainfo.is_of_type    == "block");
   assert(obj.metainfo.is_a          == "table");
   string _o_txt_odt = markup(obj);
-  auto t = tablarize(obj, _o_txt_odt);
+  Tuple!(string, string) t = tablarize(obj, _o_txt_odt);
   string _note = t[1];
   _o_txt_odt = format(q"┃
 <table:table table:name="Table%s" table:style-name="Table1">
-- 
cgit v1.2.3