From a7321dc8c96ff0006eb79a7181db4ab416e916f3 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 3 Oct 2018 11:16:23 -0400 Subject: naming DocReform from SiSU --- src/doc_reform/meta/metadoc.d | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/doc_reform/meta/metadoc.d') diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d index 7c0e90d..071b166 100644 --- a/src/doc_reform/meta/metadoc.d +++ b/src/doc_reform/meta/metadoc.d @@ -1,5 +1,5 @@ module doc_reform.meta.metadoc; -template SiSUabstraction() { +template DocReformAbstraction() { import std.getopt, std.file, @@ -19,16 +19,16 @@ template SiSUabstraction() { doc_reform.source.read_config_files, doc_reform.source.read_source_files, doc_reform.output.hub; - mixin SiSUrgxInit; - mixin contentJSONtoSiSUstruct; - mixin SiSUbiblio; - mixin SiSUrgxInitFlags; + mixin DocReformRgxInit; + mixin contentJSONtoDocReformStruct; + mixin DocReformBiblio; + mixin DocReformRgxInitFlags; mixin outputHub; 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(); - auto SiSUabstraction(E,O,M)( + auto DocReformAbstraction(E,O,M)( E _env, O _opt_action, M _manifest @@ -36,8 +36,8 @@ template SiSUabstraction() { auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file auto _config_local_site_struct = readConfigSite!()(_manifest, _env); // local site config ConfCompositePlus _make_and_meta_struct; - _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct); - _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct); + _make_and_meta_struct = configParseTOMLreturnDocReformStruct!()(_make_and_meta_struct, _config_document_struct); + _make_and_meta_struct = configParseTOMLreturnDocReformStruct!()(_make_and_meta_struct, _config_local_site_struct); /+ ↓ read file (filename with path) +/ /+ ↓ file tuple of header and content +/ debug(steps) { @@ -45,7 +45,7 @@ template SiSUabstraction() { ); } auto _header_body_insertfilelist_imagelist - = SiSUrawMarkupContent!()(_opt_action, _manifest.src.path_and_fn); + = DocReformRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn); static assert(!isTypeTuple!(_header_body_insertfilelist_imagelist)); static assert(_header_body_insertfilelist_imagelist.length==4); debug(steps) { @@ -72,7 +72,7 @@ template SiSUabstraction() { debug(steps) { writeln("step3 commence → (document abstraction (da); da keys; segnames; doc_matters)"); } - auto da = SiSUdocAbstraction!()( + auto da = DocReformDocAbstraction!()( _header_body_insertfilelist_imagelist[headBody.body_content], _make_and_meta_struct, _opt_action, @@ -123,7 +123,7 @@ template SiSUabstraction() { return _manifest.src; } auto src_path_info() { - return SiSUpathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); // would like (to have and use) relative path + return DocReformPathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); // would like (to have and use) relative path } auto srcs() { struct SRC_ { -- cgit v1.2.3