diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/doc_reform/io_in/paths_source.d (renamed from src/doc_reform/source/paths_source.d) | 2 | ||||
-rw-r--r-- | src/doc_reform/io_in/read_config_files.d (renamed from src/doc_reform/source/read_config_files.d) | 10 | ||||
-rw-r--r-- | src/doc_reform/io_in/read_source_files.d (renamed from src/doc_reform/source/read_source_files.d) | 4 | ||||
-rw-r--r-- | src/doc_reform/io_out/create_zip_file.d (renamed from src/doc_reform/output/create_zip_file.d) | 2 | ||||
-rw-r--r-- | src/doc_reform/io_out/defaults.d (renamed from src/doc_reform/output/defaults.d) | 2 | ||||
-rw-r--r-- | src/doc_reform/io_out/epub3.d (renamed from src/doc_reform/output/epub3.d) | 10 | ||||
-rw-r--r-- | src/doc_reform/io_out/html.d (renamed from src/doc_reform/output/html.d) | 10 | ||||
-rw-r--r-- | src/doc_reform/io_out/hub.d (renamed from src/doc_reform/output/hub.d) | 46 | ||||
-rw-r--r-- | src/doc_reform/io_out/latex.d (renamed from src/doc_reform/output/latex.d) | 4 | ||||
-rw-r--r-- | src/doc_reform/io_out/odt.d (renamed from src/doc_reform/output/odt.d) | 18 | ||||
-rw-r--r-- | src/doc_reform/io_out/package.d (renamed from src/doc_reform/output/package.d) | 10 | ||||
-rw-r--r-- | src/doc_reform/io_out/paths_output.d (renamed from src/doc_reform/output/paths_output.d) | 2 | ||||
-rw-r--r-- | src/doc_reform/io_out/rgx.d (renamed from src/doc_reform/output/rgx.d) | 4 | ||||
-rw-r--r-- | src/doc_reform/io_out/source_pod.d (renamed from src/doc_reform/output/source_pod.d) | 8 | ||||
-rw-r--r-- | src/doc_reform/io_out/sqlite.d (renamed from src/doc_reform/output/sqlite.d) | 4 | ||||
-rw-r--r-- | src/doc_reform/io_out/xmls.d (renamed from src/doc_reform/output/xmls.d) | 10 | ||||
-rw-r--r-- | src/doc_reform/io_out/xmls_css.d (renamed from src/doc_reform/output/xmls_css.d) | 2 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc.d | 8 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc_from_src.d | 2 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc_harvest.d | 2 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc_harvests_authors.d | 2 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc_harvests_topics.d | 2 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc_object_setter.d (renamed from src/doc_reform/meta/object_setter.d) | 4 | ||||
-rwxr-xr-x | src/doc_reform/spine.d | 10 |
24 files changed, 89 insertions, 89 deletions
diff --git a/src/doc_reform/source/paths_source.d b/src/doc_reform/io_in/paths_source.d index ef1e6d0..fbb6d76 100644 --- a/src/doc_reform/source/paths_source.d +++ b/src/doc_reform/io_in/paths_source.d @@ -3,7 +3,7 @@ - read config files<BR> meta_config_files.d +/ -module doc_reform.source.paths_source; +module doc_reform.io_in.paths_source; import std.array, std.file, std.path, diff --git a/src/doc_reform/source/read_config_files.d b/src/doc_reform/io_in/read_config_files.d index f522c29..c0893de 100644 --- a/src/doc_reform/source/read_config_files.d +++ b/src/doc_reform/io_in/read_config_files.d @@ -3,14 +3,14 @@ - read config files<BR> meta_config_files.d +/ -module doc_reform.source.read_config_files; +module doc_reform.io_in.read_config_files; static template readConfigSite() { import doc_reform.meta.rgx; import doc_reform.meta, - doc_reform.source.paths_source, + doc_reform.io_in.paths_source, std.file, std.path; mixin spineRgxInit; @@ -77,7 +77,7 @@ static template readConfigDoc() { doc_reform.meta.rgx; import doc_reform.meta, - doc_reform.source.paths_source, + doc_reform.io_in.paths_source, std.file, std.path; mixin spineRgxInit; @@ -128,7 +128,7 @@ static template readConfigDoc() { static template configReadSiteYAML() { import doc_reform.meta, - doc_reform.source.paths_source, + doc_reform.io_in.paths_source, std.file, std.path; final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) { @@ -142,7 +142,7 @@ static template configReadSiteYAML() { static template configReadDocYAML() { import doc_reform.meta, - doc_reform.source.paths_source, + doc_reform.io_in.paths_source, std.file, std.path; final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) { diff --git a/src/doc_reform/source/read_source_files.d b/src/doc_reform/io_in/read_source_files.d index 7626a89..e443b01 100644 --- a/src/doc_reform/source/read_source_files.d +++ b/src/doc_reform/io_in/read_source_files.d @@ -3,13 +3,13 @@ - open markup files<BR> - if master file scan for addional files to import/insert +/ -module doc_reform.source.read_source_files; +module doc_reform.io_in.read_source_files; static template spineRawMarkupContent() { import doc_reform.meta.rgx; import doc_reform.meta, - doc_reform.source.paths_source, + doc_reform.io_in.paths_source, std.file, std.path; mixin spineRgxInit; diff --git a/src/doc_reform/output/create_zip_file.d b/src/doc_reform/io_out/create_zip_file.d index fa752ad..09b481a 100644 --- a/src/doc_reform/output/create_zip_file.d +++ b/src/doc_reform/io_out/create_zip_file.d @@ -1,4 +1,4 @@ -module doc_reform.output.create_zip_file; +module doc_reform.io_out.create_zip_file; template createZipFile() { import std.file; import std.outbuffer; diff --git a/src/doc_reform/output/defaults.d b/src/doc_reform/io_out/defaults.d index fc31ea9..887c1be 100644 --- a/src/doc_reform/output/defaults.d +++ b/src/doc_reform/io_out/defaults.d @@ -1,7 +1,7 @@ /++ default settings +/ -module doc_reform.output.defaults; +module doc_reform.io_out.defaults; template InternalMarkup() { import std.array; diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/io_out/epub3.d index f46ff6e..14038a8 100644 --- a/src/doc_reform/output/epub3.d +++ b/src/doc_reform/io_out/epub3.d @@ -1,6 +1,6 @@ -module doc_reform.output.epub3; +module doc_reform.io_out.epub3; template outputEPub3() { - import doc_reform.output; + import doc_reform.io_out; import std.digest.sha, std.file, @@ -9,9 +9,9 @@ template outputEPub3() { std.zip, std.conv : to; import - doc_reform.output.create_zip_file, - doc_reform.output.xmls, - doc_reform.output.xmls_css; + doc_reform.io_out.create_zip_file, + doc_reform.io_out.xmls, + doc_reform.io_out.xmls_css; mixin InternalMarkup; mixin outputXHTMLs; string epub3_mimetypes() { diff --git a/src/doc_reform/output/html.d b/src/doc_reform/io_out/html.d index 07da3c1..36e0219 100644 --- a/src/doc_reform/output/html.d +++ b/src/doc_reform/io_out/html.d @@ -1,6 +1,6 @@ -module doc_reform.output.html; +module doc_reform.io_out.html; template outputHTML() { - import doc_reform.output; + import doc_reform.io_out; import std.digest.sha, std.file, @@ -9,9 +9,9 @@ template outputHTML() { std.zip, std.conv : to; import - doc_reform.output.create_zip_file, - doc_reform.output.xmls, - doc_reform.output.xmls_css; + doc_reform.io_out.create_zip_file, + doc_reform.io_out.xmls, + doc_reform.io_out.xmls_css; mixin outputXHTMLs; void scroll(D,M)( const D doc_abstraction, diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/io_out/hub.d index acb8a68..8de07d8 100644 --- a/src/doc_reform/output/hub.d +++ b/src/doc_reform/io_out/hub.d @@ -2,13 +2,13 @@ output hub<BR> check & generate output types requested +/ -module doc_reform.output.hub; +module doc_reform.io_out.hub; template outputHub() { - import doc_reform.output, - doc_reform.output.xmls, - doc_reform.output.odt, - doc_reform.output.create_zip_file, - doc_reform.output.paths_output; + import doc_reform.io_out, + doc_reform.io_out.xmls, + doc_reform.io_out.odt, + doc_reform.io_out.create_zip_file, + doc_reform.io_out.paths_output; import std.parallelism; void outputHub(D,I)(const D doc_abstraction, I doc_matters) { mixin spineOutputRgxInit; @@ -25,7 +25,7 @@ template outputHub() { if (doc_matters.opt.action.pod) { msg.v("spine (doc reform) source pod processing... "); } - import doc_reform.output.source_pod; + import doc_reform.io_out.source_pod; spinePod!()(doc_matters); if (doc_matters.opt.action.source) { msg.vv("spine (doc reform) source done"); @@ -36,43 +36,43 @@ template outputHub() { } if (sched == outTask.epub) { msg.v("epub3 processing... "); - import doc_reform.output.epub3; + import doc_reform.io_out.epub3; doc_abstraction.outputEPub3!()(doc_matters); msg.vv("epub3 done"); } if (sched == outTask.html_scroll) { msg.v("html scroll processing... "); - import doc_reform.output.html; + import doc_reform.io_out.html; outputHTML!().scroll(doc_abstraction, doc_matters); msg.vv("html scroll done"); } if (sched == outTask.html_seg) { msg.v("html seg processing... "); - import doc_reform.output.html; + import doc_reform.io_out.html; outputHTML!().seg(doc_abstraction, doc_matters); msg.vv("html seg done"); } if (sched == outTask.html_stuff) { - import doc_reform.output.html; + import doc_reform.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 doc_reform.output.latex; + import doc_reform.io_out.latex; outputLaTeX!()(doc_abstraction, doc_matters); msg.vv("latex done"); } if (sched == outTask.odt) { msg.v("odf:odt processing... "); - import doc_reform.output.odt; + import doc_reform.io_out.odt; outputODT!()(doc_abstraction, doc_matters); msg.vv("odf:odt done"); } if (sched == outTask.sqlite) { msg.v("sqlite processing... "); - import doc_reform.output.sqlite; + import doc_reform.io_out.sqlite; doc_abstraction.SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters); msg.vv("sqlite done"); } @@ -91,23 +91,23 @@ template outputHub() { } if (doc_matters.opt.action.sqlite_update) { msg.v("sqlite update processing..."); - import doc_reform.output.sqlite; + import doc_reform.io_out.sqlite; doc_abstraction.SQLiteHubBuildTablesAndPopulate!()(doc_matters); msg.vv("sqlite update done"); } else if (doc_matters.opt.action.sqlite_delete) { msg.v("sqlite delete processing..."); - import doc_reform.output.sqlite; + import doc_reform.io_out.sqlite; doc_abstraction.SQLiteHubBuildTablesAndPopulate!()(doc_matters); msg.vv("sqlite delete done"); } } } template outputHubOp() { - import doc_reform.output, - doc_reform.output.xmls, - doc_reform.output.odt, - doc_reform.output.create_zip_file, - doc_reform.output.paths_output; + import doc_reform.io_out, + doc_reform.io_out.xmls, + doc_reform.io_out.odt, + doc_reform.io_out.create_zip_file, + doc_reform.io_out.paths_output; void outputHubOp(E,O)(E env, O opt_action) { mixin spineOutputRgxInit; static auto rgx = Rgx(); @@ -115,7 +115,7 @@ template outputHubOp() { if ((opt_action.verbose)) { writeln("sqlite drop db..."); } - import doc_reform.output.sqlite; + import doc_reform.io_out.sqlite; SQLiteDbDrop!()(opt_action); if ((opt_action.very_verbose)) { writeln("sqlite drop db done"); @@ -125,7 +125,7 @@ template outputHubOp() { if ((opt_action.verbose)) { writeln("sqlite create table..."); } - import doc_reform.output.sqlite; + import doc_reform.io_out.sqlite; SQLiteTablesCreate!()(env, opt_action); if ((opt_action.very_verbose)) { writeln("sqlite create table done"); diff --git a/src/doc_reform/output/latex.d b/src/doc_reform/io_out/latex.d index 8308067..6e651dd 100644 --- a/src/doc_reform/output/latex.d +++ b/src/doc_reform/io_out/latex.d @@ -1,6 +1,6 @@ -module doc_reform.output.latex; +module doc_reform.io_out.latex; template outputLaTeX() { - import doc_reform.output; + import doc_reform.io_out; import std.digest.sha, std.file, diff --git a/src/doc_reform/output/odt.d b/src/doc_reform/io_out/odt.d index 2d0c45d..dbb8e5d 100644 --- a/src/doc_reform/output/odt.d +++ b/src/doc_reform/io_out/odt.d @@ -1,6 +1,6 @@ -module doc_reform.output.odt; +module doc_reform.io_out.odt; template formatODT() { - import doc_reform.output; + import doc_reform.io_out; import std.digest.sha, std.file, @@ -9,9 +9,9 @@ template formatODT() { std.zip, std.conv : to; import - doc_reform.output.create_zip_file, - doc_reform.output.xmls, - doc_reform.output.xmls_css; + doc_reform.io_out.create_zip_file, + doc_reform.io_out.xmls, + doc_reform.io_out.xmls_css; mixin spineOutputRgxInit; struct formatODT { static auto rgx = Rgx(); @@ -590,7 +590,7 @@ template formatODT() { } } template outputODT() { - import doc_reform.output; + import doc_reform.io_out; import std.digest.sha, std.file, @@ -599,9 +599,9 @@ template outputODT() { std.zip, std.conv : to; import - doc_reform.output.create_zip_file, - doc_reform.output.xmls, - doc_reform.output.xmls_css; + doc_reform.io_out.create_zip_file, + doc_reform.io_out.xmls, + doc_reform.io_out.xmls_css; mixin InternalMarkup; mixin spineOutputRgxInit; auto rgx = Rgx(); diff --git a/src/doc_reform/output/package.d b/src/doc_reform/io_out/package.d index 5e14e8a..1f11046 100644 --- a/src/doc_reform/output/package.d +++ b/src/doc_reform/io_out/package.d @@ -1,4 +1,4 @@ -module doc_reform.output; +module doc_reform.io_out; public import std.algorithm, std.array, @@ -16,7 +16,7 @@ public import std.utf; public import doc_reform.share.defaults, - doc_reform.source.paths_source, - doc_reform.output.defaults, - doc_reform.output.paths_output, - doc_reform.output.rgx; + doc_reform.io_in.paths_source, + doc_reform.io_out.defaults, + doc_reform.io_out.paths_output, + doc_reform.io_out.rgx; diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/io_out/paths_output.d index bc4da76..5f474a6 100644 --- a/src/doc_reform/output/paths_output.d +++ b/src/doc_reform/io_out/paths_output.d @@ -1,7 +1,7 @@ /++ default settings +/ -module doc_reform.output.paths_output; +module doc_reform.io_out.paths_output; import std.array, std.path, std.regex, diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/io_out/rgx.d index cda3d5e..4d0801c 100644 --- a/src/doc_reform/output/rgx.d +++ b/src/doc_reform/io_out/rgx.d @@ -1,9 +1,9 @@ /++ regex: regular expressions used in sisu document parser +/ -module doc_reform.output.rgx; +module doc_reform.io_out.rgx; static template spineOutputRgxInit() { - import doc_reform.output.defaults; + import doc_reform.io_out.defaults; static struct Rgx { static newline = ctRegex!("\n", "mg"); static space = ctRegex!(`[ ]`, "mg"); diff --git a/src/doc_reform/output/source_pod.d b/src/doc_reform/io_out/source_pod.d index 8fbfa0c..31c0b45 100644 --- a/src/doc_reform/output/source_pod.d +++ b/src/doc_reform/io_out/source_pod.d @@ -1,6 +1,6 @@ -module doc_reform.output.source_pod; +module doc_reform.io_out.source_pod; template spinePod() { - import doc_reform.output; + import doc_reform.io_out; import std.digest.sha, std.file, @@ -8,8 +8,8 @@ template spinePod() { std.zip, std.conv : to; import - doc_reform.output.create_zip_file, - doc_reform.output.xmls; + doc_reform.io_out.create_zip_file, + doc_reform.io_out.xmls; void spinePod(T)(T doc_matters) { debug(asserts) { // static assert(is(typeof(doc_matters) == tuple)); diff --git a/src/doc_reform/output/sqlite.d b/src/doc_reform/io_out/sqlite.d index 3f277c0..0995fe1 100644 --- a/src/doc_reform/output/sqlite.d +++ b/src/doc_reform/io_out/sqlite.d @@ -1,5 +1,5 @@ -module doc_reform.output.sqlite; -import doc_reform.output; +module doc_reform.io_out.sqlite; +import doc_reform.io_out; import std.file, std.uri, diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/io_out/xmls.d index ae904bb..a906d89 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -1,6 +1,6 @@ -module doc_reform.output.xmls; +module doc_reform.io_out.xmls; template outputXHTMLs() { - import doc_reform.output; + import doc_reform.io_out; import std.digest.sha, std.file, @@ -9,9 +9,9 @@ template outputXHTMLs() { std.zip, std.conv : to; import - doc_reform.output.create_zip_file, - doc_reform.output.xmls, - doc_reform.output.xmls_css; + doc_reform.io_out.create_zip_file, + doc_reform.io_out.xmls, + doc_reform.io_out.xmls_css; mixin spineOutputRgxInit; struct outputXHTMLs { static auto rgx = Rgx(); diff --git a/src/doc_reform/output/xmls_css.d b/src/doc_reform/io_out/xmls_css.d index 553d9da..2c3eb77 100644 --- a/src/doc_reform/output/xmls_css.d +++ b/src/doc_reform/io_out/xmls_css.d @@ -1,7 +1,7 @@ /++ default css settings +/ -module doc_reform.output.xmls_css; +module doc_reform.io_out.xmls_css; template spineCss() { import std.format; auto spineCss(M)(M doc_matters) { diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d index 0d6e7a5..1620281 100644 --- a/src/doc_reform/meta/metadoc.d +++ b/src/doc_reform/meta/metadoc.d @@ -17,10 +17,10 @@ template spineAbstraction() { doc_reform.meta.defaults, doc_reform.meta.doc_debugs, doc_reform.meta.rgx, - doc_reform.source.paths_source, - doc_reform.source.read_config_files, - doc_reform.source.read_source_files, - doc_reform.output.hub; + doc_reform.io_in.paths_source, + doc_reform.io_in.read_config_files, + doc_reform.io_in.read_source_files, + doc_reform.io_out.hub; mixin spineRgxInit; mixin contentJSONtoSpineStruct; mixin spineBiblio; diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 511f761..ab87eb2 100644 --- a/src/doc_reform/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -15,7 +15,7 @@ template docAbstraction() { std.path; import doc_reform.meta.defaults, - doc_reform.meta.object_setter, + doc_reform.meta.metadoc_object_setter, doc_reform.meta.rgx; /+ ↓ abstraction mixins +/ mixin ObjectSetter; diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_harvest.d index 37c375a..ca9801f 100644 --- a/src/doc_reform/meta/metadoc_harvest.d +++ b/src/doc_reform/meta/metadoc_harvest.d @@ -20,7 +20,7 @@ template spineMetaDocHarvest() { std.conv : to; mixin InternalMarkup; auto markup = InlineMarkup(); - import doc_reform.output.paths_output; + import doc_reform.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.harvest.title = doc_matters.conf_make_meta.meta.title_full; diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d index 21e8f28..f733a80 100644 --- a/src/doc_reform/meta/metadoc_harvests_authors.d +++ b/src/doc_reform/meta/metadoc_harvests_authors.d @@ -347,7 +347,7 @@ string theme_light_1 = format(q"┃ </body> </html> ┃") ~ "\n"; - import doc_reform.output.paths_output; + import doc_reform.io_out.paths_output; auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); try { auto f = File(out_pth.harvest("authors.html"), "w"); diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_harvests_topics.d index ea43d5a..7c7efc3 100644 --- a/src/doc_reform/meta/metadoc_harvests_topics.d +++ b/src/doc_reform/meta/metadoc_harvests_topics.d @@ -506,7 +506,7 @@ string theme_light_1 = format(q"┃ </body> </html> ┃") ~ "\n"; - import doc_reform.output.paths_output; + import doc_reform.io_out.paths_output; auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); try { auto f = File(out_pth.harvest("topics.html"), "w"); diff --git a/src/doc_reform/meta/object_setter.d b/src/doc_reform/meta/metadoc_object_setter.d index 0ce74fd..908d168 100644 --- a/src/doc_reform/meta/object_setter.d +++ b/src/doc_reform/meta/metadoc_object_setter.d @@ -1,9 +1,9 @@ /++ object setter: setting of sisu objects for downstream processing - meta_object_setter.d + metadoc_object_setter.d +/ -module doc_reform.meta.object_setter; +module doc_reform.meta.metadoc_object_setter; template ObjectSetter() { /+ structs +/ struct DocObj_MetaInfo_ { diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d index c70b87c..51e571d 100755 --- a/src/doc_reform/spine.d +++ b/src/doc_reform/spine.d @@ -71,10 +71,10 @@ import doc_reform.meta.defaults, doc_reform.meta.doc_debugs, doc_reform.meta.rgx, - doc_reform.source.paths_source, - doc_reform.source.read_config_files, - doc_reform.source.read_source_files, - doc_reform.output.hub; + doc_reform.io_in.paths_source, + doc_reform.io_in.read_config_files, + doc_reform.io_in.read_source_files, + doc_reform.io_out.hub; import std.algorithm; import std.parallelism; mixin(import("version.txt")); @@ -942,7 +942,7 @@ void main(string[] args) { spineMetaDocHarvestsAuthors!()(hvst.harvests, _make_and_meta_struct, _opt_action); } if (!(_opt_action.quiet)) { - import doc_reform.output.paths_output; + import doc_reform.io_out.paths_output; auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); if (_opt_action.harvest_authors) { writeln("- ", out_pth.harvest("authors.html")); |