From 1dbbdec89acdb2ef12cdfc0572997c4c4652466b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 4 Dec 2017 01:54:58 -0500 Subject: 0.23.1 use output path specified if any --- src/sdp/output/epub3.d | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/sdp/output/epub3.d') diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d index e31d114..2641784 100644 --- a/src/sdp/output/epub3.d +++ b/src/sdp/output/epub3.d @@ -31,7 +31,7 @@ template outputEPub3() { } 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"ΒΆ @@ -591,9 +591,7 @@ template outputEPub3() { 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); @@ -765,7 +763,7 @@ template outputEPub3() { catch (ErrnoException ex) { // Handle error } - writeln(" ", doc_matters.environment.pwd, "/", fn_epub); + writeln(" ", fn_epub); debug(epub_archive) { if (exists(fn_epub)) { try { -- cgit v1.2.3