aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sisudoc/outputs
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2026-05-25 10:47:12 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2026-05-25 12:21:38 -0400
commit0c5e723742fb923bfa85e3ee47434b463f390f20 (patch)
treed2cab9dd062e67d7af9a8b67ed3c92cc46cc40d0 /src/sisudoc/outputs
parentseparate abstraction lib from output processing (diff)
ocda + outputs split: module/import + dub.json fixups
Modules and imports rewritten to sisudoc.ocda.* and sisudoc.outputs.*; dub.json excludedSourceFiles and the spine:abstraction sub-package sourcePaths collapsed to ./src/sisudoc/ocda. Verified: nix build .#spine-overlay-ldc clean. (assisted by Claude-Code)
Diffstat (limited to 'src/sisudoc/outputs')
-rw-r--r--src/sisudoc/outputs/conf/compile_time_info.d2
-rw-r--r--src/sisudoc/outputs/io_out/create_abstraction_db.d4
-rw-r--r--src/sisudoc/outputs/io_out/create_zip_file.d2
-rw-r--r--src/sisudoc/outputs/io_out/curate/metadoc_curate.d8
-rw-r--r--src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d8
-rw-r--r--src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d8
-rw-r--r--src/sisudoc/outputs/io_out/defaults.d2
-rw-r--r--src/sisudoc/outputs/io_out/epub3.d16
-rw-r--r--src/sisudoc/outputs/io_out/html.d22
-rw-r--r--src/sisudoc/outputs/io_out/html_snippet.d8
-rw-r--r--src/sisudoc/outputs/io_out/hub.d58
-rw-r--r--src/sisudoc/outputs/io_out/latex.d16
-rw-r--r--src/sisudoc/outputs/io_out/metadata.d8
-rw-r--r--src/sisudoc/outputs/io_out/odt.d34
-rw-r--r--src/sisudoc/outputs/io_out/package.d10
-rw-r--r--src/sisudoc/outputs/io_out/paths_output.d4
-rw-r--r--src/sisudoc/outputs/io_out/rgx.d2
-rw-r--r--src/sisudoc/outputs/io_out/rgx_latex.d2
-rw-r--r--src/sisudoc/outputs/io_out/rgx_xhtml.d2
-rw-r--r--src/sisudoc/outputs/io_out/skel.d6
-rw-r--r--src/sisudoc/outputs/io_out/source_pod.d16
-rw-r--r--src/sisudoc/outputs/io_out/sqlite.d8
-rw-r--r--src/sisudoc/outputs/io_out/text.d10
-rw-r--r--src/sisudoc/outputs/io_out/xmls.d16
-rw-r--r--src/sisudoc/outputs/io_out/xmls_css.d2
-rw-r--r--src/sisudoc/outputs/share/defaults.d2
26 files changed, 138 insertions, 138 deletions
diff --git a/src/sisudoc/outputs/conf/compile_time_info.d b/src/sisudoc/outputs/conf/compile_time_info.d
index e1ae3cf..d7b2d6c 100644
--- a/src/sisudoc/outputs/conf/compile_time_info.d
+++ b/src/sisudoc/outputs/conf/compile_time_info.d
@@ -50,7 +50,7 @@
/++
compile_time_info
+/
-module sisudoc.conf.compile_time_info;
+module sisudoc.outputs.conf.compile_time_info;
@safe:
template CompileTimeInfo() {
version(Windows) {
diff --git a/src/sisudoc/outputs/io_out/create_abstraction_db.d b/src/sisudoc/outputs/io_out/create_abstraction_db.d
index 20ca074..0b6b633 100644
--- a/src/sisudoc/outputs/io_out/create_abstraction_db.d
+++ b/src/sisudoc/outputs/io_out/create_abstraction_db.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.create_abstraction_db;
+module sisudoc.outputs.io_out.create_abstraction_db;
/+ ↓ write document abstraction as per-document sqlite3 database +/
template spineAbstractionDb() {
@@ -58,7 +58,7 @@ template spineAbstractionDb() {
import std.string;
import std.array;
import d2sqlite3;
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
void spineAbstractionDb(D)(D doc) {
auto doc_abstraction = doc.abstraction;
diff --git a/src/sisudoc/outputs/io_out/create_zip_file.d b/src/sisudoc/outputs/io_out/create_zip_file.d
index 4063ab5..d0ace54 100644
--- a/src/sisudoc/outputs/io_out/create_zip_file.d
+++ b/src/sisudoc/outputs/io_out/create_zip_file.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.create_zip_file;
+module sisudoc.outputs.io_out.create_zip_file;
@safe:
template createZipFile() {
import std.file;
diff --git a/src/sisudoc/outputs/io_out/curate/metadoc_curate.d b/src/sisudoc/outputs/io_out/curate/metadoc_curate.d
index 8e87167..21307f1 100644
--- a/src/sisudoc/outputs/io_out/curate/metadoc_curate.d
+++ b/src/sisudoc/outputs/io_out/curate/metadoc_curate.d
@@ -47,15 +47,15 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.curate.metadoc_curate;
+module sisudoc.outputs.io_out.curate.metadoc_curate;
@safe:
template spineMetaDocCurate() {
auto spineMetaDocCurate(T,H)(
T doc_matters,
H hvst,
) {
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
import std.array;
import std.exception;
import std.regex;
@@ -67,7 +67,7 @@ template spineMetaDocCurate() {
import std.conv : to;
mixin InternalMarkup;
static auto mkup = InlineMarkup();
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pth_html_abs = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
auto pth_html_rel = spineDocRootTreeHTML!()(doc_matters.src.language);
hvst.curate.title = doc_matters.conf_make_meta.meta.title_full;
diff --git a/src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d b/src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d
index 6a356e7..45b6d0b 100644
--- a/src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d
+++ b/src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.curate.metadoc_curate_authors;
+module sisudoc.outputs.io_out.curate.metadoc_curate_authors;
@safe:
import std.algorithm;
import std.array;
@@ -56,8 +56,8 @@ module sisudoc.io_out.curate.metadoc_curate_authors;
import std.stdio;
import std.string;
import std.conv : to;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
mixin spineCurateMetadata;
mixin InternalMarkup;
template spineMetaDocCuratesAuthors() {
@@ -509,7 +509,7 @@ string theme_light_1 = format(q"┃
</body>
</html>
┃") ~ "\n";
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
try {
auto f = File(out_pth.curate("authors.html"), "w");
diff --git a/src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d b/src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d
index 05643b9..99ec48d 100644
--- a/src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d
+++ b/src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.curate.metadoc_curate_topics;
+module sisudoc.outputs.io_out.curate.metadoc_curate_topics;
@safe:
import std.algorithm;
import std.array;
@@ -56,8 +56,8 @@ module sisudoc.io_out.curate.metadoc_curate_topics;
import std.stdio;
import std.string;
import std.conv : to;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
mixin spineCurateMetadata;
mixin InternalMarkup;
template spineMetaDocCuratesTopics() {
@@ -677,7 +677,7 @@ string theme_light_1 = format(q"┃
</body>
</html>
┃") ~ "\n";
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
try {
auto f = File(out_pth.curate("topics.html"), "w");
diff --git a/src/sisudoc/outputs/io_out/defaults.d b/src/sisudoc/outputs/io_out/defaults.d
index 290ca89..73a9af1 100644
--- a/src/sisudoc/outputs/io_out/defaults.d
+++ b/src/sisudoc/outputs/io_out/defaults.d
@@ -50,7 +50,7 @@
/++
default settings
+/
-module sisudoc.io_out.defaults;
+module sisudoc.outputs.io_out.defaults;
@safe:
template InternalMarkup() {
diff --git a/src/sisudoc/outputs/io_out/epub3.d b/src/sisudoc/outputs/io_out/epub3.d
index c715630..f3b4cd7 100644
--- a/src/sisudoc/outputs/io_out/epub3.d
+++ b/src/sisudoc/outputs/io_out/epub3.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.epub3;
+module sisudoc.outputs.io_out.epub3;
@safe:
template outputEPub3() {
import std.file;
@@ -55,12 +55,12 @@ template outputEPub3() {
import std.uri;
import std.zip;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_xhtml;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin InternalMarkup;
mixin outputXHTMLs;
static auto rgx = RgxO();
@@ -634,7 +634,7 @@ template outputEPub3() {
pth_epub3.base.mkdirRecurse;
}
if (!exists(pth_epub3.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_epub3.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
diff --git a/src/sisudoc/outputs/io_out/html.d b/src/sisudoc/outputs/io_out/html.d
index a294f30..efdedf8 100644
--- a/src/sisudoc/outputs/io_out/html.d
+++ b/src/sisudoc/outputs/io_out/html.d
@@ -47,20 +47,20 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.html;
+module sisudoc.outputs.io_out.html;
@safe:
template outputHTML() {
import std.file;
import std.outbuffer;
import std.uri;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out.rgx_xhtml;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin outputXHTMLs;
void scroll(D)(D doc) {
mixin spineRgxOut;
@@ -248,7 +248,7 @@ template outputHTML() {
}
}
if (!exists(pth_html.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -563,7 +563,7 @@ template outputHTML() {
f.writeln(css.html_scroll);
}
if (!exists(pth_html.css ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.css ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -599,7 +599,7 @@ template outputHTML() {
}
}
if (!exists(pth_html.image ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.image ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
diff --git a/src/sisudoc/outputs/io_out/html_snippet.d b/src/sisudoc/outputs/io_out/html_snippet.d
index d02cb28..f960cea 100644
--- a/src/sisudoc/outputs/io_out/html_snippet.d
+++ b/src/sisudoc/outputs/io_out/html_snippet.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.html_snippet;
+module sisudoc.outputs.io_out.html_snippet;
@safe:
template htmlSnippet() {
import std.file;
@@ -55,9 +55,9 @@ template htmlSnippet() {
import std.format;
import std.uri;
import std.conv : to;
- import sisudoc.io_out.rgx;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out.rgx_xhtml;
auto format_html_blank_page_guide_home()(
string css_style,
string home_url,
diff --git a/src/sisudoc/outputs/io_out/hub.d b/src/sisudoc/outputs/io_out/hub.d
index 6ca047a..0aab81d 100644
--- a/src/sisudoc/outputs/io_out/hub.d
+++ b/src/sisudoc/outputs/io_out/hub.d
@@ -51,14 +51,14 @@
output hub<BR>
check & generate output types requested
+/
-module sisudoc.io_out.hub;
+module sisudoc.outputs.io_out.hub;
@safe:
template outputHub() {
- import sisudoc.io_out,
- sisudoc.io_out.metadata,
- sisudoc.io_out.xmls,
- sisudoc.io_out.create_zip_file,
- sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.metadata;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.paths_output;
@system void outputHub(D)(D doc) {
mixin Msg;
auto msg = Msg!()(doc.matters);
@@ -68,14 +68,14 @@ template outputHub() {
if (sched == outTask.source_or_pod) {
msg.v("spine (doc reform) source processing... ");
if (doc.matters.opt.action.pod) { msg.v("spine (doc reform) source pod processing... "); }
- import sisudoc.io_out.source_pod;
+ import sisudoc.outputs.io_out.source_pod;
spinePod!()(doc.matters);
if (doc.matters.opt.action.source) { msg.vv("spine (doc reform) source done"); }
if (doc.matters.opt.action.pod) { msg.vv("spine (doc reform) source pod done"); }
}
if (sched == outTask.epub) {
msg.v("epub3 processing... ");
- import sisudoc.io_out.epub3;
+ import sisudoc.outputs.io_out.epub3;
doc.outputEPub3!();
msg.vv("epub3 done");
}
@@ -85,25 +85,25 @@ template outputHub() {
}
if (sched == outTask.html_scroll) {
msg.v("html scroll processing... ");
- import sisudoc.io_out.html;
+ import sisudoc.outputs.io_out.html;
outputHTML!().scroll(doc);
msg.vv("html scroll done");
}
if (sched == outTask.html_seg) {
msg.v("html seg processing... ");
- import sisudoc.io_out.html;
+ import sisudoc.outputs.io_out.html;
outputHTML!().seg(doc);
msg.vv("html seg done");
}
if (sched == outTask.html_stuff) {
- import sisudoc.io_out.html;
+ import sisudoc.outputs.io_out.html;
outputHTML!().css(doc.matters);
outputHTML!().images_cp(doc.matters);
msg.vv("html css & images done");
}
if (sched == outTask.latex) {
msg.v("latex processing... (available for downstream processing & pdf output");
- import sisudoc.io_out.latex;
+ import sisudoc.outputs.io_out.latex;
import std.file;
if ((isValidPath(doc.matters.output_path ~ "/latex/sty"))
&& (!(exists(doc.matters.output_path ~ "/latex/sty")))
@@ -120,25 +120,25 @@ template outputHub() {
}
if (sched == outTask.text) {
msg.v("text processing... ");
- import sisudoc.io_out.text;
+ import sisudoc.outputs.io_out.text;
outputText!()(doc.abstraction, doc.matters);
msg.vv("text done");
}
if (sched == outTask.odt) {
msg.v("odf:odt processing... ");
- import sisudoc.io_out.odt;
+ import sisudoc.outputs.io_out.odt;
outputODT!()(doc.abstraction, doc.matters);
msg.vv("odf:odt done");
}
if (sched == outTask.sqlite) {
msg.v("sqlite processing... ");
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
doc.SQLiteHubDiscreteBuildTablesAndPopulate!();
msg.vv("sqlite done");
}
if (sched == outTask.skel) {
msg.v("skel processing... ");
- import sisudoc.io_out.skel;
+ import sisudoc.outputs.io_out.skel;
outputSkel!()(doc.abstraction, doc.matters);
msg.vv("skel done");
}
@@ -156,12 +156,12 @@ template outputHub() {
}
if (doc.matters.opt.action.sqlite_update) {
msg.v("sqlite update processing...");
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
doc.SQLiteHubBuildTablesAndPopulate!();
msg.vv("sqlite update done");
} else if (doc.matters.opt.action.sqlite_delete) {
msg.v("sqlite delete processing...");
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
doc.SQLiteHubBuildTablesAndPopulate!();
msg.vv("sqlite delete done");
}
@@ -169,9 +169,9 @@ template outputHub() {
}
template outputHubInitialize() {
import std.file;
- import sisudoc.io_out,
- sisudoc.io_out.metadata,
- sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.metadata;
+ import sisudoc.outputs.io_out.paths_output;
string _bespoke_homepage = "./spine-bespoke-output/html/homepage.index.html";
@system void outputHubInitialize(O,I)(
O opt_action,
@@ -196,7 +196,7 @@ template outputHubInitialize() {
&& opt_action.output_dir_set.length > 0
&& !(isValidPath(opt_action.output_dir_set ~ "/latex/sty")))
) { // .sty need to be produced only once (if unchanged per output-dir of which there usually will be only one)
- import sisudoc.io_out.latex;
+ import sisudoc.outputs.io_out.latex;
outputLaTeXstyInit!()(
opt_action.output_dir_set,
opt_action.generated_by,
@@ -208,17 +208,17 @@ template outputHubInitialize() {
}
}
template outputHubOp() {
- import sisudoc.io_out,
- sisudoc.io_out.metadata,
- sisudoc.io_out.xmls,
- sisudoc.io_out.create_zip_file,
- sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.metadata;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.paths_output;
@system void outputHubOp(E,O,C)(E env, O opt_action, C config) {
if ((opt_action.sqlite_db_drop)) {
if ((opt_action.vox_gt_2)) {
writeln("sqlite drop db...");
}
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
SQLiteDbDrop!()(opt_action, config);
if ((opt_action.vox_gt_3)) {
writeln("sqlite drop db done");
@@ -229,7 +229,7 @@ template outputHubOp() {
auto pth_sqlite_db = spinePathsSQLite!()(opt_action.cgi_sqlite_search_filename, opt_action.output_dir_set);
writeln("sqlite create table...");
}
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
SQLiteTablesCreate!()(env, opt_action, config);
if ((opt_action.vox_gt_3)) {
writeln("sqlite create table done");
diff --git a/src/sisudoc/outputs/io_out/latex.d b/src/sisudoc/outputs/io_out/latex.d
index 8a1ae3e..8e7b37c 100644
--- a/src/sisudoc/outputs/io_out/latex.d
+++ b/src/sisudoc/outputs/io_out/latex.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.latex;
+module sisudoc.outputs.io_out.latex;
@safe:
template paperLaTeX() {
import std.format;
@@ -322,9 +322,9 @@ template outputLaTeX() {
import std.outbuffer;
import std.uri;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_latex;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_latex;
mixin spineRgxOut;
static auto rgx = RgxO();
mixin spineRgxLSC;
@@ -1378,7 +1378,7 @@ template outputLaTeX() {
}
}
if (!exists(pth_latex.latex_path_stuff ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_latex.latex_path_stuff ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -1392,7 +1392,7 @@ template outputLaTeX() {
}
// should be in latex init and done just once, doc_matters not passed there though
if (!exists(pth_latex.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_latex.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -1404,7 +1404,7 @@ template outputLaTeX() {
));
}
if (!exists(pth_latex.base_sty ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_latex.base_sty ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -1438,7 +1438,7 @@ template outputLaTeX() {
}
}
template outputLaTeXstyInit() {
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
auto paper = paperLaTeX;
void writeOutputLaTeXstyStatic(
string latex_sty,
diff --git a/src/sisudoc/outputs/io_out/metadata.d b/src/sisudoc/outputs/io_out/metadata.d
index 92b3bf9..f951dde 100644
--- a/src/sisudoc/outputs/io_out/metadata.d
+++ b/src/sisudoc/outputs/io_out/metadata.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.metadata;
+module sisudoc.outputs.io_out.metadata;
// @safe:
template outputMetadata() {
void outputMetadata(T)(T doc_matters) {
@@ -113,7 +113,7 @@ template outputMetadata() {
import std.digest.sha;
import std.file;
import std.format;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
mixin InternalMarkup;
char[] metadata_;
string theme_dark_0 = format(q"┃
@@ -378,7 +378,7 @@ string theme_light_1 = format(q"┃
}
}
if (!exists(pth_html.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -395,7 +395,7 @@ string theme_light_1 = format(q"┃
if (doc_matters.opt.action.vox_gt_1) { writeln(" ", pth_html.fn_scroll("metadata." ~ doc_matters.src.filename)); }
}
static auto mkup = InlineMarkup();
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
if (doc_matters.opt.action.debug_do) {
writeln(doc_matters.src.filename_base);
diff --git a/src/sisudoc/outputs/io_out/odt.d b/src/sisudoc/outputs/io_out/odt.d
index 7a85bfb..ed288cb 100644
--- a/src/sisudoc/outputs/io_out/odt.d
+++ b/src/sisudoc/outputs/io_out/odt.d
@@ -47,20 +47,20 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.odt;
+module sisudoc.outputs.io_out.odt;
@safe:
template formatODT() {
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_xhtml;
import std.file;
import std.outbuffer;
import std.uri;
import std.zip;
import std.conv : to;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin spineRgxOut;
mixin spineRgxXHTML;
struct formatODT {
@@ -642,17 +642,17 @@ template formatODT() {
}
}
template outputODT() {
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_xhtml;
import std.file;
import std.outbuffer;
import std.uri;
import std.zip;
import std.conv : to;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin InternalMarkup;
mixin spineRgxOut;
mixin spineRgxXHTML;
@@ -939,7 +939,7 @@ template outputODT() {
auto ref M doc_matters,
) {
{ /+ (copy odt images) +/
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pth_odt = spinePathsODT!()(doc_matters);
foreach (image; doc_matters.srcs.image_list) {
auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image;
@@ -979,7 +979,7 @@ template outputODT() {
void dirtree(I)(
I doc_matters,
) {
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pth_odt = spinePathsODT!()(doc_matters);
if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/
if (!exists(pth_odt.meta_inf_dir("fs"))) {
@@ -993,7 +993,7 @@ template outputODT() {
pth_odt.base_pth.mkdirRecurse;
}
if (!exists(pth_odt.base_pth ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_odt.base_pth ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -2098,7 +2098,7 @@ template outputODT() {
}
}
if (!exists(pth_odt.base_pth ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_odt.base_pth ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
diff --git a/src/sisudoc/outputs/io_out/package.d b/src/sisudoc/outputs/io_out/package.d
index e0512dc..489137f 100644
--- a/src/sisudoc/outputs/io_out/package.d
+++ b/src/sisudoc/outputs/io_out/package.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out;
+module sisudoc.outputs.io_out;
public import std.algorithm;
public import std.array;
public import std.container;
@@ -61,7 +61,7 @@ public import std.string;
public import std.typecons;
// public import std.uni;
public import std.utf;
-public import sisudoc.share.defaults;
-public import sisudoc.io_in.paths_source;
-public import sisudoc.io_out.defaults;
-public import sisudoc.io_out.paths_output;
+public import sisudoc.outputs.share.defaults;
+public import sisudoc.ocda.io_in.paths_source;
+public import sisudoc.outputs.io_out.defaults;
+public import sisudoc.outputs.io_out.paths_output;
diff --git a/src/sisudoc/outputs/io_out/paths_output.d b/src/sisudoc/outputs/io_out/paths_output.d
index a9d0928..3d8323d 100644
--- a/src/sisudoc/outputs/io_out/paths_output.d
+++ b/src/sisudoc/outputs/io_out/paths_output.d
@@ -50,13 +50,13 @@
/++
default settings
+/
-module sisudoc.io_out.paths_output;
+module sisudoc.outputs.io_out.paths_output;
@safe:
import std.array;
import std.path;
import std.regex;
import std.stdio;
-import sisudoc.meta.rgx_files;
+import sisudoc.ocda.meta.rgx_files;
template spineOutPaths() {
auto spineOutPaths()(
string output_pth_root,
diff --git a/src/sisudoc/outputs/io_out/rgx.d b/src/sisudoc/outputs/io_out/rgx.d
index 384222c..c915076 100644
--- a/src/sisudoc/outputs/io_out/rgx.d
+++ b/src/sisudoc/outputs/io_out/rgx.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.io_out.rgx;
+module sisudoc.outputs.io_out.rgx;
@safe:
static template spineRgxOut() {
static struct RgxO {
diff --git a/src/sisudoc/outputs/io_out/rgx_latex.d b/src/sisudoc/outputs/io_out/rgx_latex.d
index 1ae6147..e40a28e 100644
--- a/src/sisudoc/outputs/io_out/rgx_latex.d
+++ b/src/sisudoc/outputs/io_out/rgx_latex.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.io_out.rgx_latex;
+module sisudoc.outputs.io_out.rgx_latex;
@safe:
static template spineRgxLSC() {
static struct RgxLSC {
diff --git a/src/sisudoc/outputs/io_out/rgx_xhtml.d b/src/sisudoc/outputs/io_out/rgx_xhtml.d
index b1b1004..a2bf192 100644
--- a/src/sisudoc/outputs/io_out/rgx_xhtml.d
+++ b/src/sisudoc/outputs/io_out/rgx_xhtml.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.io_out.rgx_xhtml;
+module sisudoc.outputs.io_out.rgx_xhtml;
@safe:
static template spineRgxXHTML() {
static struct RgxXHTML {
diff --git a/src/sisudoc/outputs/io_out/skel.d b/src/sisudoc/outputs/io_out/skel.d
index 92e0d52..5331da3 100644
--- a/src/sisudoc/outputs/io_out/skel.d
+++ b/src/sisudoc/outputs/io_out/skel.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.skel;
+module sisudoc.outputs.io_out.skel;
@safe:
template outputSkel() {
template munge() {
@@ -187,7 +187,7 @@ template outputSkel() {
}
template theDocument() {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
// static auto rgx = RgxO();
string skel_head(M)(
M doc_matters,
@@ -232,7 +232,7 @@ template outputSkel() {
M doc_matters,
) {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
void skel_out(D,M)(
const D doc_abstraction,
M doc_matters,
diff --git a/src/sisudoc/outputs/io_out/source_pod.d b/src/sisudoc/outputs/io_out/source_pod.d
index b015a04..f6c73d6 100644
--- a/src/sisudoc/outputs/io_out/source_pod.d
+++ b/src/sisudoc/outputs/io_out/source_pod.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.source_pod;
+module sisudoc.outputs.io_out.source_pod;
@system: // is not @safe: use: @system: or @trusted:
template spinePod() {
import std.digest.sha;
@@ -55,10 +55,10 @@ template spinePod() {
import std.outbuffer;
import std.zip;
import std.conv : to;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
void spinePod(T)(T doc_matters) {
debug(asserts) {
// static assert(is(typeof(doc_matters) == tuple));
@@ -136,7 +136,7 @@ template spinePod() {
}
}
if (!exists(pths_pod.pod_dir_() ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pths_pod.pod_dir_() ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -196,7 +196,7 @@ template spinePod() {
} { // bundle abstraction .ssp file (only for --pod2)
if (doc_matters.opt.action.pod2) {
if (doc_matters.src.language == doc_matters.pod.manifest_list_of_languages[$-1]) { // wait until all language versions of .ssp generated
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
/+ doc_uid_out for any language follows the same pattern, differing
only in the trailing ".{lng}". Strip the current language to
reuse the base across all languages. +/
@@ -485,7 +485,7 @@ template spinePod() {
}
}
void zipArchiveDigest(M,F,D)(M doc_matters, F fn_pod, D _digests) {
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pths_pod = spinePathsPods!()(doc_matters);
char[] _zip_digest;
try {
diff --git a/src/sisudoc/outputs/io_out/sqlite.d b/src/sisudoc/outputs/io_out/sqlite.d
index 4ce5e0d..2b0b6d5 100644
--- a/src/sisudoc/outputs/io_out/sqlite.d
+++ b/src/sisudoc/outputs/io_out/sqlite.d
@@ -47,10 +47,10 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.sqlite;
-import sisudoc.io_out;
-import sisudoc.io_out.rgx;
-import sisudoc.io_out.rgx_xhtml;
+module sisudoc.outputs.io_out.sqlite;
+import sisudoc.outputs.io_out;
+import sisudoc.outputs.io_out.rgx;
+import sisudoc.outputs.io_out.rgx_xhtml;
import std.file;
import std.uri;
// import std.digest.sha;
diff --git a/src/sisudoc/outputs/io_out/text.d b/src/sisudoc/outputs/io_out/text.d
index 7c4315a..89e85d9 100644
--- a/src/sisudoc/outputs/io_out/text.d
+++ b/src/sisudoc/outputs/io_out/text.d
@@ -47,12 +47,12 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.text;
+module sisudoc.outputs.io_out.text;
@safe:
template outputText() {
template munge() {
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
import std.stdio;
import std.conv;
import std.conv : to;
@@ -352,7 +352,7 @@ template outputText() {
}
template theDocument() {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
string text_head(M)(
M doc_matters,
) {
@@ -434,7 +434,7 @@ template outputText() {
M doc_matters,
) {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
void text_out(D,M)(
const D doc_abstraction,
M doc_matters,
diff --git a/src/sisudoc/outputs/io_out/xmls.d b/src/sisudoc/outputs/io_out/xmls.d
index 7b503dd..d63deba 100644
--- a/src/sisudoc/outputs/io_out/xmls.d
+++ b/src/sisudoc/outputs/io_out/xmls.d
@@ -47,20 +47,20 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.xmls;
+module sisudoc.outputs.io_out.xmls;
@safe:
template outputXHTMLs() {
import std.file;
import std.outbuffer;
import std.uri;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out.rgx_xhtml;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin spineRgxOut;
mixin spineRgxXHTML;
struct outputXHTMLs {
diff --git a/src/sisudoc/outputs/io_out/xmls_css.d b/src/sisudoc/outputs/io_out/xmls_css.d
index cdada08..655b236 100644
--- a/src/sisudoc/outputs/io_out/xmls_css.d
+++ b/src/sisudoc/outputs/io_out/xmls_css.d
@@ -50,7 +50,7 @@
/++
default css settings
+/
-module sisudoc.io_out.xmls_css;
+module sisudoc.outputs.io_out.xmls_css;
@safe:
template spineCss() {
import std.format;
diff --git a/src/sisudoc/outputs/share/defaults.d b/src/sisudoc/outputs/share/defaults.d
index 4972992..d61a038 100644
--- a/src/sisudoc/outputs/share/defaults.d
+++ b/src/sisudoc/outputs/share/defaults.d
@@ -50,7 +50,7 @@
/++
shared default settings
+/
-module sisudoc.share.defaults;
+module sisudoc.outputs.share.defaults;
@safe:
template Msg() {
import std.stdio;