From 96b03396ddb487816ebd85d1c6f30400019702fc Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 15 Nov 2019 23:58:15 -0500 Subject: name changes --- org/default_misc.org | 12 ++-- org/default_paths.org | 94 +++++++++++++------------- org/default_regex.org | 4 +- org/imports.org | 4 +- org/in_source_files.org | 14 ++-- org/meta_conf_make_meta.org | 34 +++++----- org/meta_debugs.org | 6 +- org/metaverse.org | 18 ++--- org/out_harvest_metadata.org | 30 ++++---- org/out_latex.org | 10 +-- org/out_odt.org | 14 ++-- org/out_sqlite.org | 20 +++--- org/out_src_pod.org | 10 +-- org/out_xmls.org | 34 +++++----- org/out_xmls_css.org | 10 +-- org/output_hub.org | 6 +- org/output_show.org | 16 ++--- org/spine.org | 52 +++++++------- src/doc_reform/meta/conf_make_meta_json.d | 6 +- src/doc_reform/meta/conf_make_meta_structs.d | 2 +- src/doc_reform/meta/conf_make_meta_yaml.d | 20 +++--- src/doc_reform/meta/defaults.d | 12 ++-- src/doc_reform/meta/doc_debugs.d | 6 +- src/doc_reform/meta/metadoc.d | 22 +++--- src/doc_reform/meta/metadoc_from_src.d | 18 ++--- src/doc_reform/meta/metadoc_harvest.d | 8 +-- src/doc_reform/meta/metadoc_harvests_authors.d | 12 ++-- src/doc_reform/meta/metadoc_harvests_topics.d | 12 ++-- src/doc_reform/meta/metadoc_show_config.d | 4 +- src/doc_reform/meta/metadoc_show_make.d | 4 +- src/doc_reform/meta/metadoc_show_metadata.d | 4 +- src/doc_reform/meta/metadoc_show_summary.d | 4 +- src/doc_reform/meta/rgx.d | 2 +- src/doc_reform/output/defaults.d | 2 +- src/doc_reform/output/epub3.d | 10 +-- src/doc_reform/output/html.d | 16 ++--- src/doc_reform/output/hub.d | 6 +- src/doc_reform/output/latex.d | 10 +-- src/doc_reform/output/odt.d | 14 ++-- src/doc_reform/output/paths_output.d | 76 ++++++++++----------- src/doc_reform/output/rgx.d | 2 +- src/doc_reform/output/source_pod.d | 10 +-- src/doc_reform/output/sqlite.d | 20 +++--- src/doc_reform/output/xmls.d | 8 +-- src/doc_reform/output/xmls_css.d | 10 +-- src/doc_reform/source/paths_source.d | 18 ++--- src/doc_reform/source/read_config_files.d | 4 +- src/doc_reform/source/read_source_files.d | 10 +-- src/doc_reform/spine.d | 50 +++++++------- 49 files changed, 395 insertions(+), 395 deletions(-) diff --git a/org/default_misc.org b/org/default_misc.org index 3e09d16..c66351d 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -38,7 +38,7 @@ module doc_reform.meta.defaults; #+name: meta_defaults_template_init_flags #+BEGIN_SRC d -template DocReformRgxInitFlags() { +template spineRgxInitFlags() { /+ regex flags +/ static int[string] flags_type_init() { int[string] flags_type_init = [ @@ -86,7 +86,7 @@ template DocReformRgxInitFlags() { #+name: meta_defaults_template_node #+BEGIN_SRC d -template DocReformNode() { +template spineNode() { static string[string] node_metadata_heading_str() { string[string] _node = [ "is" : "", @@ -135,8 +135,8 @@ template DocReformNode() { #+name: meta_defaults_template_harvest #+BEGIN_SRC d -template DocReformHarvest() { - auto DocReformHarvest() { +template spineHarvest() { + auto spineHarvest() { struct _Harvest { struct Harvest { string title = ""; @@ -172,7 +172,7 @@ template DocReformHarvest() { #+name: meta_defaults_template_biblio #+BEGIN_SRC d -template DocReformBiblio() { +template spineBiblio() { // required: deemed_author (author || editor); year; fulltitle; struct BibJsnStr { static auto biblio_entry_tags_jsonstr() { @@ -311,7 +311,7 @@ template InternalMarkup() { #+name: defaults_template_language_codes #+BEGIN_SRC d -template DocReformLanguageCodes() { +template spineLanguageCodes() { /+ language codes +/ struct Lang { static string[string][string] codes() { diff --git a/org/default_paths.org b/org/default_paths.org index 08adb45..99f7909 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -46,7 +46,7 @@ import #+name: template_paths_src #+BEGIN_SRC d template PodManifest() { - mixin DocReformRgxInit; + mixin spineRgxInit; static auto rgx = Rgx(); auto PodManifest(P)( P _pth="" @@ -118,7 +118,7 @@ pod #+name: template_paths_src #+BEGIN_SRC d template PathMatters() { - mixin DocReformRgxInit; + mixin spineRgxInit; mixin InternalMarkup; static auto rgx = Rgx(); static auto mkup = InlineMarkup(); @@ -466,7 +466,7 @@ template PathMatters() { #+name: template_paths_src #+BEGIN_SRC d template ConfigFilePaths() { - mixin DocReformRgxInit; + mixin spineRgxInit; static auto rgx = Rgx(); auto ConfigFilePaths(M,E)( M _manifested, @@ -639,10 +639,10 @@ filelist for processing [things to ponder] #+name: template_paths_src #+BEGIN_SRC d -template DocReformPathsSRC() { - mixin DocReformRgxInit; +template spinePathsSRC() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsSRC(D,Fn)( + auto spinePathsSRC(D,Fn)( D _pwd, Fn _fn_src_and_path, ) { @@ -694,11 +694,11 @@ template DocReformPathsSRC() { #+name: template_paths_pods #+BEGIN_SRC d -template DocReformPathsPods() { - mixin DocReformRgxInit; +template spinePathsPods() { + mixin spineRgxInit; static auto rgx = Rgx(); string _suffix = ".zip"; - auto DocReformPathsPods(M)(M doc_matters) { + auto spinePathsPods(M)(M doc_matters) { string _base_dir_pod = (doc_matters.output_path.length > 0) ? doc_matters.output_path ~ "/pod" : "/pod"; @@ -992,8 +992,8 @@ import doc_reform.meta.rgx; #+name: template_paths_out #+BEGIN_SRC d -template DocReformOutPaths() { - auto DocReformOutPaths()( +template spineOutPaths() { + auto spineOutPaths()( string output_pth_root, string lng = "", ) { @@ -1009,8 +1009,8 @@ template DocReformOutPaths() { return _PathsStruct(); } } -template DocReformOutPathSQLite() { - auto DocReformOutPathSQLite(Po)( +template spineOutPathSQLite() { + auto spineOutPathSQLite(Po)( Po output_pth_root, ) { struct _PathsStruct { @@ -1031,9 +1031,9 @@ template DocReformOutPathSQLite() { #+name: template_paths_out #+BEGIN_SRC d -template DocReformOutPathsFnPd() { +template spineOutPathsFnPd() { /+ TODO stuff to work out here +/ - auto DocReformOutPathsFnPd(Fn,Pn)( + auto spineOutPathsFnPd(Fn,Pn)( Fn fn_src_pth, Pn pod_name_with_path ) { @@ -1075,11 +1075,11 @@ template DocReformOutPathsFnPd() { #+name: template_paths_html #+BEGIN_SRC d -template DocReformDocRootTreeHTML() { - mixin DocReformRgxInit; +template spineDocRootTreeHTML() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformDocRootTreeHTML()(string lng) { - auto lng_pth = DocReformOutPaths!()("", lng); + auto spineDocRootTreeHTML()(string lng) { + auto lng_pth = spineOutPaths!()("", lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -1138,14 +1138,14 @@ template DocReformDocRootTreeHTML() { #+name: template_paths_html #+BEGIN_SRC d -template DocReformPathsHTML() { - mixin DocReformRgxInit; +template spinePathsHTML() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsHTML()( + auto spinePathsHTML()( string output_path_root, string lng, ) { - auto doc_tree = DocReformDocRootTreeHTML!()(lng); + auto doc_tree = spineDocRootTreeHTML!()(lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -1198,15 +1198,15 @@ template DocReformPathsHTML() { #+name: template_paths_html #+BEGIN_SRC d -template DocReformUrlsHTML() { +template spineUrlsHTML() { import std.format; - mixin DocReformRgxInit; + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformUrlsHTML()( + auto spineUrlsHTML()( string url_doc_root, string lng, ) { - auto doc_tree = DocReformDocRootTreeHTML!()(lng); + auto doc_tree = spineDocRootTreeHTML!()(lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -1300,14 +1300,14 @@ template DocReformUrlsHTML() { #+name: template_paths_epub #+BEGIN_SRC d -template DocReformPathsEPUB() { - mixin DocReformRgxInit; +template spinePathsEPUB() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsEPUB()( + auto spinePathsEPUB()( string output_pth_root, string lng, ) { - auto out_pth = DocReformOutPaths!()(output_pth_root, lng); + auto out_pth = spineOutPaths!()(output_pth_root, lng); string base_dir = "epub"; struct _PathsStruct { string base() { @@ -1408,13 +1408,13 @@ template DocReformPathsEPUB() { #+name: template_paths_odf #+BEGIN_SRC d -template DocReformPathsODT() { - mixin DocReformRgxInit; +template spinePathsODT() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsODT(M)( + auto spinePathsODT(M)( M doc_matters, ) { - auto out_pth = DocReformOutPaths!()( doc_matters.output_path, doc_matters.src.language); + auto out_pth = spineOutPaths!()( doc_matters.output_path, doc_matters.src.language); string base_dir = "odf"; struct _PathsStruct { string base_pth() { // dir will contain odt document file (also debug file tree) @@ -1478,10 +1478,10 @@ template DocReformPathsODT() { #+name: template_paths_latex #+BEGIN_SRC d -template DocReformPathsLaTeX() { - mixin DocReformRgxInit; +template spinePathsLaTeX() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsLaTeX(M)( + auto spinePathsLaTeX(M)( M doc_matters, ) { struct _PathsStruct { @@ -1489,7 +1489,7 @@ template DocReformPathsLaTeX() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = DocReformOutPaths!()(doc_matters.output_path, doc_matters.src.language); + auto out_pth = spineOutPaths!()(doc_matters.output_path, doc_matters.src.language); string base_dir = "latex"; return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array; } @@ -1514,10 +1514,10 @@ template DocReformPathsLaTeX() { #+name: template_paths_sqlite #+BEGIN_SRC d -template DocReformPathsSQLiteDiscrete() { - mixin DocReformRgxInit; +template spinePathsSQLiteDiscrete() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsSQLiteDiscrete()( + auto spinePathsSQLiteDiscrete()( string output_pth_root, string lng, ) { @@ -1526,7 +1526,7 @@ template DocReformPathsSQLiteDiscrete() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = DocReformOutPaths!()(output_pth_root, lng); + auto out_pth = spineOutPaths!()(output_pth_root, lng); string base_dir = "sqlite"; return (((out_pth.output_base).chainPath(base_dir)).asNormalizedPath).array; } @@ -1546,10 +1546,10 @@ template DocReformPathsSQLiteDiscrete() { #+name: template_paths_sqlite #+BEGIN_SRC d -template DocReformPathsSQLite() { - mixin DocReformRgxInit; +template spinePathsSQLite() { + mixin spineRgxInit; static auto rgx = Rgx(); - auto DocReformPathsSQLite(DbN, Po)( + auto spinePathsSQLite(DbN, Po)( DbN db_name, Po output_pth_root, ) { @@ -1558,7 +1558,7 @@ template DocReformPathsSQLite() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = DocReformOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language + auto out_pth = spineOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language string base_dir = "sqlite"; return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array; } diff --git a/org/default_regex.org b/org/default_regex.org index 2a13dbb..17fb605 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -37,7 +37,7 @@ http://dlang.org/phobos/std_regex.html regex: regular expressions used in sisu document parser +/ module doc_reform.meta.rgx; -static template DocReformRgxInit() { +static template spineRgxInit() { import doc_reform.meta.defaults; static struct Rgx { <> @@ -370,7 +370,7 @@ http://dlang.org/phobos/std_regex.html regex: regular expressions used in sisu document parser +/ module doc_reform.output.rgx; -static template DocReformOutputRgxInit() { +static template spineOutputRgxInit() { import doc_reform.output.defaults; static struct Rgx { <> diff --git a/org/imports.org b/org/imports.org index 35decf7..b835ad9 100644 --- a/org/imports.org +++ b/org/imports.org @@ -15,7 +15,7 @@ #+EXPORT_EXCLUDE_TAGS: noexport #+TAGS: assert(a) class(c) debug(d) mixin(m) spine(s) tangle(T) template(t) WEB(W) noexport(n) -* 1. imports for meta :meta: +* imports for _meta_ :meta: ** package dir #+BEGIN_SRC d :tangle "../src/doc_reform/meta/package.d" @@ -45,7 +45,7 @@ public import std.conv : to; #+END_SRC -* 2. imports for output :output: +* imports for _output_ :output: ** package dir #+BEGIN_SRC d :tangle "../src/doc_reform/output/package.d" diff --git a/org/in_source_files.org b/org/in_source_files.org index 121b070..548c6e5 100644 --- a/org/in_source_files.org +++ b/org/in_source_files.org @@ -50,7 +50,7 @@ static template readConfigSite() { import doc_reform.meta.rgx; <> - mixin DocReformRgxInit; + mixin spineRgxInit; final auto readConfigSite(M,E)( M _manifested, E _env, @@ -119,7 +119,7 @@ static template readConfigDoc() { import doc_reform.meta.rgx; <> - mixin DocReformRgxInit; + mixin spineRgxInit; final auto readConfigDoc(M,E)(M _manifested, E _env) { static auto rgx = Rgx(); string config_file_str; @@ -222,11 +222,11 @@ static template configReadDocYAML() { - if master file scan for addional files to import/insert +/ module doc_reform.source.read_source_files; -static template DocReformRawMarkupContent() { +static template spineRawMarkupContent() { import doc_reform.meta.rgx; <> - mixin DocReformRgxInit; + mixin spineRgxInit; static auto rgx = Rgx(); string[] _images=[]; auto _extract_images(S)(S content_block) { @@ -238,7 +238,7 @@ static template DocReformRawMarkupContent() { return images_; } auto rawsrc = RawMarkupContent(); - auto DocReformRawMarkupContent(O,Fn)(O _opt_action, Fn fn_src) { + auto spineRawMarkupContent(O,Fn)(O _opt_action, Fn fn_src) { auto _0_header_1_body_content_2_insert_filelist_tuple = rawsrc.sourceContentSplitIntoHeaderAndBody(_opt_action, rawsrc.sourceContent(fn_src), fn_src); return _0_header_1_body_content_2_insert_filelist_tuple; @@ -303,7 +303,7 @@ static template DocReformRawMarkupContent() { char[][] markup_sourcefile_insert_content, string fn_src ) { - mixin DocReformRgxInitFlags; + mixin spineRgxInitFlags; <> foreach (line; markup_sourcefile_insert_content) { <> @@ -316,7 +316,7 @@ static template DocReformRawMarkupContent() { string fn_src ) { import std.algorithm; - mixin DocReformRgxInitFlags; + mixin spineRgxInitFlags; <> foreach (line; sourcefile_body_content) { <> diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index f87701e..056985b 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -68,7 +68,7 @@ import import doc_reform.meta.defaults, doc_reform.meta.rgx; -mixin DocReformRgxInit; +mixin spineRgxInit; static auto rgx = Rgx(); mixin InternalMarkup; auto mkup = InlineMarkup(); @@ -332,7 +332,7 @@ JSONValue config_jsonstr = `{ }`; #+END_SRC -* 1. YAML to DocReformStruct :module:conf_make_meta:yaml: +* 1. YAML to spineStruct :module:conf_make_meta:yaml: ** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d" @@ -341,7 +341,7 @@ JSONValue config_jsonstr = `{ extract yaml header return struct +/ module doc_reform.meta.conf_make_meta_yaml; -static template contentYAMLtoDocReformStruct() { +static template contentYAMLtoSpineStruct() { import std.algorithm, std.array, @@ -359,13 +359,13 @@ static template contentYAMLtoDocReformStruct() { doc_reform.meta.defaults, doc_reform.meta.rgx; ConfComposite _struct_composite; - auto contentYAMLtoDocReformStruct(C,Y,M)( + auto contentYAMLtoSpineStruct(C,Y,M)( C _struct_composite, Y _yaml, M _manifested, string _identifier ) { - mixin DocReformRgxInit; + mixin spineRgxInit; static auto rgx = Rgx(); confCompositeMakeBuild _mk; <> @@ -1134,7 +1134,7 @@ if ("rights" in _yaml } #+END_SRC -* 1. JSON to DocReformStruct :module:conf_make_meta:json: +* 1. JSON to spineStruct :module:conf_make_meta:json: ** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_json.d" @@ -1143,7 +1143,7 @@ if ("rights" in _yaml extract json header return json +/ module doc_reform.meta.conf_make_meta_json; -static template contentJSONtoDocReformStruct() { +static template contentJSONtoSpineStruct() { import std.algorithm, std.array, @@ -1161,8 +1161,8 @@ static template contentJSONtoDocReformStruct() { doc_reform.meta.defaults, doc_reform.meta.rgx; ConfComposite _struct_composite; - auto contentJSONtoDocReformStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) { - mixin DocReformRgxInit; + auto contentJSONtoSpineStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) { + mixin spineRgxInit; static auto rgx = Rgx(); debug (json) { writeln(">> --------------------------- >>"); @@ -1801,16 +1801,16 @@ if ("rights" in _json.object) { } #+END_SRC -** 1. parse Yaml config return DocReformStruct +** 1. parse Yaml config return spineStruct #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d" -static template configParseYAMLreturnDocReformStruct() { +static template configParseYAMLreturnSpineStruct() { import dyaml; import doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json; - mixin contentYAMLtoDocReformStruct; - auto configParseYAMLreturnDocReformStruct(T,CCm,M)( + mixin contentYAMLtoSpineStruct; + auto configParseYAMLreturnSpineStruct(T,CCm,M)( T _document_struct, CCm _make_and_meta_struct, M _manifested @@ -1819,7 +1819,7 @@ static template configParseYAMLreturnDocReformStruct() { try { yaml_root = Loader.fromString(_document_struct.content).load(); _make_and_meta_struct - = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml + = contentYAMLtoSpineStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml } catch { import std.stdio; writeln("ERROR failed to read content, not parsed as yaml"); @@ -1847,8 +1847,8 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() { doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json, doc_reform.meta.rgx; - mixin DocReformRgxInit; - mixin contentJSONtoDocReformStruct; + mixin spineRgxInit; + mixin contentJSONtoSpineStruct; static auto rgx = Rgx(); auto docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct(CCm,Src,M)( Src header_src, @@ -1865,7 +1865,7 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() { } } auto _header_and_make_and_meta_struct - = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header"); + = contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header"); return _header_and_make_and_meta_struct; } } diff --git a/org/meta_debugs.org b/org/meta_debugs.org index f3518a6..f070ada 100644 --- a/org/meta_debugs.org +++ b/org/meta_debugs.org @@ -24,13 +24,13 @@ output debugs +/ module doc_reform.meta.doc_debugs; -template DocReformDebugs() { +template spineDebugs() { <> - auto DocReformDebugs(S,T)( + auto spineDebugs(S,T)( const S contents, T doc_matters, ) { - mixin DocReformRgxInit; + mixin spineRgxInit; mixin InternalMarkup; <> <> diff --git a/org/metaverse.org b/org/metaverse.org index e76e7b9..c5fa4ba 100644 --- a/org/metaverse.org +++ b/org/metaverse.org @@ -29,7 +29,7 @@ Process markup document, create document abstraction. metadoc_from_src.d +/ module doc_reform.meta.metadoc_from_src; -template DocReformDocAbstraction() { +template docAbstraction() { /+ ↓ abstraction imports +/ <> /+ ↓ abstraction mixins +/ @@ -38,7 +38,7 @@ template DocReformDocAbstraction() { <> <> /+ ↓ abstract marked up document +/ - auto DocReformDocAbstraction(CMM,Opt,Mf)( + auto docAbstraction(CMM,Opt,Mf)( char[][] markup_sourcefile_content, CMM conf_make_meta, Opt opt_action, @@ -134,7 +134,7 @@ template DocReformDocAbstraction() { /+ ↓ abstraction functions assertions +/ <> /+ abstraction functions assertions ↑ +/ -} /+ ← closed: template DocReformDocAbstraction +/ +} /+ ← closed: template docAbstraction +/ <> #+END_SRC @@ -163,7 +163,7 @@ import #+BEGIN_SRC d mixin ObjectSetter; mixin InternalMarkup; -mixin DocReformRgxInit; +mixin spineRgxInit; #+END_SRC *** initialize :initialize: @@ -514,8 +514,8 @@ scope(exit) { #+name: abs_init_rest #+BEGIN_SRC d -mixin DocReformRgxInitFlags; -mixin DocReformNode; +mixin spineRgxInitFlags; +mixin spineNode; 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; @@ -3618,7 +3618,7 @@ void flow_txt_block_biblio( return ref string biblio_entry_str_json, return ref string[] biblio_arr_json ) { - mixin DocReformBiblio; + mixin spineBiblio; auto jsn = BibJsnStr(); static auto rgx = Rgx(); if (line.matchFirst(rgx.heading_biblio) @@ -6572,7 +6572,7 @@ struct BookIndexReportSection { debug(asserts) { static assert(is(typeof(obj_cite_digits.object_number) == int)); } - mixin DocReformNode; + mixin spineNode; mixin InternalMarkup; static auto mkup = InlineMarkup(); string type_is; @@ -6852,7 +6852,7 @@ struct NotesSection { N obj_cite_digits, O opt_action, ) { - mixin DocReformNode; + mixin spineNode; ObjGenericComposite[] the_endnotes_section; auto endnotes_ = gathered_notes(); string type_is; diff --git a/org/out_harvest_metadata.org b/org/out_harvest_metadata.org index b2c7b1a..b99820e 100644 --- a/org/out_harvest_metadata.org +++ b/org/out_harvest_metadata.org @@ -21,8 +21,8 @@ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_harvest.d" module doc_reform.meta.metadoc_harvest; -template DocReformMetaDocHarvest() { - auto DocReformMetaDocHarvest(T,H)( +template spineMetaDocHarvest() { + auto spineMetaDocHarvest(T,H)( T doc_matters, H hvst, ) { @@ -88,8 +88,8 @@ writefln( #+name: meta_metadoc_harvest #+BEGIN_SRC d import doc_reform.output.paths_output; -auto pth_html_abs = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); -auto pth_html_rel = DocReformDocRootTreeHTML!()(doc_matters.src.language); +auto pth_html_abs = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); +auto pth_html_rel = spineDocRootTreeHTML!()(doc_matters.src.language); hvst.harvest.title = doc_matters.conf_make_meta.meta.title_full; hvst.harvest.author = doc_matters.conf_make_meta.meta.creator_author; hvst.harvest.author_surname = doc_matters.conf_make_meta.meta.creator_author_surname; @@ -123,12 +123,12 @@ module doc_reform.meta.metadoc_harvests_topics; import doc_reform.meta.defaults, doc_reform.meta.rgx; - mixin DocReformHarvest; + mixin spineHarvest; mixin InternalMarkup; - mixin DocReformRgxInit; -template DocReformMetaDocHarvestsTopics() { + mixin spineRgxInit; +template spineMetaDocHarvestsTopics() { auto mkup = InlineMarkup(); - void DocReformMetaDocHarvestsTopics(H,M,O)( + void spineMetaDocHarvestsTopics(H,M,O)( H hvst, M _make_and_meta_struct, O _opt_action, @@ -419,7 +419,7 @@ foreach(k0; #+NAME: harvested_topics_html_write #+BEGIN_SRC d import doc_reform.output.paths_output; -auto out_pth = DocReformPathsHTML!()(_make_and_meta_struct.conf.output_path, ""); +auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); try { auto f = File(out_pth.harvest("topics.html"), "w"); foreach (o; topics) { @@ -446,12 +446,12 @@ module doc_reform.meta.metadoc_harvests_authors; import doc_reform.meta.defaults, doc_reform.meta.rgx; - mixin DocReformHarvest; + mixin spineHarvest; mixin InternalMarkup; - mixin DocReformRgxInit; -template DocReformMetaDocHarvestsAuthors() { + mixin spineRgxInit; +template spineMetaDocHarvestsAuthors() { auto mkup = InlineMarkup(); - void DocReformMetaDocHarvestsAuthors(H,M,O)( + void spineMetaDocHarvestsAuthors(H,M,O)( H harvests, M _make_and_meta_struct, O _opt_action, @@ -569,7 +569,7 @@ template DocReformMetaDocHarvestsAuthors() { #+NAME: harvested_authors_html_write #+BEGIN_SRC d import doc_reform.output.paths_output; -auto out_pth = DocReformPathsHTML!()(_make_and_meta_struct.conf.output_path, ""); +auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); try { auto f = File(out_pth.harvest("authors.html"), "w"); foreach (o; authors) { @@ -752,7 +752,7 @@ string theme_light_1 = format(q"┃