diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2026-05-25 10:47:12 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2026-05-25 12:21:38 -0400 |
| commit | 0c5e723742fb923bfa85e3ee47434b463f390f20 (patch) | |
| tree | d2cab9dd062e67d7af9a8b67ed3c92cc46cc40d0 /src | |
| parent | separate 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')
50 files changed, 271 insertions, 271 deletions
diff --git a/src/sisudoc/ocda/abstraction/package.d b/src/sisudoc/ocda/abstraction/package.d index 645a514..4b34b3a 100644 --- a/src/sisudoc/ocda/abstraction/package.d +++ b/src/sisudoc/ocda/abstraction/package.d @@ -48,20 +48,20 @@ +/ /++ - sisudoc.abstraction - public surface of the document-abstraction + sisudoc.ocda.abstraction - public surface of the document-abstraction library. Pipeline position: markup -> abstraction -> output. This package is the abstraction stage. The output stage lives in - sisudoc.io_out and consumes the values produced here. + sisudoc.outputs.io_out and consumes the values produced here. Entry points: - - spineAbstraction!() (from sisudoc.meta.metadoc) - A-layer: + - spineAbstraction!() (from sisudoc.ocda.meta.metadoc) - A-layer: builds the in-memory document object model from a manifest (pod path, .sst path). Reads the document body, parses YAML headers, returns a struct with .abstraction (the object model) and .matters (the conf/meta/src wrapper). - - docAbstraction!() (from sisudoc.meta.metadoc_from_src) - + - docAbstraction!() (from sisudoc.ocda.meta.metadoc_from_src) - B-layer: builds the abstraction from already-loaded body text plus a pre-built ConfComposite. Pure, no file I/O. @@ -70,17 +70,17 @@ directly. Serialisation: - - sisudoc.abstraction.ssp - PEG-parsable text serialisation of + - sisudoc.ocda.abstraction.ssp - PEG-parsable text serialisation of the abstraction (the .ssp format). See specs/doc-abstraction- format/ for the format reference. This file is a re-export-only surface. No logic lives here; it - exists so external consumers can `import sisudoc.abstraction;` and + exists so external consumers can `import sisudoc.ocda.abstraction;` and reach the entry points without depending on spine's directory layout. +/ -module sisudoc.abstraction; +module sisudoc.ocda.abstraction; @safe: -public import sisudoc.meta.metadoc; // spineAbstraction (A-layer) -public import sisudoc.meta.metadoc_from_src; // docAbstraction (B-layer) -public import sisudoc.abstraction.ssp; // spineAbstractionTxt (.ssp) +public import sisudoc.ocda.meta.metadoc; // spineAbstraction (A-layer) +public import sisudoc.ocda.meta.metadoc_from_src; // docAbstraction (B-layer) +public import sisudoc.ocda.abstraction.ssp; // spineAbstractionTxt (.ssp) diff --git a/src/sisudoc/ocda/abstraction/ssp.d b/src/sisudoc/ocda/abstraction/ssp.d index 6eecef0..cb3747b 100644 --- a/src/sisudoc/ocda/abstraction/ssp.d +++ b/src/sisudoc/ocda/abstraction/ssp.d @@ -47,7 +47,7 @@ [https://git.sisudoc.org/] +/ -module sisudoc.abstraction.ssp; +module sisudoc.ocda.abstraction.ssp; @safe: /+ ↓ write document abstraction as human-readable .ssp text file +/ diff --git a/src/sisudoc/ocda/io_in/paths_source.d b/src/sisudoc/ocda/io_in/paths_source.d index 41353ed..9cacdf0 100644 --- a/src/sisudoc/ocda/io_in/paths_source.d +++ b/src/sisudoc/ocda/io_in/paths_source.d @@ -52,7 +52,7 @@ - read config files<BR> meta_config_files.d +/ -module sisudoc.io_in.paths_source; +module sisudoc.ocda.io_in.paths_source; @safe: import std.array; import std.file; @@ -60,8 +60,8 @@ import std.path; import std.regex; import std.stdio; import std.conv : to; -import sisudoc.meta.defaults; -import sisudoc.meta.rgx_files; +import sisudoc.ocda.meta.defaults; +import sisudoc.ocda.meta.rgx_files; template PodManifest() { mixin spineRgxFiles; static auto rgx_files = RgxFiles(); diff --git a/src/sisudoc/ocda/io_in/read_config_files.d b/src/sisudoc/ocda/io_in/read_config_files.d index d3a3f45..849705a 100644 --- a/src/sisudoc/ocda/io_in/read_config_files.d +++ b/src/sisudoc/ocda/io_in/read_config_files.d @@ -52,14 +52,14 @@ - read config files<BR> meta_config_files.d +/ -module sisudoc.io_in.read_config_files; +module sisudoc.ocda.io_in.read_config_files; @safe: import std.file; import std.path; -import sisudoc.meta; -import sisudoc.io_in.paths_source; -import sisudoc.meta.rgx_files; -import sisudoc.meta.rgx; +import sisudoc.ocda.meta; +import sisudoc.ocda.io_in.paths_source; +import sisudoc.ocda.meta.rgx_files; +import sisudoc.ocda.meta.rgx; template readConfigSite() { @system final auto readConfigSite(Cf,O,Cfg)(Cf _conf_file_details, O _opt_action, Cfg _cfg) { mixin spineRgxIn; @@ -190,10 +190,10 @@ webserv: static template readConfigDoc() { import std.file; import std.path; - import sisudoc.meta; - import sisudoc.io_in.paths_source; - import sisudoc.meta.rgx_files; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta; + import sisudoc.ocda.io_in.paths_source; + import sisudoc.ocda.meta.rgx_files; + import sisudoc.ocda.meta.rgx; @system final auto readConfigDoc(M,E)(M _manifested, E _env) { mixin spineRgxIn; static auto rgx = RgxI(); @@ -244,10 +244,10 @@ static template readConfigDoc() { static template configReadSiteYAML() { import std.file; import std.path; - import sisudoc.meta; - import sisudoc.io_in.paths_source; - import sisudoc.meta.rgx_files; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta; + import sisudoc.ocda.io_in.paths_source; + import sisudoc.ocda.meta.rgx_files; + import sisudoc.ocda.meta.rgx; final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) { string _configuration = configReadInSiteYAML!()(_manifested, _env); auto _conf_file_details = configFilePaths!()(_manifested, _env); @@ -259,8 +259,8 @@ static template configReadSiteYAML() { static template configReadDocYAML() { import std.file; import std.path; - import sisudoc.meta; - import sisudoc.io_in.paths_source; + import sisudoc.ocda.meta; + import sisudoc.ocda.io_in.paths_source; final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) { string _configuration = configReadInDocYAML!()(_manifested, _env); auto _conf_file_details = configFilePaths!()(_manifested, _env); diff --git a/src/sisudoc/ocda/io_in/read_source_files.d b/src/sisudoc/ocda/io_in/read_source_files.d index 31cbd37..720ee63 100644 --- a/src/sisudoc/ocda/io_in/read_source_files.d +++ b/src/sisudoc/ocda/io_in/read_source_files.d @@ -52,16 +52,16 @@ - open markup files<BR> - if master file scan for addional files to import/insert +/ -module sisudoc.io_in.read_source_files; +module sisudoc.ocda.io_in.read_source_files; @safe: template spineRawMarkupContent() { import std.digest.sha; import std.file; import std.path; - import sisudoc.meta; - import sisudoc.io_in.paths_source; - import sisudoc.meta.rgx_files; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta; + import sisudoc.ocda.io_in.paths_source; + import sisudoc.ocda.meta.rgx_files; + import sisudoc.ocda.meta.rgx; mixin spineRgxIn; static auto rgx = RgxI(); mixin spineRgxFiles; diff --git a/src/sisudoc/ocda/io_in/read_zip_pod.d b/src/sisudoc/ocda/io_in/read_zip_pod.d index d228f4e..322382d 100644 --- a/src/sisudoc/ocda/io_in/read_zip_pod.d +++ b/src/sisudoc/ocda/io_in/read_zip_pod.d @@ -52,7 +52,7 @@ - extract pod zip archives to temp directory for processing<BR> - validate zip entries for security (path traversal, size limits) +/ -module sisudoc.io_in.read_zip_pod; +module sisudoc.ocda.io_in.read_zip_pod; @safe: template spineExtractZipPod() { import std.algorithm : canFind; diff --git a/src/sisudoc/ocda/meta/conf_make_meta_json.d b/src/sisudoc/ocda/meta/conf_make_meta_json.d index c996b12..19ae4ba 100644 --- a/src/sisudoc/ocda/meta/conf_make_meta_json.d +++ b/src/sisudoc/ocda/meta/conf_make_meta_json.d @@ -51,7 +51,7 @@ json headers<BR> extract json header return json +/ -module sisudoc.meta.conf_make_meta_json; +module sisudoc.ocda.meta.conf_make_meta_json; @safe: static template contentJSONtoSpineStruct() { import std.algorithm; @@ -63,10 +63,10 @@ static template contentJSONtoSpineStruct() { import std.typecons; import std.utf; import std.conv : to; - import sisudoc.meta.conf_make_meta_structs; - import sisudoc.meta.conf_make_meta_json; - import sisudoc.meta.defaults; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.conf_make_meta_structs; + import sisudoc.ocda.meta.conf_make_meta_json; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx; ConfComposite _struct_composite; auto contentJSONtoSpineStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) { mixin spineRgxIn; diff --git a/src/sisudoc/ocda/meta/conf_make_meta_structs.d b/src/sisudoc/ocda/meta/conf_make_meta_structs.d index 6bfd8fb..e442f9a 100644 --- a/src/sisudoc/ocda/meta/conf_make_meta_structs.d +++ b/src/sisudoc/ocda/meta/conf_make_meta_structs.d @@ -47,7 +47,7 @@ [https://git.sisudoc.org/] +/ -module sisudoc.meta.conf_make_meta_structs; +module sisudoc.ocda.meta.conf_make_meta_structs; @safe: import std.exception; import std.json; @@ -58,9 +58,9 @@ import std.string; import std.typecons; import std.utf; import std.conv : to; -import sisudoc.meta.defaults; -import sisudoc.meta.rgx_yaml; -import sisudoc.meta.rgx; +import sisudoc.ocda.meta.defaults; +import sisudoc.ocda.meta.rgx_yaml; +import sisudoc.ocda.meta.rgx; mixin spineRgxIn; static auto rgx = RgxI(); mixin spineRgxYamlTags; diff --git a/src/sisudoc/ocda/meta/conf_make_meta_yaml.d b/src/sisudoc/ocda/meta/conf_make_meta_yaml.d index f4ee7d9..e73a843 100644 --- a/src/sisudoc/ocda/meta/conf_make_meta_yaml.d +++ b/src/sisudoc/ocda/meta/conf_make_meta_yaml.d @@ -51,7 +51,7 @@ yaml headers<BR> extract yaml header return struct +/ -module sisudoc.meta.conf_make_meta_yaml; +module sisudoc.ocda.meta.conf_make_meta_yaml; @safe: template contentYAMLtoSpineStruct() { import std.algorithm; @@ -64,10 +64,10 @@ template contentYAMLtoSpineStruct() { import std.typecons; import std.utf; import std.conv : to; - import sisudoc.meta.conf_make_meta_structs; - import sisudoc.meta.defaults; - import sisudoc.meta.rgx_yaml; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.conf_make_meta_structs; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx_yaml; + import sisudoc.ocda.meta.rgx; ConfComposite _struct_composite; @system ConfComposite contentYAMLtoSpineStruct(C,Y,M,O,Cfg)( C _struct_composite, @@ -894,8 +894,8 @@ template contentYAMLtoSpineStruct() { } template configParseYAMLreturnSpineStruct() { import dyaml; - import sisudoc.meta.conf_make_meta_structs; - import sisudoc.meta.conf_make_meta_json; + import sisudoc.ocda.meta.conf_make_meta_structs; + import sisudoc.ocda.meta.conf_make_meta_json; mixin contentYAMLtoSpineStruct; @system ConfComposite configParseYAMLreturnSpineStruct(T,M,O,Cfg)( T _document_struct, @@ -933,10 +933,10 @@ template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() { import std.utf; import std.conv : to; import dyaml; - import sisudoc.meta.conf_make_meta_structs; - import sisudoc.meta.conf_make_meta_json; - import sisudoc.meta.rgx_yaml; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.conf_make_meta_structs; + import sisudoc.ocda.meta.conf_make_meta_json; + import sisudoc.ocda.meta.rgx_yaml; + import sisudoc.ocda.meta.rgx; mixin spineRgxIn; mixin contentJSONtoSpineStruct; static auto rgx = RgxI(); diff --git a/src/sisudoc/ocda/meta/defaults.d b/src/sisudoc/ocda/meta/defaults.d index 53a791e..91df996 100644 --- a/src/sisudoc/ocda/meta/defaults.d +++ b/src/sisudoc/ocda/meta/defaults.d @@ -50,7 +50,7 @@ /++ default settings +/ -module sisudoc.meta.defaults; +module sisudoc.ocda.meta.defaults; @safe: template spineNode() { static string[string] node_metadata_heading_str() { diff --git a/src/sisudoc/ocda/meta/doc_debugs.d b/src/sisudoc/ocda/meta/doc_debugs.d index 40a0af5..7ff57d7 100644 --- a/src/sisudoc/ocda/meta/doc_debugs.d +++ b/src/sisudoc/ocda/meta/doc_debugs.d @@ -50,10 +50,10 @@ /++ output debugs +/ -module sisudoc.meta.doc_debugs; +module sisudoc.ocda.meta.doc_debugs; template spineDebugs() { - import sisudoc.meta.defaults; - import sisudoc.meta.rgx_files; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx_files; import std.algorithm; import std.array; import std.container; diff --git a/src/sisudoc/ocda/meta/metadoc.d b/src/sisudoc/ocda/meta/metadoc.d index 421ff78..624761c 100644 --- a/src/sisudoc/ocda/meta/metadoc.d +++ b/src/sisudoc/ocda/meta/metadoc.d @@ -47,20 +47,20 @@ [https://git.sisudoc.org/] +/ -module sisudoc.meta.metadoc; +module sisudoc.ocda.meta.metadoc; @safe: template spineAbstraction() { import std.datetime; import std.digest.crc; import std.digest.sha; - import sisudoc.meta; - import sisudoc.meta.metadoc_from_src; - import sisudoc.meta.conf_make_meta_structs; - import sisudoc.meta.conf_make_meta_json; - import sisudoc.meta.defaults; - import sisudoc.io_in.paths_source; - import sisudoc.io_in.read_config_files; - import sisudoc.io_in.read_source_files; + import sisudoc.ocda.meta; + import sisudoc.ocda.meta.metadoc_from_src; + import sisudoc.ocda.meta.conf_make_meta_structs; + import sisudoc.ocda.meta.conf_make_meta_json; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.io_in.paths_source; + import sisudoc.ocda.io_in.read_config_files; + import sisudoc.ocda.io_in.read_source_files; mixin spineBiblio; enum makeMeta { make, meta } enum docAbst { doc_abstract_obj, doc_has } @@ -74,7 +74,7 @@ template spineAbstraction() { ){ { /+ document config/make file +/ auto _config_document_struct = readConfigDoc!()(_manifest, _env); - import sisudoc.meta.conf_make_meta_yaml; + import sisudoc.ocda.meta.conf_make_meta_yaml; _make_and_meta_struct = _config_document_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifest, _opt_action, _cfg); } /+ ↓ read file (filename with path) +/ @@ -103,7 +103,7 @@ template spineAbstraction() { ) { writeln("step2 commence → (read document header (yaml) return struct) [", _manifest.src.filename, "]"); } - import sisudoc.meta.conf_make_meta_yaml; + import sisudoc.ocda.meta.conf_make_meta_yaml; _make_and_meta_struct = docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct!()( _header_body_insertfilelist_imagelist.header_raw, diff --git a/src/sisudoc/ocda/meta/metadoc_from_src.d b/src/sisudoc/ocda/meta/metadoc_from_src.d index 4967c1f..bc00c49 100644 --- a/src/sisudoc/ocda/meta/metadoc_from_src.d +++ b/src/sisudoc/ocda/meta/metadoc_from_src.d @@ -50,7 +50,7 @@ // document abstraction: // abstraction of sisu markup for downstream processing // metadoc_from_src.d -module sisudoc.meta.metadoc_from_src; +module sisudoc.ocda.meta.metadoc_from_src; @safe: template docAbstraction() { // ↓ abstraction imports @@ -60,12 +60,12 @@ template docAbstraction() { import std.file; import std.json; import std.path; - import sisudoc.meta; - import sisudoc.meta.defaults; - import sisudoc.meta.rgx; - import sisudoc.meta.metadoc_object_setter; - import sisudoc.meta.rgx; - public import sisudoc.meta.metadoc_from_src_functions; + import sisudoc.ocda.meta; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx; + import sisudoc.ocda.meta.metadoc_object_setter; + import sisudoc.ocda.meta.rgx; + public import sisudoc.ocda.meta.metadoc_from_src_functions; mixin docAbstractionFunctions; @system auto docAbstraction(CMM,Opt,Mf) ( char[][] markup_sourcefile_content, diff --git a/src/sisudoc/ocda/meta/metadoc_from_src_functions.d b/src/sisudoc/ocda/meta/metadoc_from_src_functions.d index bb3cd4e..f5c9bec 100644 --- a/src/sisudoc/ocda/meta/metadoc_from_src_functions.d +++ b/src/sisudoc/ocda/meta/metadoc_from_src_functions.d @@ -50,7 +50,7 @@ // document abstraction: // abstraction of sisu markup for downstream processing // metadoc_from_src.d -module sisudoc.meta.metadoc_from_src_functions; +module sisudoc.ocda.meta.metadoc_from_src_functions; @safe: template docAbstractionFunctions() { // ↓ abstraction imports diff --git a/src/sisudoc/ocda/meta/metadoc_object_setter.d b/src/sisudoc/ocda/meta/metadoc_object_setter.d index 018c51b..c5c8b1b 100644 --- a/src/sisudoc/ocda/meta/metadoc_object_setter.d +++ b/src/sisudoc/ocda/meta/metadoc_object_setter.d @@ -52,7 +52,7 @@ setting of sisu objects for downstream processing metadoc_object_setter.d +/ -module sisudoc.meta.metadoc_object_setter; +module sisudoc.ocda.meta.metadoc_object_setter; @safe: template ObjectSetter() { /+ structs +/ diff --git a/src/sisudoc/ocda/meta/metadoc_show_config.d b/src/sisudoc/ocda/meta/metadoc_show_config.d index c4be08a..771b916 100644 --- a/src/sisudoc/ocda/meta/metadoc_show_config.d +++ b/src/sisudoc/ocda/meta/metadoc_show_config.d @@ -47,15 +47,15 @@ [https://git.sisudoc.org/] +/ -module sisudoc.meta.metadoc_show_config; +module sisudoc.ocda.meta.metadoc_show_config; @safe: template spineShowSiteConfig() { void spineShowSiteConfig(O,T)( O opt_action, T config, ) { - import sisudoc.meta.defaults; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx; import std.array; import std.digest.crc; import std.digest.sha; @@ -138,8 +138,8 @@ template spineShowSiteConfig() { } template spineShowConfig() { void spineShowConfig(T)(T doc_matters) { - import sisudoc.meta.defaults; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx; import std.array; import std.digest.crc; import std.digest.sha; diff --git a/src/sisudoc/ocda/meta/metadoc_show_make.d b/src/sisudoc/ocda/meta/metadoc_show_make.d index 4001e15..d039e9d 100644 --- a/src/sisudoc/ocda/meta/metadoc_show_make.d +++ b/src/sisudoc/ocda/meta/metadoc_show_make.d @@ -47,12 +47,12 @@ [https://git.sisudoc.org/] +/ -module sisudoc.meta.metadoc_show_make; +module sisudoc.ocda.meta.metadoc_show_make; @safe: template spineShowMake() { void spineShowMake(T)(T doc_matters) { - import sisudoc.meta.defaults; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx; import std.array; import std.digest.crc; import std.digest.sha; diff --git a/src/sisudoc/ocda/meta/metadoc_show_metadata.d b/src/sisudoc/ocda/meta/metadoc_show_metadata.d index 4159bc3..8b15870 100644 --- a/src/sisudoc/ocda/meta/metadoc_show_metadata.d +++ b/src/sisudoc/ocda/meta/metadoc_show_metadata.d @@ -47,12 +47,12 @@ [https://git.sisudoc.org/] +/ -module sisudoc.meta.metadoc_show_metadata; +module sisudoc.ocda.meta.metadoc_show_metadata; @safe: template spineShowMetaData() { void spineShowMetaData(T)(T doc_matters) { - import sisudoc.meta.defaults; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx; import std.array; import std.digest.crc; import std.digest.sha; diff --git a/src/sisudoc/ocda/meta/metadoc_show_summary.d b/src/sisudoc/ocda/meta/metadoc_show_summary.d index 037b34a..1c52bfa 100644 --- a/src/sisudoc/ocda/meta/metadoc_show_summary.d +++ b/src/sisudoc/ocda/meta/metadoc_show_summary.d @@ -47,13 +47,13 @@ [https://git.sisudoc.org/] +/ -module sisudoc.meta.metadoc_show_summary; +module sisudoc.ocda.meta.metadoc_show_summary; @safe: template spineMetaDocSummary() { void spineMetaDocSummary(D)(D doc) { auto doc_matters = doc.matters; - import sisudoc.meta.defaults; - import sisudoc.meta.rgx; + import sisudoc.ocda.meta.defaults; + import sisudoc.ocda.meta.rgx; import std.array; import std.digest.crc; import std.digest.sha; diff --git a/src/sisudoc/ocda/meta/package.d b/src/sisudoc/ocda/meta/package.d index 99de2f3..5858f9b 100644 --- a/src/sisudoc/ocda/meta/package.d +++ b/src/sisudoc/ocda/meta/package.d @@ -47,8 +47,8 @@ [https://git.sisudoc.org/] +/ -module sisudoc.meta; -public import sisudoc.meta.defaults; +module sisudoc.ocda.meta; +public import sisudoc.ocda.meta.defaults; /+ std +/ public import std.array; public import std.exception; diff --git a/src/sisudoc/ocda/meta/rgx.d b/src/sisudoc/ocda/meta/rgx.d index db485eb..357df25 100644 --- a/src/sisudoc/ocda/meta/rgx.d +++ b/src/sisudoc/ocda/meta/rgx.d @@ -50,7 +50,7 @@ /++ regex: regular expressions used in sisu document parser +/ -module sisudoc.meta.rgx; +module sisudoc.ocda.meta.rgx; @safe: static template spineRgxIn() { static struct RgxI { diff --git a/src/sisudoc/ocda/meta/rgx_files.d b/src/sisudoc/ocda/meta/rgx_files.d index abf6e46..b26422f 100644 --- a/src/sisudoc/ocda/meta/rgx_files.d +++ b/src/sisudoc/ocda/meta/rgx_files.d @@ -50,7 +50,7 @@ /++ regex: regular expressions used in sisu document parser +/ -module sisudoc.meta.rgx_files; +module sisudoc.ocda.meta.rgx_files; @safe: static template spineRgxFiles() { static struct RgxFiles { diff --git a/src/sisudoc/ocda/meta/rgx_yaml.d b/src/sisudoc/ocda/meta/rgx_yaml.d index 2d3c20b..2c7cfbb 100644 --- a/src/sisudoc/ocda/meta/rgx_yaml.d +++ b/src/sisudoc/ocda/meta/rgx_yaml.d @@ -50,7 +50,7 @@ /++ regex: regular expressions used in sisu document parser +/ -module sisudoc.meta.rgx_yaml; +module sisudoc.ocda.meta.rgx_yaml; @safe: static template spineRgxYamlTags() { static struct RgxYaml { 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; diff --git a/src/sisudoc/spine.d b/src/sisudoc/spine.d index a47c6db..c80814e 100644 --- a/src/sisudoc/spine.d +++ b/src/sisudoc/spine.d @@ -60,25 +60,25 @@ import std.getopt; import std.file; import std.path; import std.process; -import sisudoc.conf.compile_time_info; -import sisudoc.meta; -import sisudoc.meta.metadoc; -import sisudoc.io_out.curate.metadoc_curate; -import sisudoc.io_out.curate.metadoc_curate_authors; -import sisudoc.io_out.curate.metadoc_curate_topics; -import sisudoc.meta.metadoc_from_src; -import sisudoc.meta.conf_make_meta_structs; -import sisudoc.meta.conf_make_meta_json; -import sisudoc.meta.defaults; -import sisudoc.meta.doc_debugs; -import sisudoc.meta.rgx; -import sisudoc.meta.rgx_yaml; -import sisudoc.meta.rgx_files; -import sisudoc.io_in.paths_source; -import sisudoc.io_in.read_config_files; -import sisudoc.io_in.read_source_files; -import sisudoc.io_in.read_zip_pod; -import sisudoc.io_out.hub; +import sisudoc.outputs.conf.compile_time_info; +import sisudoc.ocda.meta; +import sisudoc.ocda.meta.metadoc; +import sisudoc.outputs.io_out.curate.metadoc_curate; +import sisudoc.outputs.io_out.curate.metadoc_curate_authors; +import sisudoc.outputs.io_out.curate.metadoc_curate_topics; +import sisudoc.ocda.meta.metadoc_from_src; +import sisudoc.ocda.meta.conf_make_meta_structs; +import sisudoc.ocda.meta.conf_make_meta_json; +import sisudoc.ocda.meta.defaults; +import sisudoc.ocda.meta.doc_debugs; +import sisudoc.ocda.meta.rgx; +import sisudoc.ocda.meta.rgx_yaml; +import sisudoc.ocda.meta.rgx_files; +import sisudoc.ocda.io_in.paths_source; +import sisudoc.ocda.io_in.read_config_files; +import sisudoc.ocda.io_in.read_source_files; +import sisudoc.ocda.io_in.read_zip_pod; +import sisudoc.outputs.io_out.hub; mixin(import("version.txt")); mixin(import("configuration.txt")); mixin CompileTimeInfo; @@ -920,7 +920,7 @@ string program_name = "spine"; { /+ local site config +/ _conf_file_details = configFilePaths!()(_manifested, _env, _opt_action.config_path_set); auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg); - import sisudoc.meta.conf_make_meta_yaml; + import sisudoc.ocda.meta.conf_make_meta_yaml; _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action, _cfg); // - get local site config break; } @@ -928,11 +928,11 @@ string program_name = "spine"; } } else { /+ local site config +/ auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg); - import sisudoc.meta.conf_make_meta_yaml; + import sisudoc.ocda.meta.conf_make_meta_yaml; _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action, _cfg); // - get local site config } if (_opt_action.show_config) { - import sisudoc.meta.metadoc_show_config; + import sisudoc.ocda.meta.metadoc_show_config; spineShowSiteConfig!()(_opt_action, _siteConfig); } if (!(_opt_action.skip_output)) { @@ -1306,32 +1306,32 @@ string program_name = "spine"; } /+ ↓ debugs +/ if (doc.matters.opt.action.show_summary) { - import sisudoc.meta.metadoc_show_summary; + import sisudoc.ocda.meta.metadoc_show_summary; spineMetaDocSummary!()(doc); } /+ ↓ debugs +/ if (doc.matters.opt.action.show_metadata) { - import sisudoc.meta.metadoc_show_metadata; + import sisudoc.ocda.meta.metadoc_show_metadata; spineShowMetaData!()(doc.matters); } /+ ↓ debugs +/ if (doc.matters.opt.action.show_make) { - import sisudoc.meta.metadoc_show_make; + import sisudoc.ocda.meta.metadoc_show_make; spineShowMake!()(doc.matters); } /+ ↓ debugs +/ if (doc.matters.opt.action.show_config) { - import sisudoc.meta.metadoc_show_config; + import sisudoc.ocda.meta.metadoc_show_config; spineShowConfig!()(doc.matters); } /+ ↓ document abstraction text representation +/ if (doc.matters.opt.action.show_abstraction) { - import sisudoc.abstraction.ssp; + import sisudoc.ocda.abstraction.ssp; spineAbstractionTxt!()(doc); } /+ ↓ document abstraction sqlite database +/ if (doc.matters.opt.action.show_abstraction_db) { - import sisudoc.io_out.create_abstraction_db; + import sisudoc.outputs.io_out.create_abstraction_db; spineAbstractionDb!()(doc); } if (doc.matters.opt.action.curate) { @@ -1415,32 +1415,32 @@ string program_name = "spine"; } /+ ↓ debugs +/ if (doc.matters.opt.action.show_summary) { - import sisudoc.meta.metadoc_show_summary; + import sisudoc.ocda.meta.metadoc_show_summary; spineMetaDocSummary!()(doc); } /+ ↓ debugs +/ if (doc.matters.opt.action.show_metadata) { - import sisudoc.meta.metadoc_show_metadata; + import sisudoc.ocda.meta.metadoc_show_metadata; spineShowMetaData!()(doc.matters); } /+ ↓ debugs +/ if (doc.matters.opt.action.show_make) { - import sisudoc.meta.metadoc_show_make; + import sisudoc.ocda.meta.metadoc_show_make; spineShowMake!()(doc.matters); } /+ ↓ debugs +/ if (doc.matters.opt.action.show_config) { - import sisudoc.meta.metadoc_show_config; + import sisudoc.ocda.meta.metadoc_show_config; spineShowConfig!()(doc.matters); } /+ ↓ document abstraction text representation +/ if (doc.matters.opt.action.show_abstraction) { - import sisudoc.abstraction.ssp; + import sisudoc.ocda.abstraction.ssp; spineAbstractionTxt!()(doc); } /+ ↓ document abstraction sqlite database +/ if (doc.matters.opt.action.show_abstraction_db) { - import sisudoc.io_out.create_abstraction_db; + import sisudoc.outputs.io_out.create_abstraction_db; spineAbstractionDb!()(doc); } if (doc.matters.opt.action.curate) { @@ -1499,7 +1499,7 @@ string program_name = "spine"; spineMetaDocCuratesAuthors!()(hvst.curates, _make_and_meta_struct, _opt_action); } if (_opt_action.vox_gt_1) { - import sisudoc.io_out.paths_output; + import sisudoc.outputs.io_out.paths_output; auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); if (_opt_action.curate_authors) { writeln("- ", out_pth.curate("authors.html")); |
