0.7.0 meta_abstruction, doc "has" struct replaces several tuples

1 files changed, 27 insertions, 17 deletions

diff --git a/src/doc_reform/meta/metadoc_summary.d b/src/doc_reform/meta/metadoc_summary.d
index e44a12c..30f4a83 100644
--- a/src/doc_reform/meta/metadoc_summary.d
+++ b/src/doc_reform/meta/metadoc_summary.d
@@ -26,7 +26,7 @@ template DocReformAbstractionSummary() {
         "last_object_number_body"  : "0",
         "last_object_number_book_index" : "0",
       ];
-      foreach (k; doc_matters.xml.keys_seq.seg) {
+      foreach (k; doc_matters.has.keys_seq.seg) {
         foreach (obj; doc_abstraction[k]) {
           if (obj.metainfo.is_of_part != "empty") {
             if (!empty(obj.metainfo.object_number)) {
@@ -52,48 +52,58 @@ template DocReformAbstractionSummary() {
       ? char_repeat_number
       : min_repeat_number;
       writefln(
-        "%s\n\"%s\", %s\n%s\n%s\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n(%s: %s)\n%s",
+        "%s\n\"%s\", %s\n%s\n%s\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%s",
         markup.repeat_character_by_number_provided("-", char_repeat_number),
         doc_matters.conf_make_meta.meta.title_full,
         doc_matters.conf_make_meta.meta.creator_author,
         doc_matters.src.filename,
         markup.repeat_character_by_number_provided("-", char_repeat_number),
-        "length toc arr:",
+        "- toc arr length:",
         to!int(doc_abstraction["toc"].length),
-        "length doc_abstraction arr:",
+        "- doc_abstraction arr length:",
         to!int(doc_abstraction["body"].length),
-        "last doc body ocn:",
+        "  doc body last obj on.#:",
         to!int(check["last_object_number_body"]),
-        "last object_number:",
-        to!int(check["last_object_number"]),
-        "length endnotes:",                                // subtract headings
+        "  - number of tables:",
+        doc_matters.has.tables,
+        "  - number of codeblocks:",
+        doc_matters.has.codeblocks,
+        "  - number of poems:",
+        doc_matters.has.poems,
+        "  - number of blocks:",
+        doc_matters.has.blocks,
+        "  - number of groups:",
+        doc_matters.has.groups,
+        "  - number of images:",
+        doc_matters.has.images,
+        "- endnotes length:",                                // subtract headings
         (doc_abstraction["endnotes"].length > 2)
         ? (to!int(doc_abstraction["endnotes"].length - 2))
         : 0,
-        "length glossary:",
+        "- glossary length:",
         (doc_abstraction["glossary"].length > 1)
         ? (to!int(doc_abstraction["glossary"].length))
         : 0,
-        "length biblio:",
+        "- biblio length:",
         (doc_abstraction["bibliography"].length > 1)
         ? (to!int(doc_abstraction["bibliography"].length))
         : 0,
-        "length bookindex:",
+        "- bookindex length:",
         (doc_abstraction["bookindex"].length > 1)
         ? (to!int(doc_abstraction["bookindex"].length))
         : 0,
-        "  last book idx ocn:",
+        "  book idx last obj on.#:",
         to!int(check["last_object_number_book_index"]),
-        "length blurb:",
+        "- blurb length:",
         (doc_abstraction["blurb"].length > 1)
         ? (to!int(doc_abstraction["blurb"].length))
         : 0,
+        "* last obj on.#:",
+        to!int(check["last_object_number"]),
         "number of segments:",
-        (doc_matters.xml.segnames.length > 1)
-        ? (to!int(doc_matters.xml.segnames.length))
+        (doc_matters.has.segnames_lv4.length > 1)
+        ? (to!int(doc_matters.has.segnames_lv4.length))
         : 0,
-        __FILE__,
-        __LINE__,
         markup.repeat_character_by_number_provided("-", min_repeat_number),
       );
     }