aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform/output
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2019-07-09 18:25:00 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2019-10-17 19:07:20 -0400
commit703ddafbb14127db4b7b52bfada3d3d96e22754d (patch)
tree6ea5c66293da1e8e9579325e42411df820ad10be /src/doc_reform/output
parent0.7.4 sqlite related, also some xml paths (diff)
cosmetic
Diffstat (limited to 'src/doc_reform/output')
-rw-r--r--src/doc_reform/output/html.d4
-rw-r--r--src/doc_reform/output/latex.d4
-rw-r--r--src/doc_reform/output/paths_output.d5
-rw-r--r--src/doc_reform/output/rgx.d1
4 files changed, 7 insertions, 7 deletions
diff --git a/src/doc_reform/output/html.d b/src/doc_reform/output/html.d
index 396f4a0..820b9a7 100644
--- a/src/doc_reform/output/html.d
+++ b/src/doc_reform/output/html.d
@@ -532,7 +532,9 @@ template outputHTML() {
if (exists(fn_src_in)) {
fn_src_in.copy(fn_src_out);
} else {
- writeln("WARNING image not found: ", fn_src_in);
+ if (!(doc_matters.opt.action.quiet)) {
+ writeln("WARNING image not found: ", fn_src_in);
+ }
}
}
}
diff --git a/src/doc_reform/output/latex.d b/src/doc_reform/output/latex.d
index 586e9fb..88cc75c 100644
--- a/src/doc_reform/output/latex.d
+++ b/src/doc_reform/output/latex.d
@@ -1130,7 +1130,9 @@ string table(O,M)(
if (!exists(pth_latex.latex_path_stuff)) {
(pth_latex.latex_path_stuff).mkdirRecurse;
}
- writeln(pth_latex.latex_file_with_path);
+ if (!(doc_matters.opt.action.quiet)) {
+ writeln(pth_latex.latex_file_with_path);
+ }
auto f = File(pth_latex.latex_file_with_path, "w");
f.writeln(latex_content.head);
f.writeln(latex_content.content);
diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/output/paths_output.d
index 0ca9fa7..70b1614 100644
--- a/src/doc_reform/output/paths_output.d
+++ b/src/doc_reform/output/paths_output.d
@@ -299,9 +299,6 @@ template DocReformPathsEPUB() {
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;
}
string base_filename_epub(string fn_src) {
@@ -320,7 +317,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;
diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d
index 5ab71f9..e5689c1 100644
--- a/src/doc_reform/output/rgx.d
+++ b/src/doc_reform/output/rgx.d
@@ -20,7 +20,6 @@ static template DocReformOutputRgxInit() {
static src_pth_sst_or_ssm = ctRegex!(`^(?P<path>[/]?(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+[.](?P<extension>ss[tm]))$`);
static src_pth_pod_sst_or_ssm = ctRegex!(`^(?P<podpath>[/]?(?:[a-zA-Z0-9._-]+/)*)media/text/[a-z]{2}/(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`);
static src_pth_contents = ctRegex!(`^(?P<path>[/]?(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+)/pod[.]manifest$`);
- static src_pth_pod_root = ctRegex!(`^(?P<podroot>(?:[/]?(?:[a-zA-Z0-9._-]+/)*)(pod))$`);
static src_pth_zip = ctRegex!(`^(?P<path>[/]?(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+[.]zip)$`);
static src_pth_unzip_pod = ctRegex!(`^(?P<path>media/text/[a-z]{2}/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[im])$`);
static src_pth_types =