From 1dbbdec89acdb2ef12cdfc0572997c4c4652466b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 4 Dec 2017 01:54:58 -0500
Subject: 0.23.1 use output path specified if any

---
 org/output_xmls.org | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'org/output_xmls.org')

diff --git a/org/output_xmls.org b/org/output_xmls.org
index bcf8d8d..c73b42c 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -1474,15 +1474,12 @@ void scroll_write_output(M,C)(
   debug(asserts) {
     static assert(is(typeof(doc)    == string[]));
   }
-  string fn_src = doc_matters.source_filename;
-  auto src_path_info = doc_matters.src_path_info;
-  string lng = doc_matters.language;
-  auto pth_html = SiSUpathsHTML!()(src_path_info, lng);
+  auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.language);
   try {
     if (!exists(pth_html.base)) {
       pth_html.base.mkdirRecurse;
     }
-    auto f = File(pth_html.fn_scroll(fn_src), "w");
+    auto f = File(pth_html.fn_scroll(doc_matters.source_filename), "w");
     foreach (o; doc) {
       f.writeln(o);
     }
@@ -1490,7 +1487,7 @@ void scroll_write_output(M,C)(
   catch (ErrnoException ex) {
     // Handle error
   }
-  writeln(" ", doc_matters.environment.pwd,  "/", pth_html.fn_scroll(fn_src));
+  writeln(" ", pth_html.fn_scroll(doc_matters.source_filename));
 }
 #+END_SRC
 
@@ -1739,9 +1736,7 @@ void seg_write_output(M,D,E)(
   }
   mixin SiSUoutputRgxInit;
   auto rgx = Rgx();
-  auto src_path_info = doc_matters.src_path_info;
-  string lng = doc_matters.language;
-  auto pth_html = SiSUpathsHTML!()(src_path_info, lng);
+  auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.language);
   auto xhtml_format = outputXHTMLs();
   auto m = doc_matters.source_filename.matchFirst(rgx.src_fn);
   try {
@@ -1762,7 +1757,7 @@ void seg_write_output(M,D,E)(
   catch (ErrnoException ex) {
     // handle error
   }
-  writeln(" ", doc_matters.environment.pwd,  "/", pth_html.fn_seg(doc_matters.source_filename, "toc"));
+  writeln(" ", pth_html.fn_seg(doc_matters.source_filename, "toc"));
 }
 #+END_SRC
 
@@ -1774,7 +1769,7 @@ void css(M)(
   auto return ref M          doc_matters,
 ) {
   auto css = SiSUcss();
-  auto pth_html = SiSUpathsHTML!()(doc_matters.src_path_info, doc_matters.language);
+  auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.language);
   try {
     if (!exists(pth_html.css)) {
       (pth_html.css).mkdirRecurse;
@@ -1869,7 +1864,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
 #+BEGIN_SRC d
 string epub3_oebps_content(D,I,P)(D doc_abstraction, I doc_matters, P parts) {
   auto xhtml_format = outputXHTMLs();
-  auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.src_path_info, doc_matters.language);
+  auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.language);
   string uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters!
   string content = format(q"¶  <?xml version='1.0' encoding='utf-8'?>
 <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID">
@@ -2458,9 +2453,7 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
     static assert(is(typeof(oebps_toc_ncx)          == string));
     static assert(is(typeof(oebps_content_opf)      == string));
   }
-  auto src_path_info = doc_matters.src_path_info;
-  string lng = doc_matters.language;
-  auto pth_epub3 = SiSUpathsEPUB!()(src_path_info, lng);
+  auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.language);
   auto xhtml_format = outputXHTMLs();
   /+ zip file +/
   auto fn_epub = pth_epub3.epub_file(doc_matters.source_filename);
@@ -2632,7 +2625,7 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
   catch (ErrnoException ex) {
     // Handle error
   }
-  writeln(" ", doc_matters.environment.pwd,  "/", fn_epub);
+  writeln(" ", fn_epub);
 #+END_SRC
 
 ** zip debug, read zip  archive
-- 
cgit v1.2.3