diff options
Diffstat (limited to 'src/sdp/meta/metadoc.d')
-rw-r--r-- | src/sdp/meta/metadoc.d | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/sdp/meta/metadoc.d b/src/sdp/meta/metadoc.d index 79f9849..e3947e5 100644 --- a/src/sdp/meta/metadoc.d +++ b/src/sdp/meta/metadoc.d @@ -27,7 +27,7 @@ template SiSUabstraction() { mixin SiSUbiblio; mixin SiSUrgxInitFlags; mixin outputHub; - enum headBody { header, body_content, insert_filelist } + enum headBody { header, body_content, insert_file_list, image_list } enum makeMeta { make, meta } enum docAbst { doc_abstraction, section_keys, segnames, segnames_0_4, images } static auto rgx = Rgx(); @@ -42,26 +42,30 @@ template SiSUabstraction() { /+ ↓ read file (filename with path) +/ /+ ↓ file tuple of header and content +/ debug(steps) { - writeln(__LINE__, ":", __FILE__, ": step1 commence → (get document header & body & insert files)"); + writeln(__LINE__, ":", __FILE__, + ": step1 commence → (get document header & body & insert file list & if needed image list)" + ); } - auto _header_body_inserts = - SiSUrawMarkupContent!()(_manifest.src_fn); - static assert(!isTypeTuple!(_header_body_inserts)); - static assert(_header_body_inserts.length==3); + auto _header_body_insertfilelist_imagelist = + SiSUrawMarkupContent!()(_opt_action, _manifest.src_fn); + static assert(!isTypeTuple!(_header_body_insertfilelist_imagelist)); + static assert(_header_body_insertfilelist_imagelist.length==4); debug(steps) { writeln(__LINE__, ":", __FILE__, ": step1 complete"); } debug(header_and_body) { writeln(header); - writeln(_header_body_inserts.length); - writeln(_header_body_inserts.length[headBody.body_content][0]); + writeln(_header_body_insertfilelist_imagelist.length); + writeln(_header_body_insertfilelist_imagelist.length[headBody.body_content][0]); } /+ ↓ split header into make and meta +/ debug(steps) { - writeln(__LINE__, ":", __FILE__, ": step2 commence → (doc header: make & meta as struct)"); + writeln(__LINE__, ":", __FILE__, + ": step2 commence → (doc header: make & meta as struct)" + ); } auto _make_and_meta_struct = - docHeaderMakeAndMetaTupExtractAndConvertToStruct!()(conf_files_composite_make, _header_body_inserts[headBody.header]); // breakage ... + docHeaderMakeAndMetaTupExtractAndConvertToStruct!()(conf_files_composite_make, _header_body_insertfilelist_imagelist[headBody.header]); // breakage ... debug(steps) { writeln(__LINE__, ":", __FILE__, ": step2 complete"); } @@ -70,7 +74,7 @@ template SiSUabstraction() { writeln(__LINE__, ":", __FILE__, ": step3 commence → (document abstraction (da); da keys; segnames; doc_matters)"); } auto da = SiSUdocAbstraction!()( - _header_body_inserts[headBody.body_content], + _header_body_insertfilelist_imagelist[headBody.body_content], _make_and_meta_struct, _opt_action, ); @@ -148,7 +152,7 @@ template SiSUabstraction() { return _manifest.pod_image_dirs; } auto file_insert_list() { - string[] _k = _header_body_inserts[headBody.insert_filelist]; + string[] _k = _header_body_insertfilelist_imagelist[headBody.insert_file_list]; return _k; } auto image_list() { |