0.7.0 meta_abstruction, doc "has" struct replaces several tuples

1 files changed, 17 insertions, 40 deletions

diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d
index a57159d..d8cc19f 100644
--- a/src/doc_reform/meta/metadoc.d
+++ b/src/doc_reform/meta/metadoc.d
@@ -27,7 +27,7 @@ template DocReformAbstraction() {
   mixin outputHub;
   enum headBody { header, body_content, insert_file_list, image_list }
   enum makeMeta { make, meta }
-  enum docAbst  { doc_abstraction, section_keys, segnames, segnames_0_4, tag_assoc, images }
+  enum docAbst  { doc_abstract_obj, doc_has }
   static auto rgx = Rgx();
   auto DocReformAbstraction(E,P,O,M)(
     E _env,
@@ -92,17 +92,9 @@ template DocReformAbstraction() {
       true,
     );
     static assert(!isTypeTuple!(da));
-    static assert(da.length==6);
-    auto doc_abstraction = da[docAbst.doc_abstraction]; /+ head ~ toc ~ body ~ endnotes_seg ~ glossary ~ bibliography ~ bookindex ~ blurb; +/
-    auto _document_section_keys_sequenced = da[docAbst.section_keys];
-    string[] _doc_html_segnames = da[docAbst.segnames];
-    string[] _doc_epub_segnames_0_4 = da[docAbst.segnames_0_4];
-    debug(segnames) {
-      writeln("segnames lv4:      ", _doc_html_segnames);
-      writeln("segnames lv0 to 4: ", _doc_epub_segnames_0_4);
-    }
-    auto _doc_tag_assoc = da[docAbst.tag_assoc];
-    auto _images = da[docAbst.images];
+    static assert(da.length==2);
+    auto doc_abstraction = da[docAbst.doc_abstract_obj]; /+ head ~ toc ~ body ~ endnotes_seg ~ glossary ~ bibliography ~ bookindex ~ blurb; +/
+    auto _doc_has_struct = da[docAbst.doc_has];
     if ((_opt_action.debug_do)
     || (_opt_action.very_verbose)
     ) {
@@ -152,6 +144,9 @@ template DocReformAbstraction() {
       auto conf_make_meta() { // TODO meld with all make instructions
         return _make_and_meta_struct;
       }
+      auto has() {
+        return _doc_has_struct;
+      }
       auto env() {
         struct Env_ {
           auto pwd() {
@@ -181,17 +176,6 @@ template DocReformAbstraction() {
       auto src_path_info() {
         return DocReformPathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); // would like (to have and use) relative path
       }
-      auto srcs() {
-        struct SRC_ {
-          auto file_insert_list() {
-            return _header_body_insertfilelist_imagelist[headBody.insert_file_list];
-          }
-          auto image_list() {
-            return _images;
-          }
-        }
-        return SRC_();
-      }
       auto pod() {
         return _manifest.pod;
       }
@@ -203,26 +187,19 @@ template DocReformAbstraction() {
         }
         return SQLite_();
       }
-      auto xml() {
-        struct XML_ {
-          auto keys_seq() {
-            /+ contains .seg & .scroll sequences +/
-            return _document_section_keys_sequenced;
-          }
-          string[] segnames() {
-            return _doc_html_segnames;
-          }
-          string[] segnames_lv_0_to_4() {
-            return _doc_epub_segnames_0_4;
+      auto output_path() {
+        return _manifest.output.path;
+      }
+      auto srcs() {
+        struct SRC_ {
+          auto file_insert_list() {
+            return _header_body_insertfilelist_imagelist[headBody.insert_file_list];
           }
-          auto tag_associations() {
-            return _doc_tag_assoc;
+          auto image_list() {
+            return _doc_has_struct.imagelist;
           }
         }
-        return XML_();
-      }
-      auto output_path() {
-        return _manifest.output.path;
+        return SRC_();
       }
     }
     auto doc_matters = DocumentMatters();