From cbd7a2efcb367677f189e3bfed0f8206b1bd474d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Fri, 5 Mar 2021 18:37:21 -0500
Subject: fix issues raised by dmd2.095.1 ldc2 1.25.0

---
 org/default_paths.org                | 5 +++--
 org/out_odt.org                      | 2 ++
 src/doc_reform/io_out/odt.d          | 2 ++
 src/doc_reform/io_out/paths_output.d | 5 +++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/org/default_paths.org b/org/default_paths.org
index 5c4e15e..4df17e8 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -1455,6 +1455,7 @@ template spinePathsEPUB() {
 #+NAME: template_paths_odf
 #+BEGIN_SRC d
 template spinePathsODT() {
+  import std.conv;
   mixin spineRgxIn;
   static auto rgx = RgxI();
   auto spinePathsODT(M)(
@@ -1471,8 +1472,8 @@ template spinePathsODT() {
       }
       string dirtop(string type) {
         return (type == "zip")
-        ? "".chainPath("").array
-        : ((base_pth.chainPath(doc_matters.src.doc_uid_out)).asNormalizedPath).array;
+        ? "" // ".chainPath("").array
+        : ((base_pth.chainPath(doc_matters.src.doc_uid_out)).asNormalizedPath).array.to!string;
       }
       string mimetype(string type="fs") {
         assert(type == "zip" || "fs");
diff --git a/org/out_odt.org b/org/out_odt.org
index fe83c68..05e9891 100644
--- a/org/out_odt.org
+++ b/org/out_odt.org
@@ -1039,6 +1039,7 @@ import
 void dirtree(I)(
   I   doc_matters,
 ) {
+  import doc_reform.io_out.paths_output;
   auto pth_odt = spinePathsODT!()(doc_matters);
   if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/
     if (!exists(pth_odt.meta_inf_dir("fs"))) {
@@ -2547,6 +2548,7 @@ doc_matters.generated_time,
   auto ref              M    doc_matters,
 ) {
   { /+ (copy odt images) +/
+    import doc_reform.io_out.paths_output;
     auto pth_odt = spinePathsODT!()(doc_matters);
     foreach (image; doc_matters.srcs.image_list) {
       auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image;
diff --git a/src/doc_reform/io_out/odt.d b/src/doc_reform/io_out/odt.d
index e12f93f..eae48f6 100644
--- a/src/doc_reform/io_out/odt.d
+++ b/src/doc_reform/io_out/odt.d
@@ -886,6 +886,7 @@ template outputODT() {
     auto ref              M    doc_matters,
   ) {
     { /+ (copy odt images) +/
+      import doc_reform.io_out.paths_output;
       auto pth_odt = spinePathsODT!()(doc_matters);
       foreach (image; doc_matters.srcs.image_list) {
         auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image;
@@ -925,6 +926,7 @@ template outputODT() {
   void dirtree(I)(
     I   doc_matters,
   ) {
+    import doc_reform.io_out.paths_output;
     auto pth_odt = spinePathsODT!()(doc_matters);
     if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/
       if (!exists(pth_odt.meta_inf_dir("fs"))) {
diff --git a/src/doc_reform/io_out/paths_output.d b/src/doc_reform/io_out/paths_output.d
index 56cc40c..1f08702 100644
--- a/src/doc_reform/io_out/paths_output.d
+++ b/src/doc_reform/io_out/paths_output.d
@@ -426,6 +426,7 @@ template spinePathsEPUB() {
   }
 }
 template spinePathsODT() {
+  import std.conv;
   mixin spineRgxIn;
   static auto rgx = RgxI();
   auto spinePathsODT(M)(
@@ -442,8 +443,8 @@ template spinePathsODT() {
       }
       string dirtop(string type) {
         return (type == "zip")
-        ? "".chainPath("").array
-        : ((base_pth.chainPath(doc_matters.src.doc_uid_out)).asNormalizedPath).array;
+        ? "" // ".chainPath("").array
+        : ((base_pth.chainPath(doc_matters.src.doc_uid_out)).asNormalizedPath).array.to!string;
       }
       string mimetype(string type="fs") {
         assert(type == "zip" || "fs");
-- 
cgit v1.2.3