imports related, mostly cosmetic

1 files changed, 29 insertions, 11 deletions

diff --git a/org/spine.org b/org/spine.org
index 72d3b1d..4b66711 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -84,21 +84,16 @@ version (Posix) {
 #+BEGIN_SRC d  :tangle "../src/doc_reform/spine.d" :shebang "#!/usr/bin/env rdmd"
 <<doc_header_including_copyright_and_license>>
 module doc_reform.sisu_document_parser;
-import
-  doc_reform.conf.compile_time_info,
-  doc_reform.meta.metadoc;
-<<imports_spine>>
-import std.algorithm;
-import std.parallelism;
-<<mixin_spine_version>>
-<<mixin_pre_main>>
-string project_name = "spine";
-string program_name = "spine";
 /++
 name        "spine"
 description "A SiSU inspired document parser writen in D."
 homepage    "http://sisudoc.org"
 +/
+<<imports_spine>>
+<<mixin_spine_version>>
+<<mixin_pre_main>>
+string project_name = "spine";
+string program_name = "spine";
 @system void main(string[] args) {
   <<spine_mixin>>
   <<spine_init>>
@@ -107,6 +102,7 @@ homepage    "http://sisudoc.org"
   if (_manifests.length > 1                            // _manifests[0] initialized dummy element
   && _opt_action.abstraction) {
     if (_opt_action.parallelise) {                     // see else
+      import std.parallelism;
       foreach(manifest; parallel(_manifests[1..$])) {
         if (!empty(manifest.src.filename)) {
           <<spine_each_file_do_scope>>
@@ -219,13 +215,16 @@ homepage    "http://sisudoc.org"
 #+NAME: imports_spine
 #+BEGIN_SRC d
 import
+  std.algorithm,
   std.datetime,
   std.getopt,
   std.file,
   std.path,
   std.process;
 import
+  doc_reform.conf.compile_time_info,
   doc_reform.meta,
+  doc_reform.meta.metadoc,
   doc_reform.meta.metadoc_harvest,
   doc_reform.meta.metadoc_harvests_authors,
   doc_reform.meta.metadoc_harvests_topics,
@@ -241,6 +240,25 @@ import
   doc_reform.io_out.hub;
 #+END_SRC
 
+***** spine__metadoc                                                   :spine:
+
+#+NAME: imports_spine_metadoc
+#+BEGIN_SRC d
+import
+  std.datetime;
+import
+  doc_reform.meta,
+  doc_reform.meta.metadoc_from_src,
+  doc_reform.meta.conf_make_meta_structs,
+  doc_reform.meta.conf_make_meta_json,
+  doc_reform.meta.defaults,
+  doc_reform.meta.rgx,
+  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
 ├── src
 │   ├── doc_reform.d
@@ -1176,7 +1194,7 @@ break; // terminate, stop
 #+BEGIN_SRC d  :tangle "../src/doc_reform/meta/metadoc.d"
 module doc_reform.meta.metadoc;
 template spineAbstraction() {
-  <<imports_spine>>
+  <<imports_spine_metadoc>>
   <<spine_mixin>>
   enum headBody { header, body_content, insert_file_list, image_list }
   enum makeMeta { make, meta }