From 0079c34ce7a524d4b93ed56191b5e7cf6a380975 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 1 Nov 2016 10:06:47 -0400 Subject: 0.8.0 the document parts (& org babel tangle) --- org/sdp.org | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'org/sdp.org') diff --git a/org/sdp.org b/org/sdp.org index 97d1498..28c9b92 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -24,7 +24,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 7, 3); +enum ver = Version(0, 8, 0); #+END_SRC * sdp.d sisu document parser :sdp.d: @@ -364,10 +364,10 @@ string[string][string] dochead_meta = header_make_and_meta_tuple[1]; /+ ↓ document abstraction: process document, return abstraction as tuple +/ auto t = abs.abstract_doc_source(content_body, dochead_make, dochead_meta); static assert(!isTypeTuple!(t)); -auto doc_ao_contents = t[0]; // contents ~ endnotes ~ bookindex; +auto doc_ao_contents = t[0]; // head ~ toc ~ contents ~ endnotes_seg ~ [glossary] ~ bibliography ~ bookindex; // static assert(!isIterable!(doc_ao_contents)); -auto doc_ao_bookindex_unordered_hashes = t[1]; -auto doc_ao_biblio = t[2]; +auto doc_ao_bookindex_unordered_hashes = t[1]; // redundant? +auto doc_ao_biblio = t[2]; // redundant? // destroy(t); #+END_SRC @@ -377,10 +377,18 @@ auto doc_ao_biblio = t[2]; #+BEGIN_SRC d /+ ↓ debugs +/ debug(checkdoc) { // checkbook & dumpdoc + auto doc_ao_contents_view = ( + doc_ao_contents["head"] ~ + doc_ao_contents["toc_seg"] ~ + doc_ao_contents["body"] ~ + doc_ao_contents["endnotes_seg"] ~ + doc_ao_contents["bibliography"] ~ + doc_ao_contents["bookindex_seg"] + ); dbg.abstract_doc_source_debugs( - doc_ao_contents, - doc_ao_bookindex_unordered_hashes, - doc_ao_biblio, + doc_ao_contents_view, + doc_ao_bookindex_unordered_hashes, // redundant? + doc_ao_biblio, // redundant? dochead_make, dochead_meta, fn_src, @@ -396,8 +404,8 @@ debug(checkdoc) { // checkbook & dumpdoc /+ ↓ output hub +/ output.hub( doc_ao_contents, - doc_ao_bookindex_unordered_hashes, - doc_ao_biblio, + doc_ao_bookindex_unordered_hashes, // redundant? + doc_ao_biblio, // redundant? dochead_make, dochead_meta, fn_src, -- cgit v1.2.3