some reorganising, moved doc sections sequence keys, tuple change

2 files changed, 36 insertions, 34 deletions

diff --git a/src/sdp.d b/src/sdp.d
index f3fd07f..3a754b9 100755
--- a/src/sdp.d
+++ b/src/sdp.d
@@ -225,40 +225,8 @@ void main(string[] args) {
       auto t = abs.abstract_doc_source(content_body, _dochead_make, _dochead_meta, _opt_action_bool);
       static assert(!isTypeTuple!(t));
       auto doc_abstraction = t[0]; // head ~ toc ~ contents ~ endnotes_seg ~ glossary ~ bibliography ~ bookindex ~blurb;
-      string[] doc_html_segnames = t[1];
-      string[][string] document_section_keys_sequenced = [
-        "seg":    ["head", "toc_seg", "body",],
-        "scroll": ["head", "toc_scroll", "body",]
-      ];
-      if (doc_abstraction["endnotes"].length > 1) {
-        document_section_keys_sequenced["seg"]    ~= "endnotes";
-        document_section_keys_sequenced["scroll"] ~= "endnotes";
-      }
-      if (doc_abstraction["glossary"].length > 1) {
-        document_section_keys_sequenced["seg"]    ~= "glossary";
-        document_section_keys_sequenced["scroll"] ~= "glossary";
-      }
-      if (doc_abstraction["bibliography"].length > 1) {
-        document_section_keys_sequenced["seg"]    ~= "bibliography";
-        document_section_keys_sequenced["scroll"] ~= "bibliography";
-      }
-      if (doc_abstraction["bookindex_seg"].length > 1) {
-        document_section_keys_sequenced["seg"]    ~= "bookindex_seg";
-      }
-      if (doc_abstraction["bookindex_scroll"].length > 1) {
-        document_section_keys_sequenced["scroll"] ~= "bookindex_scroll";
-      }
-      if (doc_abstraction["blurb"].length > 1) {
-        document_section_keys_sequenced["seg"]    ~= "blurb";
-        document_section_keys_sequenced["scroll"] ~= "blurb";
-      }
-      if ((_opt_action_bool["html"])
-      || (_opt_action_bool["html_scroll"])
-      || (_opt_action_bool["html_seg"])
-      || (_opt_action_bool["epub"])) {
-        document_section_keys_sequenced["seg"]    ~= "tail";
-        document_section_keys_sequenced["scroll"] ~= "tail";
-      }
+      string[][string] document_section_keys_sequenced = t[1];
+      string[] doc_html_segnames = t[2];
       struct DocumentMatters {
         string[] keys_seq_seg() {
           string[] _k = document_section_keys_sequenced["seg"];
diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index e813260..d8eb7d2 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -1481,8 +1481,42 @@ template SiSUdocAbstraction() {
         /+ dom tail only +/
         "tail":             the_dom_tail_section,
       ];
+      string[][string] document_section_keys_sequenced = [
+        "seg":    ["head", "toc_seg", "body",],
+        "scroll": ["head", "toc_scroll", "body",]
+      ];
+      if (document_the["endnotes"].length > 1) {
+        document_section_keys_sequenced["seg"]    ~= "endnotes";
+        document_section_keys_sequenced["scroll"] ~= "endnotes";
+      }
+      if (document_the["glossary"].length > 1) {
+        document_section_keys_sequenced["seg"]    ~= "glossary";
+        document_section_keys_sequenced["scroll"] ~= "glossary";
+      }
+      if (document_the["bibliography"].length > 1) {
+        document_section_keys_sequenced["seg"]    ~= "bibliography";
+        document_section_keys_sequenced["scroll"] ~= "bibliography";
+      }
+      if (document_the["bookindex_seg"].length > 1) {
+        document_section_keys_sequenced["seg"]    ~= "bookindex_seg";
+      }
+      if (document_the["bookindex_scroll"].length > 1) {
+        document_section_keys_sequenced["scroll"] ~= "bookindex_scroll";
+      }
+      if (document_the["blurb"].length > 1) {
+        document_section_keys_sequenced["seg"]    ~= "blurb";
+        document_section_keys_sequenced["scroll"] ~= "blurb";
+      }
+      if ((opt_action_bool["html"])
+      || (opt_action_bool["html_scroll"])
+      || (opt_action_bool["html_seg"])
+      || (opt_action_bool["epub"])) {
+        document_section_keys_sequenced["seg"]    ~= "tail";
+        document_section_keys_sequenced["scroll"] ~= "tail";
+      }
       auto t = tuple(
         document_the,
+        document_section_keys_sequenced,
         html_segnames,
       );
       return t;