From 4fb0979097a0dcfda7cd2cf3bc510d60d7e6e4e1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 15 Jan 2017 10:02:27 -0500 Subject: some reorganising, moved doc sections sequence keys, tuple change --- src/sdp.d | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'src/sdp.d') 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"]; -- cgit v1.2.3