diff options
-rw-r--r-- | makefile | 8 | ||||
-rw-r--r-- | meson.build | 42 | ||||
-rw-r--r-- | org/default_misc.org | 5 | ||||
-rw-r--r-- | org/default_paths.org | 8 | ||||
-rw-r--r-- | org/default_regex.org | 7 | ||||
-rw-r--r-- | org/imports.org | 12 | ||||
-rw-r--r-- | org/in_source_files.org | 10 | ||||
-rw-r--r-- | org/metaverse.org | 10 | ||||
-rw-r--r-- | org/out_harvest_metadata.org | 6 | ||||
-rw-r--r-- | org/out_latex.org | 6 | ||||
-rw-r--r-- | org/out_odt.org | 12 | ||||
-rw-r--r-- | org/out_sqlite.org | 24 | ||||
-rw-r--r-- | org/out_src_pod.org | 10 | ||||
-rw-r--r-- | org/out_xmls.org | 20 | ||||
-rw-r--r-- | org/out_xmls_css.org | 4 | ||||
-rw-r--r-- | org/out_zip.org | 4 | ||||
-rw-r--r-- | org/output_hub.org | 38 | ||||
-rw-r--r-- | org/spine.org | 10 | ||||
-rw-r--r-- | org/spine_build_scaffold.org | 50 | ||||
-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 |
43 files changed, 233 insertions, 231 deletions
@@ -2,8 +2,8 @@ PROG_VER_GIT :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\ PROG_VER_DECLARED :=$(shell echo `cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`) DUB=dub DUB_FLAGS=-v --force --compiler= -PRG_NAME=spine -PRG_NICKAME=rad +PRG_NAME=doc-reform +PRG_NICKAME=spine PRG_NAME_DIR=$(shell echo `echo $(PRG_NAME) | sed -e "s/-/_/g"`) PRG_SRC=$(PRG_NAME).d PRG_SRCDIR=./src @@ -162,10 +162,10 @@ skel: mkdir -p data; \ mkdir -p util; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/conf; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_in; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_out; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/meta; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/output; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/share; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/source; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \ mkdir -p $(PRG_BINDIR); init: skel diff --git a/meson.build b/meson.build index 97ad4cb..05be115 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,23 @@ project('spine', 'd', spine_sources = [ 'src/doc_reform/spine.d', 'src/doc_reform/conf/compile_time_info.d', + 'src/doc_reform/io_in/paths_source.d', + 'src/doc_reform/io_in/read_config_files.d', + 'src/doc_reform/io_in/read_source_files.d', + 'src/doc_reform/io_out/create_zip_file.d', + 'src/doc_reform/io_out/defaults.d', + 'src/doc_reform/io_out/epub3.d', + 'src/doc_reform/io_out/html.d', + 'src/doc_reform/io_out/hub.d', + 'src/doc_reform/io_out/latex.d', + 'src/doc_reform/io_out/odt.d', + 'src/doc_reform/io_out/package.d', + 'src/doc_reform/io_out/paths_output.d', + 'src/doc_reform/io_out/rgx.d', + 'src/doc_reform/io_out/source_pod.d', + 'src/doc_reform/io_out/sqlite.d', + 'src/doc_reform/io_out/xmls_css.d', + 'src/doc_reform/io_out/xmls.d', 'src/doc_reform/meta/conf_make_meta_json.d', 'src/doc_reform/meta/conf_make_meta_structs.d', 'src/doc_reform/meta/conf_make_meta_yaml.d', @@ -16,29 +33,14 @@ spine_sources = [ 'src/doc_reform/meta/metadoc_harvest.d', 'src/doc_reform/meta/metadoc_harvests_authors.d', 'src/doc_reform/meta/metadoc_harvests_topics.d', - 'src/doc_reform/meta/metadochead.d', + 'src/doc_reform/meta/metadoc_object_setter.d', + 'src/doc_reform/meta/metadoc_show_config.d', + 'src/doc_reform/meta/metadoc_show_make.d', + 'src/doc_reform/meta/metadoc_show_metadata.d', 'src/doc_reform/meta/metadoc_show_summary.d', - 'src/doc_reform/meta/object_setter.d', 'src/doc_reform/meta/package.d', 'src/doc_reform/meta/rgx.d', - 'src/doc_reform/output/create_zip_file.d', - 'src/doc_reform/output/defaults.d', - 'src/doc_reform/output/epub3.d', - 'src/doc_reform/output/html.d', - 'src/doc_reform/output/hub.d', - 'src/doc_reform/output/latex.d', - 'src/doc_reform/output/odt.d', - 'src/doc_reform/output/package.d', - 'src/doc_reform/output/paths_output.d', - 'src/doc_reform/output/rgx.d', - 'src/doc_reform/output/source_pod.d', - 'src/doc_reform/output/sqlite.d', - 'src/doc_reform/output/xmls_css.d', - 'src/doc_reform/output/xmls.d', 'src/doc_reform/share/defaults.d', - 'src/doc_reform/source/paths_source.d', - 'src/doc_reform/source/read_config_files.d', - 'src/doc_reform/source/read_source_files.d', ] source_root = meson.source_root() sources_dir = include_directories('src/') @@ -46,7 +48,7 @@ sources_dir = include_directories('src/') dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.16.2', fallback: ['d2sqlite3', 'd2sqlite3_dep']) dep_imageformats = dependency('imageformats-d', version: '>= 7.0.0', fallback: ['imageformats-d', 'imageformats_dep']) # executable -spine_exe = executable('rad', +spine_exe = executable('dr', [spine_sources], include_directories : [sources_dir], d_import_dirs: [include_directories('views')], diff --git a/org/default_misc.org b/org/default_misc.org index c66351d..b38a7b2 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -214,12 +214,11 @@ template spineBiblio() { * 1. output defaults :module:output: ** _module template_ -#+name: tangle_defaults -#+BEGIN_SRC d :tangle "../src/doc_reform/output/defaults.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/defaults.d" /++ default settings +/ -module doc_reform.output.defaults; +module doc_reform.io_out.defaults; <<defaults_template_init_flags>> <<defaults_template_markup>> <<defaults_template_language_codes>> diff --git a/org/default_paths.org b/org/default_paths.org index 99f7909..3092571 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -19,13 +19,13 @@ * 0. source paths ** _module template_ :module:paths_source: -#+BEGIN_SRC d :tangle "../src/doc_reform/source/paths_source.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_in/paths_source.d" /++ read configuration files<BR> - 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, @@ -961,11 +961,11 @@ template spinePathsPods() { * 1. output paths ** _module template_ :module:paths_output: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/paths_output.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/paths_output.d" /++ 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/org/default_regex.org b/org/default_regex.org index 17fb605..bdd7863 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -364,14 +364,13 @@ http://dlang.org/phobos/std_regex.html ** _module template_ :module:output: -#+name: tangle_meta_rgx -#+BEGIN_SRC d :tangle "../src/doc_reform/output/rgx.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/rgx.d" /++ 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 { <<prgmkup_rgx>> <<sp_ch_xhtml_rgx>> diff --git a/org/imports.org b/org/imports.org index b835ad9..45705a4 100644 --- a/org/imports.org +++ b/org/imports.org @@ -48,8 +48,8 @@ public import * imports for _output_ :output: ** package dir -#+BEGIN_SRC d :tangle "../src/doc_reform/output/package.d" -module doc_reform.output; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/package.d" +module doc_reform.io_out; <<imports_for_output_general>> #+END_SRC @@ -74,10 +74,10 @@ 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; #+END_SRC * __END__ diff --git a/org/in_source_files.org b/org/in_source_files.org index 548c6e5..b5496b5 100644 --- a/org/in_source_files.org +++ b/org/in_source_files.org @@ -22,7 +22,7 @@ #+BEGIN_SRC d import doc_reform.meta, - doc_reform.source.paths_source, + doc_reform.io_in.paths_source, std.file, std.path; #+END_SRC @@ -30,13 +30,13 @@ import * A. get _config file_ (read in) ** _module template_ :module:config_files: -#+BEGIN_SRC d :tangle "../src/doc_reform/source/read_config_files.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_in/read_config_files.d" /++ read configuration files<BR> - read config files<BR> meta_config_files.d +/ -module doc_reform.source.read_config_files; +module doc_reform.io_in.read_config_files; <<meta_config_file_in>> <<meta_config_file_hub>> #+END_SRC @@ -215,13 +215,13 @@ static template configReadDocYAML() { * B. get _markup source_, read file :module:source_files: ** _module template_ (includes tuple) -#+BEGIN_SRC d :tangle "../src/doc_reform/source/read_source_files.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_in/read_source_files.d" /++ module source_read_source_files;<BR> - 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; diff --git a/org/metaverse.org b/org/metaverse.org index c5fa4ba..538e12b 100644 --- a/org/metaverse.org +++ b/org/metaverse.org @@ -153,7 +153,7 @@ import std.path; import doc_reform.meta.defaults, - doc_reform.meta.object_setter, + doc_reform.meta.metadoc_object_setter, doc_reform.meta.rgx; #+END_SRC @@ -7599,19 +7599,19 @@ template docSectKeysSeq() { } #+END_SRC -* 2. Object Setter (Set Abstract Object) :module:spine:meta_object_setter: +* 2. Object Setter (Set Abstract Object) :module:spine:metadoc_object_setter: set abstracted objects for downstream processing ** _module template_ -#+BEGIN_SRC d :tangle "../src/doc_reform/meta/object_setter.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_object_setter.d" /++ 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 +/ <<meta_structs_init>> diff --git a/org/out_harvest_metadata.org b/org/out_harvest_metadata.org index b99820e..d893e26 100644 --- a/org/out_harvest_metadata.org +++ b/org/out_harvest_metadata.org @@ -87,7 +87,7 @@ writefln( #+name: meta_metadoc_harvest #+BEGIN_SRC d -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; @@ -418,7 +418,7 @@ foreach(k0; #+NAME: harvested_topics_html_write #+BEGIN_SRC d -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"); @@ -568,7 +568,7 @@ template spineMetaDocHarvestsAuthors() { #+NAME: harvested_authors_html_write #+BEGIN_SRC d -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/org/out_latex.org b/org/out_latex.org index 888507e..5f2021c 100644 --- a/org/out_latex.org +++ b/org/out_latex.org @@ -19,8 +19,8 @@ * latex ** _module template_ :latex:pdf:module: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/latex.d" :noweb yes -module doc_reform.output.latex; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/latex.d" :noweb yes +module doc_reform.io_out.latex; template outputLaTeX() { <<output_latex_imports>> mixin InternalMarkup; // watch @@ -113,7 +113,7 @@ void outputLaTeX(D,M)( #+name: output_latex_imports #+BEGIN_SRC d -import doc_reform.output; +import doc_reform.io_out; import std.digest.sha, std.file, diff --git a/org/out_odt.org b/org/out_odt.org index 966554d..61879a3 100644 --- a/org/out_odt.org +++ b/org/out_odt.org @@ -44,8 +44,8 @@ ** _module template_ :odf:odt:module: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/odt.d" :noweb yes -module doc_reform.output.odt; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/odt.d" :noweb yes +module doc_reform.io_out.odt; template formatODT() { <<output_imports>> mixin spineOutputRgxInit; @@ -969,7 +969,7 @@ void outputODT(D,I)( #+name: output_imports #+BEGIN_SRC d -import doc_reform.output; +import doc_reform.io_out; import std.digest.sha, std.file, @@ -978,9 +978,9 @@ import 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; #+END_SRC *** make directory tree diff --git a/org/out_sqlite.org b/org/out_sqlite.org index bebad0e..0f61a03 100644 --- a/org/out_sqlite.org +++ b/org/out_sqlite.org @@ -23,8 +23,8 @@ *** hub **** collection -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" -module doc_reform.output.sqlite; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" +module doc_reform.io_out.sqlite; <<output_imports>> import d2sqlite3; import std.typecons : Nullable; @@ -60,7 +60,7 @@ template SQLiteHubBuildTablesAndPopulate() { **** discrete -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteHubDiscreteBuildTablesAndPopulate() { void SQLiteHubDiscreteBuildTablesAndPopulate(D,M)( const D doc_abstraction, @@ -89,7 +89,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { *** db run -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteDbRun() { void SQLiteDbRun(Db,St,O)( Db db, @@ -130,7 +130,7 @@ template SQLiteDbRun() { *** munge -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLinsertDelimiter() { auto SQLinsertDelimiter(string _txt) { _txt = _txt @@ -158,7 +158,7 @@ template SQLiteFormatAndLoadObject() { *** sqlite instructions **** create -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteTablesReCreate() { string SQLiteTablesReCreate()() { string _sql_instruct; @@ -177,7 +177,7 @@ template SQLiteTablesReCreate() { **** delete -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteDeleteDocument() { string SQLiteDeleteDocument(M)( M doc_matters, @@ -190,7 +190,7 @@ template SQLiteDeleteDocument() { **** insert -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteInsertMetadata() { string SQLiteInsertMetadata(M)( M doc_matters, @@ -204,7 +204,7 @@ template SQLiteInsertMetadata() { **** insert doc objects loop -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteInsertDocObjectsLoop() { string SQLiteInsertDocObjectsLoop(D,M)( const D doc_abstraction, @@ -223,7 +223,7 @@ template SQLiteInsertDocObjectsLoop() { **** tables create -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteTablesCreate() { void SQLiteTablesCreate(E,O)(E env, O opt_action) { import d2sqlite3; @@ -257,7 +257,7 @@ template SQLiteTablesCreate() { **** tables drop -#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/sqlite.d" template SQLiteDbDrop() { void SQLiteDbDrop(O)(O opt_action) { writeln("db drop"); @@ -326,7 +326,7 @@ template SQLiteDbDrop() { #+name: output_imports #+BEGIN_SRC d -import doc_reform.output; +import doc_reform.io_out; import std.file, std.uri, diff --git a/org/out_src_pod.org b/org/out_src_pod.org index ab0e14b..fa0bedb 100644 --- a/org/out_src_pod.org +++ b/org/out_src_pod.org @@ -21,8 +21,8 @@ * pod ** _module template_ :module: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/source_pod.d" -module doc_reform.output.source_pod; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/source_pod.d" +module doc_reform.io_out.source_pod; template spinePod() { <<output_imports>> void spinePod(T)(T doc_matters) { @@ -44,7 +44,7 @@ template spinePod() { #+name: output_imports #+BEGIN_SRC d -import doc_reform.output; +import doc_reform.io_out; import std.digest.sha, std.file, @@ -52,8 +52,8 @@ import 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; #+END_SRC *** init diff --git a/org/out_xmls.org b/org/out_xmls.org index d29a993..54b40aa 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -22,8 +22,8 @@ ** format xhtml objects :format: *** _module template_ :module: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/xmls.d" -module doc_reform.output.xmls; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/xmls.d" +module doc_reform.io_out.xmls; template outputXHTMLs() { <<output_imports>> mixin spineOutputRgxInit; @@ -39,7 +39,7 @@ template outputXHTMLs() { #+name: output_imports #+BEGIN_SRC d -import doc_reform.output; +import doc_reform.io_out; import std.digest.sha, std.file, @@ -48,9 +48,9 @@ import 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; #+END_SRC *** misc @@ -1514,8 +1514,8 @@ string table(O,M)( * _html_ [#A] :html: ** _module template_ :module: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/html.d" -module doc_reform.output.html; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/html.d" +module doc_reform.io_out.html; template outputHTML() { <<output_imports>> mixin outputXHTMLs; @@ -2176,8 +2176,8 @@ void images_cp(M)( ** _module template_ :module: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/epub3.d" -module doc_reform.output.epub3; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/epub3.d" +module doc_reform.io_out.epub3; template outputEPub3() { <<output_imports>> mixin InternalMarkup; diff --git a/org/out_xmls_css.org b/org/out_xmls_css.org index a53c065..104dc34 100644 --- a/org/out_xmls_css.org +++ b/org/out_xmls_css.org @@ -21,11 +21,11 @@ * 0. output css defaults :module:spine:output_xmls_css: ** _module template_ -#+BEGIN_SRC d :tangle "../src/doc_reform/output/xmls_css.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/xmls_css.d" /++ 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/org/out_zip.org b/org/out_zip.org index 3007412..ef4b036 100644 --- a/org/out_zip.org +++ b/org/out_zip.org @@ -22,8 +22,8 @@ * _zip_ :module:spine:create_zip_file: ** module template -#+BEGIN_SRC d :tangle "../src/doc_reform/output/create_zip_file.d" -module doc_reform.output.create_zip_file; +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/create_zip_file.d" +module doc_reform.io_out.create_zip_file; template createZipFile() { import std.file; import std.outbuffer; diff --git a/org/output_hub.org b/org/output_hub.org index a8b9e01..90464a3 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -20,12 +20,12 @@ * output hub [#A] ** _module template_ :module: -#+BEGIN_SRC d :tangle "../src/doc_reform/output/hub.d" +#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/hub.d" /++ output hub<BR> check & generate output types requested +/ -module doc_reform.output.hub; +module doc_reform.io_out.hub; template outputHub() { <<output_imports>> import std.parallelism; @@ -68,11 +68,11 @@ template outputHubOp() { #+name: output_imports #+BEGIN_SRC d -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; #+END_SRC ** outputs @@ -89,7 +89,7 @@ if (sched == outTask.source_or_pod) { 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"); @@ -106,7 +106,7 @@ if (sched == outTask.source_or_pod) { #+BEGIN_SRC d 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"); } @@ -119,7 +119,7 @@ if (sched == outTask.epub) { #+BEGIN_SRC d 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"); } @@ -131,7 +131,7 @@ if (sched == outTask.html_scroll) { #+BEGIN_SRC d 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"); } @@ -142,7 +142,7 @@ if (sched == outTask.html_seg) { #+name: output_scheduled_task #+BEGIN_SRC d 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"); @@ -155,7 +155,7 @@ if (sched == outTask.html_stuff) { #+BEGIN_SRC d 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"); } @@ -167,7 +167,7 @@ if (sched == outTask.latex) { #+BEGIN_SRC d 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"); } @@ -179,7 +179,7 @@ if (sched == outTask.odt) { #+BEGIN_SRC d 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"); } @@ -193,12 +193,12 @@ if (sched == outTask.sqlite) { #+BEGIN_SRC d 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"); } @@ -213,7 +213,7 @@ if ((opt_action.sqlite_db_drop)) { 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"); @@ -229,7 +229,7 @@ if ((opt_action.sqlite_db_create)) { 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/org/spine.org b/org/spine.org index a0be34d..b08be4f 100644 --- a/org/spine.org +++ b/org/spine.org @@ -127,7 +127,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")); @@ -221,10 +221,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; #+END_SRC ****** notes diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org index 695cff0..9d16a38 100644 --- a/org/spine_build_scaffold.org +++ b/org/spine_build_scaffold.org @@ -36,8 +36,8 @@ DUB_FLAGS=-v --force --compiler= *** Project Details :project:spine: #+BEGIN_SRC makefile :tangle ../makefile -PRG_NAME=spine -PRG_NICKAME=rad +PRG_NAME=doc-reform +PRG_NICKAME=spine PRG_NAME_DIR=$(shell echo `echo $(PRG_NAME) | sed -e "s/-/_/g"`) PRG_SRC=$(PRG_NAME).d PRG_SRCDIR=./src @@ -365,10 +365,10 @@ skel: mkdir -p data; \ mkdir -p util; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/conf; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_in; \ + mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_out; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/meta; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/output; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/share; \ - mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/source; \ mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \ mkdir -p $(PRG_BINDIR); init: skel @@ -1007,6 +1007,23 @@ project('spine', 'd', spine_sources = [ 'src/doc_reform/spine.d', 'src/doc_reform/conf/compile_time_info.d', + 'src/doc_reform/io_in/paths_source.d', + 'src/doc_reform/io_in/read_config_files.d', + 'src/doc_reform/io_in/read_source_files.d', + 'src/doc_reform/io_out/create_zip_file.d', + 'src/doc_reform/io_out/defaults.d', + 'src/doc_reform/io_out/epub3.d', + 'src/doc_reform/io_out/html.d', + 'src/doc_reform/io_out/hub.d', + 'src/doc_reform/io_out/latex.d', + 'src/doc_reform/io_out/odt.d', + 'src/doc_reform/io_out/package.d', + 'src/doc_reform/io_out/paths_output.d', + 'src/doc_reform/io_out/rgx.d', + 'src/doc_reform/io_out/source_pod.d', + 'src/doc_reform/io_out/sqlite.d', + 'src/doc_reform/io_out/xmls_css.d', + 'src/doc_reform/io_out/xmls.d', 'src/doc_reform/meta/conf_make_meta_json.d', 'src/doc_reform/meta/conf_make_meta_structs.d', 'src/doc_reform/meta/conf_make_meta_yaml.d', @@ -1017,29 +1034,14 @@ spine_sources = [ 'src/doc_reform/meta/metadoc_harvest.d', 'src/doc_reform/meta/metadoc_harvests_authors.d', 'src/doc_reform/meta/metadoc_harvests_topics.d', - 'src/doc_reform/meta/metadochead.d', + 'src/doc_reform/meta/metadoc_object_setter.d', + 'src/doc_reform/meta/metadoc_show_config.d', + 'src/doc_reform/meta/metadoc_show_make.d', + 'src/doc_reform/meta/metadoc_show_metadata.d', 'src/doc_reform/meta/metadoc_show_summary.d', - 'src/doc_reform/meta/object_setter.d', 'src/doc_reform/meta/package.d', 'src/doc_reform/meta/rgx.d', - 'src/doc_reform/output/create_zip_file.d', - 'src/doc_reform/output/defaults.d', - 'src/doc_reform/output/epub3.d', - 'src/doc_reform/output/html.d', - 'src/doc_reform/output/hub.d', - 'src/doc_reform/output/latex.d', - 'src/doc_reform/output/odt.d', - 'src/doc_reform/output/package.d', - 'src/doc_reform/output/paths_output.d', - 'src/doc_reform/output/rgx.d', - 'src/doc_reform/output/source_pod.d', - 'src/doc_reform/output/sqlite.d', - 'src/doc_reform/output/xmls_css.d', - 'src/doc_reform/output/xmls.d', 'src/doc_reform/share/defaults.d', - 'src/doc_reform/source/paths_source.d', - 'src/doc_reform/source/read_config_files.d', - 'src/doc_reform/source/read_source_files.d', ] source_root = meson.source_root() sources_dir = include_directories('src/') @@ -1047,7 +1049,7 @@ sources_dir = include_directories('src/') dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.16.2', fallback: ['d2sqlite3', 'd2sqlite3_dep']) dep_imageformats = dependency('imageformats-d', version: '>= 7.0.0', fallback: ['imageformats-d', 'imageformats_dep']) # executable -spine_exe = executable('rad', +spine_exe = executable('dr', [spine_sources], include_directories : [sources_dir], d_import_dirs: [include_directories('views')], 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")); |