diff options
81 files changed, 566 insertions, 586 deletions
@@ -10,11 +10,7 @@ "license": "AGPL-3.0+", "targetPath": "./bin", "sourcePaths": [ "./src/sisudoc" ], - "excludedSourceFiles": [ - "src/sisudoc/abstraction/*", - "src/sisudoc/meta/*", - "src/sisudoc/io_in/*" - ], + "excludedSourceFiles": [ "./src/sisudoc/ocda/*" ], "importPaths": [ "./views" ], "stringImportPaths": [ "./views" ], "buildRequirements": [ "allowWarnings" ], @@ -61,14 +57,8 @@ "copyright": "Copyright © 2015 - 2026 Ralph Amissah", "license": "AGPL-3.0+", "targetType": "library", - "sourcePaths": [ - "./src/sisudoc/abstraction", - "./src/sisudoc/meta", - "./src/sisudoc/io_in" - ], - "importPaths": [ - "./src/sisudoc" - ], + "sourcePaths": [ "./src/sisudoc/ocda" ], + "importPaths": [ "./src/sisudoc" ], "buildRequirements": [ "allowWarnings" ], "dependencies": { "spine:dyaml": "*", diff --git a/org/compile_time_info.org b/org/compile_time_info.org index bc2bcae..676f061 100644 --- a/org/compile_time_info.org +++ b/org/compile_time_info.org @@ -27,14 +27,14 @@ version(Windows) {} else { ... } ** _module template_ :module:compile_time_info: -#+HEADER: :tangle "../src/sisudoc/conf/compile_time_info.d" +#+HEADER: :tangle "../src/sisudoc/outputs/conf/compile_time_info.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ compile_time_info +/ -module sisudoc.conf.compile_time_info; +module sisudoc.outputs.conf.compile_time_info; @safe: template CompileTimeInfo() { <<spine_compile_time_info_0>> diff --git a/org/config_dub.org b/org/config_dub.org index b1700e5..d82a5ac 100644 --- a/org/config_dub.org +++ b/org/config_dub.org @@ -47,11 +47,7 @@ "license": "AGPL-3.0+", "targetPath": "./bin", "sourcePaths": [ "./src/sisudoc" ], - "excludedSourceFiles": [ - "src/sisudoc/abstraction/*", - "src/sisudoc/meta/*", - "src/sisudoc/io_in/*" - ], + "excludedSourceFiles": [ "./src/sisudoc/ocda/*" ], "importPaths": [ "./views" ], "stringImportPaths": [ "./views" ], "buildRequirements": [ "allowWarnings" ], @@ -98,14 +94,8 @@ "copyright": "Copyright © 2015 - 2026 Ralph Amissah", "license": "AGPL-3.0+", "targetType": "library", - "sourcePaths": [ - "./src/sisudoc/abstraction", - "./src/sisudoc/meta", - "./src/sisudoc/io_in" - ], - "importPaths": [ - "./src/sisudoc" - ], + "sourcePaths": [ "./src/sisudoc/ocda" ], + "importPaths": [ "./src/sisudoc" ], "buildRequirements": [ "allowWarnings" ], "dependencies": { "spine:dyaml": "*", diff --git a/org/default_imports.org b/org/default_imports.org index 1df7ab4..4f03212 100644 --- a/org/default_imports.org +++ b/org/default_imports.org @@ -20,11 +20,11 @@ * imports for _meta_ :meta: ** package dir -#+HEADER: :tangle "../src/sisudoc/meta/package.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/package.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.meta; +module sisudoc.ocda.meta; <<imports_for_meta_general>> #+END_SRC @@ -32,7 +32,7 @@ module sisudoc.meta; #+NAME: imports_for_meta_general #+BEGIN_SRC d -public import sisudoc.meta.defaults; +public import sisudoc.ocda.meta.defaults; /+ std +/ public import std.array; public import std.exception; @@ -49,11 +49,11 @@ public import std.conv : to; * imports for _output_ :output: ** package dir -#+HEADER: :tangle "../src/sisudoc/io_out/package.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/package.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out; +module sisudoc.outputs.io_out; <<imports_for_output_general>> #+END_SRC @@ -74,10 +74,10 @@ 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; #+END_SRC * org includes diff --git a/org/default_misc.org b/org/default_misc.org index a2a17a1..87ca048 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -21,14 +21,14 @@ ** _module template_ #+NAME: tangle_defaults -#+HEADER: :tangle "../src/sisudoc/meta/defaults.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/defaults.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ default settings +/ -module sisudoc.meta.defaults; +module sisudoc.ocda.meta.defaults; @safe: <<meta_defaults_template_node>> <<meta_defaults_template_curate_metadata>> @@ -172,14 +172,14 @@ template spineBiblio() { ** _module template_ #+NAME: tangle_defaults -#+HEADER: :tangle "../src/sisudoc/io_out/defaults.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/defaults.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ default settings +/ -module sisudoc.io_out.defaults; +module sisudoc.outputs.io_out.defaults; @safe: <<defaults_template_init_flags>> <<defaults_template_markup>> diff --git a/org/default_paths.org b/org/default_paths.org index c0b7e43..a6cf19a 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -20,7 +20,7 @@ * source paths ** _module template_ :module:paths_source: -#+HEADER: :tangle "../src/sisudoc/io_in/paths_source.d" +#+HEADER: :tangle "../src/sisudoc/ocda/io_in/paths_source.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -29,7 +29,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; @@ -37,8 +37,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_paths_src_0>> <<template_paths_src_1>> <<template_paths_src_2>> @@ -979,20 +979,20 @@ template spinePathsPods() { * output paths ** _module template_ :module:paths_output: -#+HEADER: :tangle "../src/sisudoc/io_out/paths_output.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/paths_output.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ 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_paths_out_0>> <<template_paths_out_1>> <<template_paths_url>> diff --git a/org/default_regex.org b/org/default_regex.org index 6c7c045..430828b 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -34,14 +34,14 @@ https://dlang.org/phobos/std_regex.html ** _module template_ :module: -#+HEADER: :tangle "../src/sisudoc/meta/rgx.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/rgx.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ regex: regular expressions used in sisu document parser +/ -module sisudoc.meta.rgx; +module sisudoc.ocda.meta.rgx; @safe: static template spineRgxIn() { static struct RgxI { @@ -472,14 +472,14 @@ https://dlang.org/phobos/std_regex.html ** _module template_ :module:output: -#+HEADER: :tangle "../src/sisudoc/io_out/rgx.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/rgx.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ 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 { @@ -678,14 +678,14 @@ static table_delimiter_row = ctRegex!("[ ]*\n", "mg"); ** files filename (& path) (including insert file) :insert:file:path:filename: -#+HEADER: :tangle "../src/sisudoc/meta/rgx_files.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/rgx_files.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ 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 { @@ -712,14 +712,14 @@ static src_formalised_file_path_parts = ctRegex!(`(?P<pth>(?:[/a-zA-Z0 ** _module template yaml tags -#+HEADER: :tangle "../src/sisudoc/meta/rgx_yaml.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/rgx_yaml.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ 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 { @@ -739,14 +739,14 @@ static yaml_tag_is_seq = ctRegex!(`:seq$`); ** special characters *** xhtml special characters template -#+HEADER: :tangle "../src/sisudoc/io_out/rgx_xhtml.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/rgx_xhtml.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ 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 { @@ -768,14 +768,14 @@ static line_break = ctRegex!(` [\\]{2}`, "m"); // *** LaTeX special characters template -#+HEADER: :tangle "../src/sisudoc/io_out/rgx_latex.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/rgx_latex.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ 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/org/default_shared_snippets.org b/org/default_shared_snippets.org index 4eb7972..a4a09cc 100644 --- a/org/default_shared_snippets.org +++ b/org/default_shared_snippets.org @@ -20,11 +20,11 @@ * html snippet ** _module template_ :module: -#+HEADER: :tangle "../src/sisudoc/io_out/html_snippet.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/html_snippet.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.html_snippet; +module sisudoc.outputs.io_out.html_snippet; @safe: template htmlSnippet() { import std.file; @@ -32,9 +32,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, @@ -81,14 +81,14 @@ template htmlSnippet() { * shared ** _module template_ :module:shared: -#+HEADER: :tangle "../src/sisudoc/share/defaults.d" +#+HEADER: :tangle "../src/sisudoc/outputs/share/defaults.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ shared default settings +/ -module sisudoc.share.defaults; +module sisudoc.outputs.share.defaults; @safe: <<shared_messages>> #+END_SRC diff --git a/org/in_source_files.org b/org/in_source_files.org index bf53d10..1aab3a7 100644 --- a/org/in_source_files.org +++ b/org/in_source_files.org @@ -20,7 +20,7 @@ * A. get _config file_, read in (.readText) [#A] ** _module template_ :module:config_files: -#+HEADER: :tangle "../src/sisudoc/io_in/read_config_files.d" +#+HEADER: :tangle "../src/sisudoc/ocda/io_in/read_config_files.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -29,14 +29,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; <<meta_config_file_hub_read_site_config>> <<meta_config_file_hub_read_document_config>> <<meta_config_file_hub_read_site_yaml>> @@ -186,10 +186,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(); @@ -247,10 +247,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); @@ -262,8 +262,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); @@ -277,7 +277,7 @@ static template configReadDocYAML() { * B. get _markup source_, read file (.readText) [#A]:module:source_files: ** _module template_ -#+HEADER: :tangle "../src/sisudoc/io_in/read_source_files.d" +#+HEADER: :tangle "../src/sisudoc/ocda/io_in/read_source_files.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -286,16 +286,16 @@ static template configReadDocYAML() { - 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/org/in_zip_pod.org b/org/in_zip_pod.org index f2903c4..9beae6e 100644 --- a/org/in_zip_pod.org +++ b/org/in_zip_pod.org @@ -19,7 +19,7 @@ * read zip -#+HEADER: :tangle "../src/sisudoc/io_in/read_zip_pod.d" +#+HEADER: :tangle "../src/sisudoc/ocda/io_in/read_zip_pod.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -28,7 +28,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/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index b39e54f..f9c13ef 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -214,16 +214,16 @@ import std.typecons; import std.uni; import std.utf; import std.conv : to; -import sisudoc.meta.conf_make_meta_structs; +import sisudoc.ocda.meta.conf_make_meta_structs; #+END_SRC ** struct ConfComposite -#+HEADER: :tangle "../src/sisudoc/meta/conf_make_meta_structs.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/conf_make_meta_structs.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.meta.conf_make_meta_structs; +module sisudoc.ocda.meta.conf_make_meta_structs; @safe: <<meta_defaults_template_structs_init>> <<meta_defaults_template_structs_setup>> @@ -247,9 +247,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; @@ -607,7 +607,7 @@ string check_input_markup()( ** _module template_ -#+HEADER: :tangle "../src/sisudoc/meta/conf_make_meta_yaml.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/conf_make_meta_yaml.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -615,7 +615,7 @@ string check_input_markup()( 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; @@ -628,10 +628,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, @@ -1432,7 +1432,7 @@ if ("rights" in _yaml * JSON to spineStruct :module:conf_make_meta:json: ** _module template_ -#+HEADER: :tangle "../src/sisudoc/meta/conf_make_meta_json.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/conf_make_meta_json.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -1440,7 +1440,7 @@ if ("rights" in _yaml 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; @@ -1452,10 +1452,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; @@ -2109,8 +2109,8 @@ if ("rights" in _json.object) { #+BEGIN_SRC d 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, @@ -2154,10 +2154,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/org/meta_debugs.org b/org/meta_debugs.org index 53a63ac..9604825 100644 --- a/org/meta_debugs.org +++ b/org/meta_debugs.org @@ -20,14 +20,14 @@ * abstraction debugs :module:spine:meta_doc_debugs: ** _module template_ -#+HEADER: :tangle "../src/sisudoc/meta/doc_debugs.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/doc_debugs.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ output debugs +/ -module sisudoc.meta.doc_debugs; +module sisudoc.ocda.meta.doc_debugs; template spineDebugs() { <<debug_imports>> auto spineDebugs(S,T)( @@ -52,8 +52,8 @@ template spineDebugs() { #+NAME: debug_imports #+BEGIN_SRC d -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/org/ocda.org b/org/ocda.org index d4da85d..a24e335 100644 --- a/org/ocda.org +++ b/org/ocda.org @@ -24,25 +24,25 @@ ** library template :module:metadoc_from_src: -#+HEADER: :tangle "../src/sisudoc/abstraction/package.d" +#+HEADER: :tangle "../src/sisudoc/ocda/abstraction/package.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ - 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. @@ -51,32 +51,32 @@ 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) #+END_SRC ** _module template_ :module:metadoc_from_src: -#+HEADER: :tangle "../src/sisudoc/meta/metadoc_from_src.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc_from_src.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> // 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() { <<docInitialize>> @@ -104,12 +104,12 @@ import std.digest.sha; 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; #+END_SRC diff --git a/org/ocda_functions.org b/org/ocda_functions.org index 80305aa..5970a06 100644 --- a/org/ocda_functions.org +++ b/org/ocda_functions.org @@ -22,14 +22,14 @@ Process markup document, create document abstraction. ** _module + templates_ :module:metadoc_from_src: -#+HEADER: :tangle "../src/sisudoc/meta/metadoc_from_src_functions.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc_from_src_functions.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> // 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() { <<docInitialize>> diff --git a/org/ocda_obj_setter.org b/org/ocda_obj_setter.org index 64dd586..3427c6b 100644 --- a/org/ocda_obj_setter.org +++ b/org/ocda_obj_setter.org @@ -23,7 +23,7 @@ set abstracted objects for downstream processing ** _module template_ -#+HEADER: :tangle "../src/sisudoc/meta/metadoc_object_setter.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc_object_setter.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -32,7 +32,7 @@ set abstracted objects for downstream processing 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/org/out_curate_metadata.org b/org/out_curate_metadata.org index 6650f07..e2cec7a 100644 --- a/org/out_curate_metadata.org +++ b/org/out_curate_metadata.org @@ -26,11 +26,11 @@ ** _module template_ metadoc curate -#+HEADER: :tangle "../src/sisudoc/io_out/curate/metadoc_curate.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/curate/metadoc_curate.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.curate.metadoc_curate; +module sisudoc.outputs.io_out.curate.metadoc_curate; @safe: template spineMetaDocCurate() { auto spineMetaDocCurate(T,H)( @@ -50,8 +50,8 @@ template spineMetaDocCurate() { #+NAME: metadoc_curate_imports #+BEGIN_SRC d -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; @@ -95,7 +95,7 @@ writefln( #+NAME: meta_metadoc_curate #+BEGIN_SRC d -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; @@ -119,11 +119,11 @@ return hvst.curate; ** _module template_ metadoc curate topics *** _module template_ metadoc curate topics template -#+HEADER: :tangle "../src/sisudoc/io_out/curate/metadoc_curate_topics.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.curate.metadoc_curate_topics; +module sisudoc.outputs.io_out.curate.metadoc_curate_topics; @safe: import std.algorithm; import std.array; @@ -132,8 +132,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() { @@ -447,7 +447,7 @@ foreach(k0; #+NAME: curated_topics_html_write #+BEGIN_SRC d -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"); @@ -462,11 +462,11 @@ try { ** _module template_ metadoc curates authors *** _module template_ metadoc curate authors -#+HEADER: :tangle "../src/sisudoc/io_out/curate/metadoc_curate_authors.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.curate.metadoc_curate_authors; +module sisudoc.outputs.io_out.curate.metadoc_curate_authors; @safe: import std.algorithm; import std.array; @@ -475,8 +475,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() { @@ -608,7 +608,7 @@ template spineMetaDocCuratesAuthors() { #+NAME: curated_authors_html_write #+BEGIN_SRC d -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/org/out_latex.org b/org/out_latex.org index dd98ca1..88a409a 100644 --- a/org/out_latex.org +++ b/org/out_latex.org @@ -22,11 +22,11 @@ ** _module template_ :latex:pdf:module: *** latex.d module & templates -#+HEADER: :tangle "../src/sisudoc/io_out/latex.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/latex.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.latex; +module sisudoc.outputs.io_out.latex; @safe: <<Template_paper_latex>> <<Template_output_latex>> @@ -134,7 +134,7 @@ template outputLaTeX() { #+HEADER: :noweb yes #+BEGIN_SRC d template outputLaTeXstyInit() { - import sisudoc.io_out; + import sisudoc.outputs.io_out; auto paper = paperLaTeX; <<Function_output_style_write>> <<Function_output_stylesheets_get_each_written>> @@ -218,7 +218,7 @@ void writeOutputLaTeX(T,M)( } } 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( @@ -232,7 +232,7 @@ void writeOutputLaTeX(T,M)( } // 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( @@ -244,7 +244,7 @@ void writeOutputLaTeX(T,M)( )); } 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( @@ -669,9 +669,9 @@ import std.file; 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; diff --git a/org/out_metadata.org b/org/out_metadata.org index ed16d42..dcd7c51 100644 --- a/org/out_metadata.org +++ b/org/out_metadata.org @@ -21,11 +21,11 @@ ** _module template_ metadoc document metadata -#+HEADER: :tangle "../src/sisudoc/io_out/metadata.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/metadata.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.metadata; +module sisudoc.outputs.io_out.metadata; // @safe: template outputMetadata() { void outputMetadata(T)(T doc_matters) { @@ -51,7 +51,7 @@ import std.digest.crc; import std.digest.sha; import std.file; import std.format; -import sisudoc.io_out; +import sisudoc.outputs.io_out; mixin InternalMarkup; char[] metadata_; #+END_SRC @@ -61,7 +61,7 @@ char[] metadata_; #+NAME: output_metadata #+BEGIN_SRC d 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); @@ -309,7 +309,7 @@ void metadata_write_output(M)(M doc_matters, char[] metadata_) { } } 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( diff --git a/org/out_odt.org b/org/out_odt.org index 787070c..25feda2 100644 --- a/org/out_odt.org +++ b/org/out_odt.org @@ -46,11 +46,11 @@ ** _module template_ :odf:odt:module: -#+HEADER: :tangle "../src/sisudoc/io_out/odt.d" :noweb yes +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/odt.d" :noweb yes #+HEADER: :noweb yes #+BEGIN_SRC org <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.odt; +module sisudoc.outputs.io_out.odt; @safe: template formatODT() { <<output_imports>> @@ -974,7 +974,7 @@ string table(O,M)( } } 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( @@ -1040,17 +1040,17 @@ void outputODT(D,I)( #+NAME: output_imports #+BEGIN_SRC d -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; #+END_SRC *** make directory tree @@ -1060,7 +1060,7 @@ import sisudoc.io_out.xmls_css; 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"))) { @@ -1074,7 +1074,7 @@ void dirtree(I)( 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( @@ -2579,7 +2579,7 @@ void images_cp(M)( 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; diff --git a/org/out_skel.org b/org/out_skel.org index d04ed57..63ae481 100644 --- a/org/out_skel.org +++ b/org/out_skel.org @@ -21,11 +21,11 @@ * Skel ** outputSkel template -#+HEADER: :tangle "../src/sisudoc/io_out/skel.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/skel.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.skel; +module sisudoc.outputs.io_out.skel; @safe: template outputSkel() { <<munge>> @@ -35,7 +35,7 @@ template outputSkel() { M doc_matters, ) { import std.stdio; - import sisudoc.io_out; + import sisudoc.outputs.io_out; <<skel_out>> skel_out(doc_abstraction, doc_matters); } @@ -87,7 +87,7 @@ void skel_out(D,M)( #+BEGIN_SRC d template theDocument() { import std.stdio; - import sisudoc.io_out; + import sisudoc.outputs.io_out; <<skel_head>> <<skel_body_assign_munge>> <<skel_tail>> diff --git a/org/out_sqlite.org b/org/out_sqlite.org index 9a4c63b..fb19908 100644 --- a/org/out_sqlite.org +++ b/org/out_sqlite.org @@ -41,11 +41,11 @@ sudo chown ralph:ralph /var/www ** _module, templates_ :module: *** template -#+HEADER: :tangle "../src/sisudoc/io_out/sqlite.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/sqlite.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.sqlite; +module sisudoc.outputs.io_out.sqlite; <<sqlite_imports>> <<sqlite_common>> <<sqlite_collection>> @@ -580,9 +580,9 @@ db.close; #+NAME: sqlite_imports #+BEGIN_SRC d -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.uri; // import std.digest.sha; diff --git a/org/out_src_abstraction_ocda_ssp.org b/org/out_src_abstraction_ocda_ssp.org index a17c236..d44db04 100644 --- a/org/out_src_abstraction_ocda_ssp.org +++ b/org/out_src_abstraction_ocda_ssp.org @@ -25,11 +25,11 @@ rename source_abstraction_peg_txt.d -#+HEADER: :tangle "../src/sisudoc/abstraction/ssp.d" +#+HEADER: :tangle "../src/sisudoc/ocda/abstraction/ssp.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.abstraction.ssp; +module sisudoc.ocda.abstraction.ssp; @safe: /+ ↓ write document abstraction as human-readable .ssp text file +/ diff --git a/org/out_src_abstraction_sqlite_db.org b/org/out_src_abstraction_sqlite_db.org index 4fa7cdb..daf4fb0 100644 --- a/org/out_src_abstraction_sqlite_db.org +++ b/org/out_src_abstraction_sqlite_db.org @@ -25,11 +25,11 @@ rename source_abstraction_peg_txt.d -#+HEADER: :tangle "../src/sisudoc/io_out/create_abstraction_db.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/create_abstraction_db.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -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() { @@ -40,7 +40,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/org/out_src_pod.org b/org/out_src_pod.org index a31937b..678d5ac 100644 --- a/org/out_src_pod.org +++ b/org/out_src_pod.org @@ -21,11 +21,11 @@ * pod ** _module template_ :module: -#+HEADER: :tangle "../src/sisudoc/io_out/source_pod.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/source_pod.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.source_pod; +module sisudoc.outputs.io_out.source_pod; @system: // is not @safe: use: @system: or @trusted: template spinePod() { <<output_imports>> @@ -83,10 +83,10 @@ import std.file; 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; #+END_SRC *** init @@ -157,7 +157,7 @@ auto pod_zipMakeReady(M,P,S)(M doc_matters, P pths_pod, S _st) { } { // 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. +/ @@ -447,7 +447,7 @@ void podArchive_directory_tree(M,P)(M doc_matters, P pths_pod) { // create direc } } 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( @@ -516,7 +516,7 @@ void zipArchive(M,F,Z)(M doc_matters, F fn_pod, Z zip) { #+NAME: pod_source_files_digests #+BEGIN_SRC d 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/org/out_text.org b/org/out_text.org index 2685986..5d0e77d 100644 --- a/org/out_text.org +++ b/org/out_text.org @@ -21,11 +21,11 @@ * Text ** outputText template -#+HEADER: :tangle "../src/sisudoc/io_out/text.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/text.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.text; +module sisudoc.outputs.io_out.text; @safe: template outputText() { <<munge>> @@ -35,7 +35,7 @@ template outputText() { M doc_matters, ) { import std.stdio; - import sisudoc.io_out; + import sisudoc.outputs.io_out; <<text_out>> text_out(doc_abstraction, doc_matters); } @@ -87,7 +87,7 @@ void text_out(D,M)( #+BEGIN_SRC d template theDocument() { import std.stdio; - import sisudoc.io_out; + import sisudoc.outputs.io_out; <<text_head>> <<text_body_assign_munge>> <<text_tail>> @@ -197,8 +197,8 @@ string text_tail(M)( #+HEADER: :noweb yes #+BEGIN_SRC d 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; diff --git a/org/out_xmls.org b/org/out_xmls.org index a8a268a..36d4b78 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -22,11 +22,11 @@ ** format xhtml objects :format: *** _module template_ :module: -#+HEADER: :tangle "../src/sisudoc/io_out/xmls.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/xmls.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.xmls; +module sisudoc.outputs.io_out.xmls; @safe: template outputXHTMLs() { <<output_imports_xml>> @@ -90,13 +90,13 @@ 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; #+END_SRC **** epub3 @@ -108,12 +108,12 @@ import std.outbuffer; 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; #+END_SRC *** misc @@ -1748,11 +1748,11 @@ string table(O,M)( * _html_ [#A] :html: ** _module template_ :module: -#+HEADER: :tangle "../src/sisudoc/io_out/html.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/html.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.html; +module sisudoc.outputs.io_out.html; @safe: template outputHTML() { <<output_imports_xml>> @@ -2007,7 +2007,7 @@ scroll_write_output(doc_out, doc.matters); } } 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( @@ -2381,7 +2381,7 @@ void css(M)(M doc_matters) { 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( @@ -2423,7 +2423,7 @@ void css(M)(M doc_matters) { } } 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( @@ -2458,11 +2458,11 @@ void css(M)(M doc_matters) { ** _module template_ :module: -#+HEADER: :tangle "../src/sisudoc/io_out/epub3.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/epub3.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.epub3; +module sisudoc.outputs.io_out.epub3; @safe: template outputEPub3() { <<output_imports_epub>> @@ -3163,7 +3163,7 @@ zip -0 file.epub mimetype && zip -r -9 file.epub META-INF OEBPS 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/org/out_xmls_css.org b/org/out_xmls_css.org index d3a4e7e..3a55def 100644 --- a/org/out_xmls_css.org +++ b/org/out_xmls_css.org @@ -21,14 +21,14 @@ * output css defaults :module:spine:output_xmls_css: ** _module template_ -#+HEADER: :tangle "../src/sisudoc/io_out/xmls_css.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/xmls_css.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> /++ 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/org/out_zip.org b/org/out_zip.org index 561c7e6..7cde8a7 100644 --- a/org/out_zip.org +++ b/org/out_zip.org @@ -21,11 +21,11 @@ * _zip_ :module:spine:create_zip_file: ** module template -#+HEADER: :tangle "../src/sisudoc/io_out/create_zip_file.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/create_zip_file.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.io_out.create_zip_file; +module sisudoc.outputs.io_out.create_zip_file; @safe: template createZipFile() { import std.file; diff --git a/org/output_hub.org b/org/output_hub.org index 8270e2c..88e28c1 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -20,7 +20,7 @@ * output hub [#A] ** _module template_ :module: -#+HEADER: :tangle "../src/sisudoc/io_out/hub.d" +#+HEADER: :tangle "../src/sisudoc/outputs/io_out/hub.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -28,7 +28,7 @@ output hub<BR> check & generate output types requested +/ -module sisudoc.io_out.hub; +module sisudoc.outputs.io_out.hub; @safe: template outputHub() { <<output_imports>> @@ -66,9 +66,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, @@ -93,7 +93,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, @@ -117,11 +117,11 @@ template outputHubOp() { #+NAME: output_imports #+BEGIN_SRC d -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; #+END_SRC ** outputs @@ -134,7 +134,7 @@ import sisudoc.io_out, 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"); } @@ -147,7 +147,7 @@ if (sched == outTask.source_or_pod) { #+BEGIN_SRC d 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"); } @@ -170,7 +170,7 @@ if (sched == outTask.html_stuff) { #+BEGIN_SRC d 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"); } @@ -182,7 +182,7 @@ if (sched == outTask.html_scroll) { #+BEGIN_SRC d 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"); } @@ -193,7 +193,7 @@ if (sched == outTask.html_seg) { #+NAME: output_scheduled_task_html_out #+BEGIN_SRC d 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"); @@ -215,7 +215,7 @@ if (sched == outTask.html_stuff) { #+BEGIN_SRC d 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"))) @@ -238,7 +238,7 @@ if (sched == outTask.latex) { #+BEGIN_SRC d 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"); } @@ -250,7 +250,7 @@ if (sched == outTask.text) { #+BEGIN_SRC d 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"); } @@ -262,7 +262,7 @@ if (sched == outTask.odt) { #+BEGIN_SRC d 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"); } @@ -274,7 +274,7 @@ if (sched == outTask.skel) { #+BEGIN_SRC d 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"); } @@ -288,12 +288,12 @@ if (sched == outTask.sqlite) { #+BEGIN_SRC d 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"); } @@ -308,7 +308,7 @@ 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"); @@ -325,7 +325,7 @@ if ((opt_action.sqlite_db_create)) { 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/org/output_show.org b/org/output_show.org index 85ee080..eb881f1 100644 --- a/org/output_show.org +++ b/org/output_show.org @@ -21,11 +21,11 @@ ** _module template_ metadoc summary - document summary from abstraction -#+HEADER: :tangle "../src/sisudoc/meta/metadoc_show_summary.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc_show_summary.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.meta.metadoc_show_summary; +module sisudoc.ocda.meta.metadoc_show_summary; @safe: template spineMetaDocSummary() { void spineMetaDocSummary(D)(D doc) { @@ -143,7 +143,7 @@ writefln( ** _module template_ show config *** _show config tangle -#+HEADER: :tangle "../src/sisudoc/meta/metadoc_show_config.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc_show_config.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> @@ -157,7 +157,7 @@ writefln( #+NAME: spine_show_site_config #+HEADER: :noweb yes #+BEGIN_SRC d -module sisudoc.meta.metadoc_show_config; +module sisudoc.ocda.meta.metadoc_show_config; @safe: template spineShowSiteConfig() { void spineShowSiteConfig(O,T)( @@ -337,11 +337,11 @@ writefln( ** _module template_ show make --show-make (show document make) -#+HEADER: :tangle "../src/sisudoc/meta/metadoc_show_make.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc_show_make.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.meta.metadoc_show_make; +module sisudoc.ocda.meta.metadoc_show_make; @safe: template spineShowMake() { void spineShowMake(T)(T doc_matters) { @@ -409,11 +409,11 @@ writefln( ** _module template_ show metadata --show-metadata (show document metadata) -#+HEADER: :tangle "../src/sisudoc/meta/metadoc_show_metadata.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc_show_metadata.d" #+HEADER: :noweb yes #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.meta.metadoc_show_metadata; +module sisudoc.ocda.meta.metadoc_show_metadata; @safe: template spineShowMetaData() { void spineShowMetaData(T)(T doc_matters) { @@ -549,8 +549,8 @@ import std.conv : to; #+NAME: metadoc_show_summary_imports #+BEGIN_SRC d -import sisudoc.meta.defaults; -import sisudoc.meta.rgx; +import sisudoc.ocda.meta.defaults; +import sisudoc.ocda.meta.rgx; #+END_SRC *** initialize :report: diff --git a/org/spine.org b/org/spine.org index 481f2c7..6d67e3b 100644 --- a/org/spine.org +++ b/org/spine.org @@ -105,7 +105,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")); @@ -139,25 +139,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; #+END_SRC ***** spine metadoc :spine: @@ -167,14 +167,14 @@ import sisudoc.io_out.hub; 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; #+END_SRC ****** notes @@ -1127,7 +1127,7 @@ if ( { /+ 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; } @@ -1135,11 +1135,11 @@ if ( } } 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); } #+END_SRC @@ -1492,7 +1492,7 @@ foreach(arg; _resolved_args) { #+BEGIN_SRC d { /+ 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); } #+END_SRC @@ -1566,7 +1566,7 @@ if ((doc.matters.opt.action.debug_do) #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_summary) { - import sisudoc.meta.metadoc_show_summary; + import sisudoc.ocda.meta.metadoc_show_summary; spineMetaDocSummary!()(doc); } #+END_SRC @@ -1578,7 +1578,7 @@ if (doc.matters.opt.action.show_summary) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_metadata) { - import sisudoc.meta.metadoc_show_metadata; + import sisudoc.ocda.meta.metadoc_show_metadata; spineShowMetaData!()(doc.matters); } #+END_SRC @@ -1590,7 +1590,7 @@ if (doc.matters.opt.action.show_metadata) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_make) { - import sisudoc.meta.metadoc_show_make; + import sisudoc.ocda.meta.metadoc_show_make; spineShowMake!()(doc.matters); } #+END_SRC @@ -1602,7 +1602,7 @@ if (doc.matters.opt.action.show_make) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc.matters.opt.action.show_config) { - import sisudoc.meta.metadoc_show_config; + import sisudoc.ocda.meta.metadoc_show_config; spineShowConfig!()(doc.matters); } #+END_SRC @@ -1614,7 +1614,7 @@ if (doc.matters.opt.action.show_config) { #+BEGIN_SRC d /+ ↓ document abstraction text representation +/ if (doc.matters.opt.action.show_abstraction) { - import sisudoc.abstraction.ssp; + import sisudoc.ocda.abstraction.ssp; spineAbstractionTxt!()(doc); } #+END_SRC @@ -1626,7 +1626,7 @@ if (doc.matters.opt.action.show_abstraction) { #+BEGIN_SRC d /+ ↓ 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); } #+END_SRC @@ -1719,10 +1719,10 @@ break; // terminate, stop *** 0 module template - abstraction template -#+HEADER: :tangle "../src/sisudoc/meta/metadoc.d" +#+HEADER: :tangle "../src/sisudoc/ocda/meta/metadoc.d" #+BEGIN_SRC d <<doc_header_including_copyright_and_license>> -module sisudoc.meta.metadoc; +module sisudoc.ocda.meta.metadoc; @safe: template spineAbstraction() { <<imports_spine_metadoc>> @@ -1840,7 +1840,7 @@ if ((_opt_action.debug_do) ) { 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/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")); |