1 files changed, 35 insertions, 26 deletions

diff --git a/src/sisudoc/meta/metadoc.d b/src/sisudoc/meta/metadoc.d
index 25f28b6..ffe297e 100644
--- a/src/sisudoc/meta/metadoc.d
+++ b/src/sisudoc/meta/metadoc.d
@@ -6,7 +6,7 @@
   - Author: Ralph Amissah
     [ralph.amissah@gmail.com]
 
-  - Copyright: (C) 2015 - 2024 Ralph Amissah, All Rights Reserved.
+  - Copyright: (C) 2015 - 2025 Ralph Amissah, All Rights Reserved.
 
   - License: AGPL 3 or later:
 
@@ -50,31 +50,29 @@
 module sisudoc.meta.metadoc;
 @safe:
 template spineAbstraction() {
-  import
-    std.datetime,
-    std.digest.crc,
-    std.digest.sha;
-  import
-    sisudoc.meta,
-    sisudoc.meta.metadoc_from_src,
-    sisudoc.meta.conf_make_meta_structs,
-    sisudoc.meta.conf_make_meta_json,
-    sisudoc.meta.defaults,
-    sisudoc.io_in.paths_source,
-    sisudoc.io_in.read_config_files,
-    sisudoc.io_in.read_source_files,
-    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.io_out.hub;
   mixin spineBiblio;
   mixin outputHub;
   enum makeMeta { make, meta }
   enum docAbst  { doc_abstract_obj, doc_has }
-  @system auto spineAbstraction(E,P,O,Cfg,M,S)(
-    E _env,
-    P program_info,
-    O _opt_action,
-    Cfg _cfg,
-    M _manifest,
-    S _make_and_meta_struct
+  @system auto spineAbstraction(E,P,O,Cfg,M)(
+    E             _env,
+    P             program_info,
+    O             _opt_action,
+    Cfg           _cfg,
+    M             _manifest,
+    ConfComposite _make_and_meta_struct
   ){
     { /+ document config/make file +/
       auto _config_document_struct = readConfigDoc!()(_manifest, _env);
@@ -144,7 +142,7 @@ template spineAbstraction() {
     if ((_opt_action.debug_do)
       || (_opt_action.debug_do_stages)
     ) {
-      writeln("step4 commence → (doc_matters) [", _manifest.src.filename, "]");
+      writeln("step4 commence → (doc.matters) [", _manifest.src.filename, "]");
     }
     struct ST_DocumentMatters {
       auto generator_program() {
@@ -190,7 +188,7 @@ template spineAbstraction() {
           ~ ":" ~ _st.second.to!string;
         return _time;
       }
-      auto conf_make_meta() {
+      ConfComposite conf_make_meta() {
         return _make_and_meta_struct;
       }
       auto doc_digest() {
@@ -294,7 +292,18 @@ template spineAbstraction() {
     ) {
       writeln("- step4 complete for [", _manifest.src.filename, "]");
     }
-    auto t = tuple(doc_abstraction, doc_matters);
-    return t;
+    auto theDOC() {
+      struct ST_DOC {
+        const auto abstraction() {
+          return doc_abstraction;
+        }
+        auto matters() {
+          return doc_matters;
+        }
+      }
+      return ST_DOC();
+    }
+    auto the_doc = theDOC();
+    return the_doc;
   }
 }