document digests and reduction in use of tuples

1 files changed, 4 insertions, 6 deletions

diff --git a/src/sisudoc/meta/metadoc.d b/src/sisudoc/meta/metadoc.d
index a1899da..ed9a5b1 100644
--- a/src/sisudoc/meta/metadoc.d
+++ b/src/sisudoc/meta/metadoc.d
@@ -64,7 +64,6 @@ template spineAbstraction() {
     sisudoc.io_out.hub;
   mixin spineBiblio;
   mixin outputHub;
-  enum headBody { header, body_content, insert_file_list, image_list }
   enum makeMeta { make, meta }
   enum docAbst  { doc_abstract_obj, doc_has }
   @system auto spineAbstraction(E,P,O,Cfg,M,S)(
@@ -89,7 +88,6 @@ template spineAbstraction() {
     }
     auto _header_body_insertfilelist_imagelist
       = spineRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn);
-    static assert(_header_body_insertfilelist_imagelist.length==4);
     if ((_opt_action.debug_do)
       || (_opt_action.debug_do_stages)
     ) {
@@ -98,7 +96,7 @@ template spineAbstraction() {
     debug(header_and_body) {
       writeln(header);
       writeln(_header_body_insertfilelist_imagelist.length);
-      writeln(_header_body_insertfilelist_imagelist.length[headBody.body_content][0]);
+      // writeln(_header_body_insertfilelist_imagelist.length.body_content[0]);
     }
     /+ ↓ split header into make and meta +/
     if ((_opt_action.debug_do)
@@ -109,7 +107,7 @@ template spineAbstraction() {
     import sisudoc.meta.conf_make_meta_yaml;
     _make_and_meta_struct =
       docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct!()(
-        _header_body_insertfilelist_imagelist[headBody.header],
+        _header_body_insertfilelist_imagelist.header_raw,
         _make_and_meta_struct,
         _manifest,
         _opt_action,
@@ -127,7 +125,7 @@ template spineAbstraction() {
       writeln("step3 commence → (document abstraction (da); da keys; segnames; doc_matters) [", _manifest.src.filename, "]");
     }
     auto da = docAbstraction!()(
-      _header_body_insertfilelist_imagelist[headBody.body_content],
+      _header_body_insertfilelist_imagelist.sourcefile_body_content,
       _make_and_meta_struct,
       _opt_action,
       _manifest,
@@ -275,7 +273,7 @@ template spineAbstraction() {
       auto srcs() {
         struct SRC_ {
           auto file_insert_list() {
-            return _header_body_insertfilelist_imagelist[headBody.insert_file_list];
+            return _header_body_insertfilelist_imagelist.insert_file_list;
           }
           auto image_list() {
             return _doc_has_struct.imagelist;