From 703ddafbb14127db4b7b52bfada3d3d96e22754d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 9 Jul 2019 18:25:00 -0400 Subject: cosmetic --- org/default_paths.org | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'org/default_paths.org') diff --git a/org/default_paths.org b/org/default_paths.org index b1d6980..abc1d51 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -69,7 +69,7 @@ template PodManifest() { _manifest_path = m.captures["podpath"]; } } else { - writeln("WARNING, issue with manifest_path: ", _pth); // remove? + writeln("WARNING, issue with manifest_path: ", _pth); _manifest_path = null; // _manifest_path = ""; } return _manifest_path; @@ -158,11 +158,6 @@ template PathMatters() { } auto collection_root() { auto _collection_root = asNormalizedPath(chainPath(_manifest.pod_manifest_path, "..")).array; - if (auto m = (_collection_root).match(rgx.src_pth_pod_root)) { - // consider testing for last dir in path name being pod, and giving warning if not - } else { - writeln("WARNING, collection_root not named \"pod\""); - } return _collection_root; } string manifest_filename() { @@ -1269,9 +1264,6 @@ template DocReformPathsEPUB() { string base() { return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array; } - string base_filename(string fn_src) { - return fn_src.baseName.stripExtension ~ "." ~ lng; - } string base_filename(string fn_src) { return fn_src.baseName.stripExtension; } @@ -1291,7 +1283,7 @@ template DocReformPathsEPUB() { return asNormalizedPath(doc_oebps.chainPath("image")).array; } string epub_file(string fn_src) { - return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ ".epub")).array; + return asNormalizedPath(base.chainPath(base_filename_epub(fn_src) ~ ".epub")).array; } string dirtop() { return "".chainPath("").array; -- cgit v1.2.3