diff options
Diffstat (limited to 'src/doc_reform/meta')
-rw-r--r-- | src/doc_reform/meta/conf_make_meta_json.d | 6 | ||||
-rw-r--r-- | src/doc_reform/meta/conf_make_meta_structs.d | 2 | ||||
-rw-r--r-- | src/doc_reform/meta/conf_make_meta_toml.d | 14 | ||||
-rw-r--r-- | src/doc_reform/meta/defaults.d | 8 | ||||
-rw-r--r-- | src/doc_reform/meta/doc_debugs.d | 6 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc.d | 22 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc_from_src.d | 18 | ||||
-rw-r--r-- | src/doc_reform/meta/metadoc_summary.d | 4 | ||||
-rw-r--r-- | src/doc_reform/meta/rgx.d | 2 |
9 files changed, 41 insertions, 41 deletions
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d index d6adfa7..30aaedc 100644 --- a/src/doc_reform/meta/conf_make_meta_json.d +++ b/src/doc_reform/meta/conf_make_meta_json.d @@ -3,7 +3,7 @@ extract json header return json +/ module doc_reform.meta.conf_make_meta_json; -static template contentJSONtoSiSUstruct() { +static template contentJSONtoDocReformStruct() { import std.exception, std.regex, @@ -18,8 +18,8 @@ static template contentJSONtoSiSUstruct() { doc_reform.meta.conf_make_meta_json, doc_reform.meta.rgx; ConfCompositePlus _struct_composite; - auto contentJSONtoSiSUstruct(C, J)(C _struct_composite, J _json, string _identifier) { - mixin SiSUrgxInit; + auto contentJSONtoDocReformStruct(C,J)(C _struct_composite, J _json, string _identifier) { + mixin DocReformRgxInit; static auto _rgx = Rgx(); debug (json) { writeln(">> --------------------------- >>"); diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d index cf279a5..a05acf7 100644 --- a/src/doc_reform/meta/conf_make_meta_structs.d +++ b/src/doc_reform/meta/conf_make_meta_structs.d @@ -12,7 +12,7 @@ import import doc_reform.meta.defaults, doc_reform.meta.rgx; -mixin SiSUrgxInit; +mixin DocReformRgxInit; static auto _rgx = Rgx(); mixin InternalMarkup; auto _mkup = InlineMarkup(); diff --git a/src/doc_reform/meta/conf_make_meta_toml.d b/src/doc_reform/meta/conf_make_meta_toml.d index d308ae4..1cf935b 100644 --- a/src/doc_reform/meta/conf_make_meta_toml.d +++ b/src/doc_reform/meta/conf_make_meta_toml.d @@ -22,21 +22,21 @@ static template configParseTOMLreturnJSON() { return _doc_json; } } -static template configParseTOMLreturnSiSUstruct() { +static template configParseTOMLreturnDocReformStruct() { import toml, toml.json; import doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json; - mixin contentJSONtoSiSUstruct; - auto configParseTOMLreturnSiSUstruct(CCm, T)( + mixin contentJSONtoDocReformStruct; + auto configParseTOMLreturnDocReformStruct(CCm, T)( CCm _make_and_meta_struct, T _document_struct ){ TOMLDocument _doc = parseTOML(cast(string)(_document_struct.content)); auto _doc_json = toJSON(_doc); - _make_and_meta_struct = contentJSONtoSiSUstruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json + _make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json return _make_and_meta_struct; } } @@ -56,8 +56,8 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json, doc_reform.meta.rgx; - mixin SiSUrgxInit; - mixin contentJSONtoSiSUstruct; + mixin DocReformRgxInit; + mixin contentJSONtoDocReformStruct; static auto rgx = Rgx(); auto docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct(CCm, Src)( CCm _make_and_meta_struct, @@ -71,7 +71,7 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() { _doc = parseTOML(cast(string)(header_src)); } auto _doc_json = toJSON(_doc); - auto _header_and_make_and_meta_struct = contentJSONtoSiSUstruct!()(_make_and_meta_struct, _doc_json, "header"); + auto _header_and_make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header"); return _header_and_make_and_meta_struct; } } diff --git a/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d index 2f8c068..69ab7ba 100644 --- a/src/doc_reform/meta/defaults.d +++ b/src/doc_reform/meta/defaults.d @@ -2,7 +2,7 @@ default settings +/ module doc_reform.meta.defaults; -template SiSUrgxInitFlags() { +template DocReformRgxInitFlags() { /+ regex flags +/ static int[string] flags_type_init() { int[string] flags_type_init = [ @@ -42,7 +42,7 @@ template SiSUrgxInitFlags() { return flags_type_init; } } -template SiSUnode() { +template DocReformNode() { static string[string] node_metadata_heading_str() { auto _node = [ "is" : "", @@ -84,7 +84,7 @@ template SiSUnode() { return _node; } } -template SiSUbiblio() { +template DocReformBiblio() { // required: deemed_author (author || editor); year; fulltitle; struct BibJsnStr { static auto biblio_entry_tags_jsonstr() { @@ -153,7 +153,7 @@ template InternalMarkup() { } } } -template SiSUlanguageCodes() { +template DocReformLanguageCodes() { /+ language codes +/ struct Lang { static string[string][string] codes() { diff --git a/src/doc_reform/meta/doc_debugs.d b/src/doc_reform/meta/doc_debugs.d index 04dedb2..9f26edc 100644 --- a/src/doc_reform/meta/doc_debugs.d +++ b/src/doc_reform/meta/doc_debugs.d @@ -2,7 +2,7 @@ output debugs +/ module doc_reform.meta.doc_debugs; -template SiSUdebugs() { +template DocReformDebugs() { import doc_reform.meta.defaults, doc_reform.meta.rgx; @@ -22,11 +22,11 @@ template SiSUdebugs() { std.typecons, std.utf, std.conv : to; - auto SiSUdebugs(S,T)( + auto DocReformDebugs(S,T)( const S contents, T doc_matters, ) { - mixin SiSUrgxInit; + mixin DocReformRgxInit; mixin InternalMarkup; static auto rgx = Rgx(); auto markup = InlineMarkup(); 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_ { diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index c4a12bb..7a96edd 100644 --- a/src/doc_reform/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -4,7 +4,7 @@ metadoc_from_src.d +/ module doc_reform.meta.metadoc_from_src; -template SiSUdocAbstraction() { +template DocReformDocAbstraction() { /+ ↓ abstraction imports +/ import doc_reform.meta; import @@ -20,7 +20,7 @@ template SiSUdocAbstraction() { /+ ↓ abstraction mixins +/ mixin ObjectSetter; mixin InternalMarkup; - mixin SiSUrgxInit; + mixin DocReformRgxInit; /+ ↓ abstraction struct init +/ /+ initialize +/ ObjGenericComposite[][string] the_table_of_contents_section; @@ -236,7 +236,7 @@ template SiSUdocAbstraction() { auto node_construct = NodeStructureMetadata(); enum sObj { content, anchor_tags, notes_reg, notes_star, links, image_no_dimensions } /+ ↓ abstract marked up document +/ - auto SiSUdocAbstraction(Src,CMM,Opt,Mfst)( + auto DocReformDocAbstraction(Src,CMM,Opt,Mfst)( Src markup_sourcefile_content, CMM conf_make_meta, Opt opt_action, @@ -263,8 +263,8 @@ template SiSUdocAbstraction() { previous_length=0; reset_note_numbers=true; } - mixin SiSUrgxInitFlags; - mixin SiSUnode; + mixin DocReformRgxInitFlags; + mixin DocReformNode; auto node_para_int_ = node_metadata_para_int; auto node_para_str_ = node_metadata_para_str; ObjGenericComposite comp_obj_heading_, comp_obj_para, comp_obj_toc; @@ -3080,7 +3080,7 @@ template SiSUdocAbstraction() { return ref string biblio_entry_str_json, return ref string[] biblio_arr_json ) { - mixin SiSUbiblio; + mixin DocReformBiblio; auto jsn = BibJsnStr(); static auto rgx = Rgx(); if (line.matchFirst(rgx.heading_biblio)) { @@ -5419,7 +5419,7 @@ template SiSUdocAbstraction() { static assert(is(typeof(bookindex_unordered_hashes) == string[][string][string])); static assert(is(typeof(obj_cite_digits.on) == int)); } - mixin SiSUnode; + mixin DocReformNode; mixin InternalMarkup; static auto mkup = InlineMarkup(); string type_is; @@ -5651,7 +5651,7 @@ template SiSUdocAbstraction() { in { } body { - mixin SiSUnode; + mixin DocReformNode; ObjGenericComposite[] the_endnotes_section; auto endnotes_ = gathered_notes(); string type_is; @@ -6303,7 +6303,7 @@ template SiSUdocAbstraction() { "block status: off or closing"); } /+ abstraction functions assertions ↑ +/ -} /+ ← closed: template SiSUdocAbstraction +/ +} /+ ← closed: template DocReformDocAbstraction +/ template docSectKeysSeq() { auto docSectKeysSeq(string[][string] document_section_keys_sequenced) { struct doc_sect_keys_seq { diff --git a/src/doc_reform/meta/metadoc_summary.d b/src/doc_reform/meta/metadoc_summary.d index f2e0632..6d4a01b 100644 --- a/src/doc_reform/meta/metadoc_summary.d +++ b/src/doc_reform/meta/metadoc_summary.d @@ -1,6 +1,6 @@ module doc_reform.meta.metadoc_summary; -template SiSUabstractionSummary() { - auto SiSUabstractionSummary(S,T)( +template DocReformAbstractionSummary() { + auto DocReformAbstractionSummary(S,T)( auto ref const S doc_abstraction, auto ref T doc_matters, ) { diff --git a/src/doc_reform/meta/rgx.d b/src/doc_reform/meta/rgx.d index 63bb4ee..39f2479 100644 --- a/src/doc_reform/meta/rgx.d +++ b/src/doc_reform/meta/rgx.d @@ -2,7 +2,7 @@ regex: regular expressions used in sisu document parser +/ module doc_reform.meta.rgx; -static template SiSUrgxInit() { +static template DocReformRgxInit() { import doc_reform.meta.defaults; static struct Rgx { /+ misc +/ |