From cd6c5db8ff3660b54a7f1295940770036cea54f4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 20 Apr 2021 20:50:11 -0400
Subject: spine options, pod uses source file structure
---
org/out_src_pod.org | 14 +++++++-------
org/output_hub.org | 4 +---
org/spine.org | 2 --
src/doc_reform/io_out/hub.d | 4 +---
src/doc_reform/io_out/source_pod.d | 14 +++++++-------
src/doc_reform/spine.d | 2 --
6 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/org/out_src_pod.org b/org/out_src_pod.org
index dade493..d738f17 100644
--- a/org/out_src_pod.org
+++ b/org/out_src_pod.org
@@ -116,7 +116,7 @@ if (!exists(pths_pod.pod_dir_())) {
// used both by pod zipped (& pod filesystem (unzipped) which makes its own recursive dirs)
pths_pod.pod_dir_().mkdirRecurse;
}
-if (doc_matters.opt.action.source) {
+if (doc_matters.opt.action.source_or_pod) {
if (!(doc_matters.opt.action.quiet)) {
writeln(" ", pths_pod.fn_pod_filelist(doc_matters.src.filename).filesystem_open_zpod);
}
@@ -172,7 +172,7 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
debug(io) {
writeln("(io debug) src out found: ", fn_src_in);
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
@@ -199,7 +199,7 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
debug(io) {
writeln("(io debug) src out found: ", fn_src_in);
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
@@ -248,7 +248,7 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
// writeln("language: ", _l);
// }
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
pod_filelist_yaml_string.writeln(_pm);
}
if (doc_matters.opt.action.pod) {
@@ -273,7 +273,7 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
filelist_src_out_pod_arr ~= fn_src_out_pod_zip_base;
filelist_src_zpod_arr ~= fn_src_out_inside_pod;
string _pod_to_markup_file = doc_matters.src.pod_name ~ "/" ~ "media/text/" ~ doc_matters.src.language ~ "/" ~ doc_matters.src.filename;
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
@@ -326,7 +326,7 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
string _pth_mkup_src_in = _path_to_pod ~ _podname ~ "/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
string _pth_mkup_src_out = "pod/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
if (exists(_pth_mkup_src_in)) {
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
auto fn_src_out_filesystem // you need to change language sources
= pths_pod.fn_doc_insert(
doc_matters.src.filename, // doc_matters.src.filename
@@ -364,7 +364,7 @@ auto fn_pod = pths_pod.pod_filename(doc_matters.src.filename).zpod;
debug(io) {
writeln("(io debug) src out found: ", fn_src_in);
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
diff --git a/org/output_hub.org b/org/output_hub.org
index f48f33f..8735dd9 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -97,9 +97,7 @@ import doc_reform.io_out,
#+NAME: output_scheduled_task_source_or_pod
#+BEGIN_SRC d
if (sched == outTask.source_or_pod) {
- if (doc_matters.opt.action.source) {
- msg.v("spine (doc reform) source processing... ");
- }
+ msg.v("spine (doc reform) source processing... ");
if (doc_matters.opt.action.pod) {
msg.v("spine (doc reform) source pod processing... ");
}
diff --git a/org/spine.org b/org/spine.org
index 59215b7..fd17741 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -811,11 +811,9 @@ struct OptActions {
|| latex
|| odt
|| manifest
- || pod
|| show_make
|| show_metadata
|| show_summary
- || source
|| source_or_pod
|| sqlite_discrete
|| sqlite_update
diff --git a/src/doc_reform/io_out/hub.d b/src/doc_reform/io_out/hub.d
index 5ece133..5b2d74b 100644
--- a/src/doc_reform/io_out/hub.d
+++ b/src/doc_reform/io_out/hub.d
@@ -71,9 +71,7 @@ template outputHub() {
void Scheduled(D,I)(int sched, D doc_abstraction, I doc_matters) {
auto msg = Msg!()(doc_matters);
if (sched == outTask.source_or_pod) {
- if (doc_matters.opt.action.source) {
- msg.v("spine (doc reform) source processing... ");
- }
+ msg.v("spine (doc reform) source processing... ");
if (doc_matters.opt.action.pod) {
msg.v("spine (doc reform) source pod processing... ");
}
diff --git a/src/doc_reform/io_out/source_pod.d b/src/doc_reform/io_out/source_pod.d
index c8a8e16..363051b 100644
--- a/src/doc_reform/io_out/source_pod.d
+++ b/src/doc_reform/io_out/source_pod.d
@@ -104,7 +104,7 @@ template spinePod() {
// used both by pod zipped (& pod filesystem (unzipped) which makes its own recursive dirs)
pths_pod.pod_dir_().mkdirRecurse;
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
if (!(doc_matters.opt.action.quiet)) {
writeln(" ", pths_pod.fn_pod_filelist(doc_matters.src.filename).filesystem_open_zpod);
}
@@ -154,7 +154,7 @@ template spinePod() {
debug(io) {
writeln("(io debug) src out found: ", fn_src_in);
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
@@ -181,7 +181,7 @@ template spinePod() {
debug(io) {
writeln("(io debug) src out found: ", fn_src_in);
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
@@ -230,7 +230,7 @@ template spinePod() {
// writeln("language: ", _l);
// }
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
pod_filelist_yaml_string.writeln(_pm);
}
if (doc_matters.opt.action.pod) {
@@ -255,7 +255,7 @@ template spinePod() {
filelist_src_out_pod_arr ~= fn_src_out_pod_zip_base;
filelist_src_zpod_arr ~= fn_src_out_inside_pod;
string _pod_to_markup_file = doc_matters.src.pod_name ~ "/" ~ "media/text/" ~ doc_matters.src.language ~ "/" ~ doc_matters.src.filename;
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
@@ -308,7 +308,7 @@ template spinePod() {
string _pth_mkup_src_in = _path_to_pod ~ _podname ~ "/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
string _pth_mkup_src_out = "pod/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
if (exists(_pth_mkup_src_in)) {
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
auto fn_src_out_filesystem // you need to change language sources
= pths_pod.fn_doc_insert(
doc_matters.src.filename, // doc_matters.src.filename
@@ -346,7 +346,7 @@ template spinePod() {
debug(io) {
writeln("(io debug) src out found: ", fn_src_in);
}
- if (doc_matters.opt.action.source) {
+ if (doc_matters.opt.action.source_or_pod) {
fn_src_in.copy(fn_src_out_filesystem);
}
if (doc_matters.opt.action.pod) {
diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d
index b62af46..d3deee7 100755
--- a/src/doc_reform/spine.d
+++ b/src/doc_reform/spine.d
@@ -535,11 +535,9 @@ string program_name = "spine";
|| latex
|| odt
|| manifest
- || pod
|| show_make
|| show_metadata
|| show_summary
- || source
|| source_or_pod
|| sqlite_discrete
|| sqlite_update
--
cgit v1.2.3