From 860b894a10f3526e6bd73d53850764c0ad95ab99 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Sat, 29 Jun 2024 13:54:28 -0400
Subject: document digests and reduction in use of tuples

---
 org/spine.org | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'org/spine.org')

diff --git a/org/spine.org b/org/spine.org
index ac9f552..56cb3f7 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -1463,7 +1463,6 @@ module sisudoc.meta.metadoc;
 template spineAbstraction() {
   <<imports_spine_metadoc>>
   <<spine_metadoc_mixin>>
-  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)(
@@ -1517,8 +1516,8 @@ template spineAbstraction() {
 
 if build source pod requested all information needed to build it available at this point
   - manifest related information  _manifest
-  - insert file list              _header_body_insertfilelist_imagelist[headBody.insert_file_list]
-  - image list                    _header_body_insertfilelist_imagelist[headBody.image_list]
+  - insert file list              _header_body_insertfilelist_imagelist.insert_file_list]
+  - image list                    _header_body_insertfilelist_imagelist.image_list]
 
 #+NAME: spine_each_file_do_read_and_split_dr_markup_file_content_into_header_and_body
 #+BEGIN_SRC d
@@ -1531,7 +1530,6 @@ if ((_opt_action.debug_do)
 }
 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)
 ) {
@@ -1540,7 +1538,7 @@ if ((_opt_action.debug_do)
 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]);
 }
 #+END_SRC
 
@@ -1568,7 +1566,7 @@ if ((_opt_action.debug_do)
 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,
@@ -1603,7 +1601,7 @@ if ((_opt_action.debug_do)
   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,
@@ -1798,7 +1796,7 @@ auto output_path() {
 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;
-- 
cgit v1.2.3