aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform
diff options
context:
space:
mode:
Diffstat (limited to 'src/doc_reform')
-rw-r--r--src/doc_reform/io_out/odt.d2
-rw-r--r--src/doc_reform/io_out/paths_output.d5
2 files changed, 5 insertions, 2 deletions
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");