aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--org/output_hub.org24
-rw-r--r--org/sdp.org30
-rw-r--r--src/sdp/output/hub.d24
-rwxr-xr-xsrc/sdp/sdp.d30
4 files changed, 56 insertions, 52 deletions
diff --git a/org/output_hub.org b/org/output_hub.org
index 9caf1a9..b90d637 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -143,15 +143,7 @@ if (doc_matters.opt.action.text) {
#+name: output_options
#+BEGIN_SRC d
-if (doc_matters.opt.action.html) {
- if ((doc_matters.opt.action.verbose)) {
- writeln("html scroll processing... ");
- }
- outputHTML!().scroll(doc_abstraction, doc_matters);
- if ((doc_matters.opt.action.verbose)
- && (doc_matters.opt.action.debug_do)) {
- writeln("html scroll done");
- }
+if (doc_matters.opt.action.html_seg) {
if ((doc_matters.opt.action.verbose)) {
writeln("html seg processing... ");
}
@@ -162,18 +154,8 @@ if (doc_matters.opt.action.html) {
}
outputHTML!().css(doc_matters);
outputHTML!().images_cp(doc_matters);
-} else if (doc_matters.opt.action.html_seg) {
- if ((doc_matters.opt.action.verbose)) {
- writeln("html seg processing... ");
- }
- outputHTML!().seg(doc_abstraction, doc_matters);
- if ((doc_matters.opt.action.verbose)
- && (doc_matters.opt.action.debug_do)) {
- writeln("html seg done");
- }
- outputHTML!().css(doc_matters);
- outputHTML!().images_cp(doc_matters);
-} else if (doc_matters.opt.action.html_scroll) {
+}
+if (doc_matters.opt.action.html_scroll) {
if ((doc_matters.opt.action.verbose)) {
writeln("html scroll processing... ");
}
diff --git a/org/sdp.org b/org/sdp.org
index 4144630..727b16a 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -345,13 +345,35 @@ struct OptActions {
return opts["epub"];
}
auto html() {
- return opts["html"];
+ bool _is;
+ if (
+ opts["html"]
+ || opts["html-seg"]
+ || opts["html-scroll"]
+ ) {
+ _is = true;
+ } else { _is = false; }
+ return _is;
}
auto html_seg() {
- return opts["html-seg"];
+ bool _is;
+ if (
+ opts["html"]
+ || opts["html-seg"]
+ ) {
+ _is = true;
+ } else { _is = false; }
+ return _is;
}
auto html_scroll() {
- return opts["html-scroll"];
+ bool _is;
+ if (
+ opts["html"]
+ || opts["html-scroll"]
+ ) {
+ _is = true;
+ } else { _is = false; }
+ return _is;
}
auto manifest() {
return opts["manifest"];
@@ -445,8 +467,6 @@ struct OptActions {
|| docbook
|| epub
|| html
- || html_seg
- || html_scroll
|| manifest
|| odt
|| pdf
diff --git a/src/sdp/output/hub.d b/src/sdp/output/hub.d
index b86d30d..b6caca9 100644
--- a/src/sdp/output/hub.d
+++ b/src/sdp/output/hub.d
@@ -75,15 +75,7 @@ template outputHub() {
writeln("text processing... ");
}
}
- if (doc_matters.opt.action.html) {
- if ((doc_matters.opt.action.verbose)) {
- writeln("html scroll processing... ");
- }
- outputHTML!().scroll(doc_abstraction, doc_matters);
- if ((doc_matters.opt.action.verbose)
- && (doc_matters.opt.action.debug_do)) {
- writeln("html scroll done");
- }
+ if (doc_matters.opt.action.html_seg) {
if ((doc_matters.opt.action.verbose)) {
writeln("html seg processing... ");
}
@@ -94,18 +86,8 @@ template outputHub() {
}
outputHTML!().css(doc_matters);
outputHTML!().images_cp(doc_matters);
- } else if (doc_matters.opt.action.html_seg) {
- if ((doc_matters.opt.action.verbose)) {
- writeln("html seg processing... ");
- }
- outputHTML!().seg(doc_abstraction, doc_matters);
- if ((doc_matters.opt.action.verbose)
- && (doc_matters.opt.action.debug_do)) {
- writeln("html seg done");
- }
- outputHTML!().css(doc_matters);
- outputHTML!().images_cp(doc_matters);
- } else if (doc_matters.opt.action.html_scroll) {
+ }
+ if (doc_matters.opt.action.html_scroll) {
if ((doc_matters.opt.action.verbose)) {
writeln("html scroll processing... ");
}
diff --git a/src/sdp/sdp.d b/src/sdp/sdp.d
index 8b8703f..0c2c271 100755
--- a/src/sdp/sdp.d
+++ b/src/sdp/sdp.d
@@ -167,13 +167,35 @@ void main(string[] args) {
return opts["epub"];
}
auto html() {
- return opts["html"];
+ bool _is;
+ if (
+ opts["html"]
+ || opts["html-seg"]
+ || opts["html-scroll"]
+ ) {
+ _is = true;
+ } else { _is = false; }
+ return _is;
}
auto html_seg() {
- return opts["html-seg"];
+ bool _is;
+ if (
+ opts["html"]
+ || opts["html-seg"]
+ ) {
+ _is = true;
+ } else { _is = false; }
+ return _is;
}
auto html_scroll() {
- return opts["html-scroll"];
+ bool _is;
+ if (
+ opts["html"]
+ || opts["html-scroll"]
+ ) {
+ _is = true;
+ } else { _is = false; }
+ return _is;
}
auto manifest() {
return opts["manifest"];
@@ -267,8 +289,6 @@ void main(string[] args) {
|| docbook
|| epub
|| html
- || html_seg
- || html_scroll
|| manifest
|| odt
|| pdf