0.8.3 (if exists) get site config & output pathdoc-reform_v0.8.3

- read once & read early:
  - once per batch processing
  - early (needed by metadata --harvest)

6 files changed, 11 insertions, 21 deletions

diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index 3d69a3c..4b3a29c 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -20,7 +20,7 @@ static template contentJSONtoDocReformStruct() {
     doc_reform.meta.conf_make_meta_json,
     doc_reform.meta.defaults,
     doc_reform.meta.rgx;
-  ConfCompositePlus _struct_composite;
+  ConfComposite _struct_composite;
   auto contentJSONtoDocReformStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) {
     mixin DocReformRgxInit;
     static auto rgx = Rgx();
diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index f56141f..6f6ba10 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -233,11 +233,6 @@ struct MetaComposite {
 struct ConfComposite {
   MetaComposite               meta;
   ConfCompositeMakeInit       make;
-  ConfCompositeSiteLocal      conf;
-}
-struct ConfCompositePlus {
-  MetaComposite               meta;
-  ConfCompositeMakeInit       make;
   ConfCompositeMakeStr        make_str;
   ConfCompositeSiteLocal      conf;
 }
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index a9c4434..aa4d77d 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -20,7 +20,7 @@ static template contentYAMLtoDocReformStruct() {
     doc_reform.meta.conf_make_meta_structs,
     doc_reform.meta.defaults,
     doc_reform.meta.rgx;
-  ConfCompositePlus _struct_composite;
+  ConfComposite _struct_composite;
   auto contentYAMLtoDocReformStruct(C,Y,M)(
     C _struct_composite,
     Y _yaml,
diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d
index 69f7142..4fb9677 100644
--- a/src/doc_reform/meta/metadoc.d
+++ b/src/doc_reform/meta/metadoc.d
@@ -30,13 +30,13 @@ template DocReformAbstraction() {
   enum makeMeta { make, meta }
   enum docAbst  { doc_abstract_obj, doc_has }
   static auto rgx = Rgx();
-  auto DocReformAbstraction(E,P,O,M)(
+  auto DocReformAbstraction(E,P,O,M,S)(
     E _env,
     P program_info,
     O _opt_action,
-    M _manifest
+    M _manifest,
+    S _make_and_meta_struct
   ){
-    ConfCompositePlus _make_and_meta_struct;
     { /+ document config/make file +/
       auto _config_document_struct = readConfigDoc!()(_manifest, _env);
       if (_config_document_struct.filetype == "yaml") {
@@ -44,13 +44,6 @@ template DocReformAbstraction() {
         _make_and_meta_struct = _config_document_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifest);
       }
     }
-    { /+ local site config +/
-      auto _config_local_site_struct = readConfigSite!()(_manifest, _env);
-      if (_config_local_site_struct.filetype == "yaml") {
-        import doc_reform.meta.conf_make_meta_yaml;
-        _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifest);
-      }
-    }
     /+ ↓ read file (filename with path) +/
     /+ ↓ file tuple of header and content +/
     if ((_opt_action.debug_do)
diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d
index 29fcc72..23707af 100644
--- a/src/doc_reform/meta/metadoc_harvests_authors.d
+++ b/src/doc_reform/meta/metadoc_harvests_authors.d
@@ -15,8 +15,9 @@ module doc_reform.meta.metadoc_harvests_authors;
   mixin DocReformRgxInit;
 template DocReformMetaDocHarvestsAuthors() {
   auto mkup = InlineMarkup();
-  void DocReformMetaDocHarvestsAuthors(H,O)(
+  void DocReformMetaDocHarvestsAuthors(H,M,O)(
     H  harvests,
+    M  _make_and_meta_struct,
     O  _opt_action,
   ) {
 string theme_dark_0 = format(q"┃
@@ -347,7 +348,7 @@ string theme_light_1 = format(q"┃
 </html>
 ┃") ~ "\n";
     import doc_reform.output.paths_output;
-    auto out_pth = DocReformPathsHTML!()(_opt_action.output_dir_set, "");
+    auto out_pth = DocReformPathsHTML!()(_make_and_meta_struct.conf.output_path, "");
     try {
       auto f       = File(out_pth.harvest("authors.html"), "w");
       foreach (o; authors) {
diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_harvests_topics.d
index 63e4a79..f8e6514 100644
--- a/src/doc_reform/meta/metadoc_harvests_topics.d
+++ b/src/doc_reform/meta/metadoc_harvests_topics.d
@@ -15,8 +15,9 @@ module doc_reform.meta.metadoc_harvests_topics;
   mixin DocReformRgxInit;
 template DocReformMetaDocHarvestsTopics() {
   auto mkup = InlineMarkup();
-  void DocReformMetaDocHarvestsTopics(H,O)(
+  void DocReformMetaDocHarvestsTopics(H,M,O)(
     H  hvst,
+    M  _make_and_meta_struct,
     O  _opt_action,
   ) {
       auto min_repeat_number = 42;
@@ -506,7 +507,7 @@ string theme_light_1 = format(q"┃
 </html>
 ┃") ~ "\n";
     import doc_reform.output.paths_output;
-    auto out_pth = DocReformPathsHTML!()(_opt_action.output_dir_set, "");
+    auto out_pth = DocReformPathsHTML!()(_make_and_meta_struct.conf.output_path, "");
     try {
       auto f       = File(out_pth.harvest("topics.html"), "w");
       foreach (o; topics) {