aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sdp/output
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-12-01 11:36:01 -0500
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commit17b1e024c33bac309c36f439fe267a384548a8b8 (patch)
treeea88a9a3dc87f5c64f9d8b615adb169b5e5697d7 /src/sdp/output
parent0.21.0 paths, pod manifest source alternative (diff)
0.22.0 document matters & pod matters structsdoc-reform_v0.0.22
- better integrated, redundancy removed
Diffstat (limited to 'src/sdp/output')
-rw-r--r--src/sdp/output/epub3.d2
-rw-r--r--src/sdp/output/html.d4
-rw-r--r--src/sdp/output/paths_source.d8
-rw-r--r--src/sdp/output/source_sisupod.d2
-rw-r--r--src/sdp/output/sqlite.d2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d
index 78603b2..e31d114 100644
--- a/src/sdp/output/epub3.d
+++ b/src/sdp/output/epub3.d
@@ -765,7 +765,7 @@ template outputEPub3() {
catch (ErrnoException ex) {
// Handle error
}
- writeln(" ", doc_matters.environment["pwd"], "/", fn_epub);
+ writeln(" ", doc_matters.environment.pwd, "/", fn_epub);
debug(epub_archive) {
if (exists(fn_epub)) {
try {
diff --git a/src/sdp/output/html.d b/src/sdp/output/html.d
index b0b0405..a422a81 100644
--- a/src/sdp/output/html.d
+++ b/src/sdp/output/html.d
@@ -181,7 +181,7 @@ template outputHTML() {
catch (ErrnoException ex) {
// Handle error
}
- writeln(" ", doc_matters.environment["pwd"], "/", pth_html.fn_scroll(fn_src));
+ writeln(" ", doc_matters.environment.pwd, "/", pth_html.fn_scroll(fn_src));
}
void seg(D,I)(
auto return ref const D doc_abstraction,
@@ -440,7 +440,7 @@ template outputHTML() {
catch (ErrnoException ex) {
// handle error
}
- writeln(" ", doc_matters.environment["pwd"], "/", pth_html.fn_seg(doc_matters.source_filename, "toc"));
+ writeln(" ", doc_matters.environment.pwd, "/", pth_html.fn_seg(doc_matters.source_filename, "toc"));
}
void css(M)(
auto return ref M doc_matters,
diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d
index c22efe0..967a632 100644
--- a/src/sdp/output/paths_source.d
+++ b/src/sdp/output/paths_source.d
@@ -42,10 +42,10 @@ template PodManifest() {
return ManifestFile_();
}
}
-template PodManifestAndSrcFile() {
+template PodMatters() {
mixin SiSUrgxInit;
static auto rgx = Rgx();
- auto PodManifestAndSrcFile(O,E,P,F)(
+ auto PodMatters(O,E,P,F)(
O _opt_actions,
E _env,
P _pth = "",
@@ -53,7 +53,7 @@ template PodManifestAndSrcFile() {
char[][] _manifest_fn_list = [[]],
) {
auto _manifest = PodManifest!()(_pth);
- struct ManifestFilePlus_ {
+ struct ManifestMatters_ {
auto pwd() {
return _env["pwd"];
}
@@ -138,7 +138,7 @@ template PodManifestAndSrcFile() {
return _image_dirs;
}
}
- return ManifestFilePlus_();
+ return ManifestMatters_();
}
}
template ConfigFilePaths() {
diff --git a/src/sdp/output/source_sisupod.d b/src/sdp/output/source_sisupod.d
index 106c419..20eaf39 100644
--- a/src/sdp/output/source_sisupod.d
+++ b/src/sdp/output/source_sisupod.d
@@ -15,7 +15,7 @@ template SiSUpod() {
// static assert(is(typeof(doc_matters) == tuple));
}
mixin SiSUoutputRgxInit;
- string pwd = doc_matters.environment["pwd"];
+ string pwd = doc_matters.environment.pwd;
auto src_path_info = doc_matters.src_path_info;
auto pth_sisudoc_src = doc_matters.src_path_info;
auto pths_sisupod = SiSUpathsSisupods!()();
diff --git a/src/sdp/output/sqlite.d b/src/sdp/output/sqlite.d
index 591b002..ee44d8a 100644
--- a/src/sdp/output/sqlite.d
+++ b/src/sdp/output/sqlite.d
@@ -457,7 +457,7 @@ template SQLiteBuildTablesAndPopulate() {
auto ref I doc_matters,
) {
auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.src_path_info, doc_matters.language);
- auto db = Database(pth_sqlite.sqlite_file(doc_matters.environment["pwd"].baseName));
+ auto db = Database(pth_sqlite.sqlite_file(doc_matters.environment.pwd.baseName));
// auto db = Database(":memory:"); // open database in memory
if (doc_matters.opt_action.sqlite_create) {
if ((doc_matters.opt_action.verbose)) { writeln("sqlite create tables... "); }