diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/default_misc.org | 12 | ||||
| -rw-r--r-- | org/default_paths.org | 94 | ||||
| -rw-r--r-- | org/default_regex.org | 4 | ||||
| -rw-r--r-- | org/imports.org | 4 | ||||
| -rw-r--r-- | org/in_source_files.org | 14 | ||||
| -rw-r--r-- | org/meta_conf_make_meta.org | 34 | ||||
| -rw-r--r-- | org/meta_debugs.org | 6 | ||||
| -rw-r--r-- | org/metaverse.org | 18 | ||||
| -rw-r--r-- | org/out_harvest_metadata.org | 30 | ||||
| -rw-r--r-- | org/out_latex.org | 10 | ||||
| -rw-r--r-- | org/out_odt.org | 14 | ||||
| -rw-r--r-- | org/out_sqlite.org | 20 | ||||
| -rw-r--r-- | org/out_src_pod.org | 10 | ||||
| -rw-r--r-- | org/out_xmls.org | 34 | ||||
| -rw-r--r-- | org/out_xmls_css.org | 10 | ||||
| -rw-r--r-- | org/output_hub.org | 6 | ||||
| -rw-r--r-- | org/output_show.org | 16 | ||||
| -rw-r--r-- | org/spine.org | 52 |
18 files changed, 194 insertions, 194 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 { <<meta_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 { <<prgmkup_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; <<imports_std>> - 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; <<imports_std>> - 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; <<imports_std>> - 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; <<meta_inserts_scan>> foreach (line; markup_sourcefile_insert_content) { <<meta_inserts_scan_loop>> @@ -316,7 +316,7 @@ static template DocReformRawMarkupContent() { string fn_src ) { import std.algorithm; - mixin DocReformRgxInitFlags; + mixin spineRgxInitFlags; <<meta_master_doc_scan_for_insert_filenames>> foreach (line; sourcefile_body_content) { <<meta_master_doc_scan_for_insert_filenames_loop>> 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; <<yaml_objects>> @@ -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() { <<debug_imports>> - auto DocReformDebugs(S,T)( + auto spineDebugs(S,T)( const S contents, T doc_matters, ) { - mixin DocReformRgxInit; + mixin spineRgxInit; mixin InternalMarkup; <<initialize>> <<meta_output_debugs>> 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 +/ <<abs_top_imports>> /+ ↓ abstraction mixins +/ @@ -38,7 +38,7 @@ template DocReformDocAbstraction() { <<abs_top_init_struct>> <<abs_inline_para_tag_associations>> /+ ↓ 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 +/ <<abs_functions_assertions>> /+ abstraction functions assertions ↑ +/ -} /+ ← closed: template DocReformDocAbstraction +/ +} /+ ← closed: template docAbstraction +/ <<template_doc_sect_keys_seq>> #+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"┃ <link rel="generator" href="http://sisudoc.org" /> <link href="./css/harvest.css" rel="stylesheet"> <style TYPE="text/css"> -/* DocReform harvest css default stylesheet */%s +/* spine harvest css default stylesheet */%s .norm, .bold { line-height : 150%%; margin-left : 1em; diff --git a/org/out_latex.org b/org/out_latex.org index f9c6d55..888507e 100644 --- a/org/out_latex.org +++ b/org/out_latex.org @@ -24,9 +24,9 @@ module doc_reform.output.latex; template outputLaTeX() { <<output_latex_imports>> mixin InternalMarkup; // watch - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); - mixin DocReformLanguageCodes; + mixin spineLanguageCodes; auto lang = Lang(); <<output_latex_shared>> <<output_latex_shared_0>> @@ -54,7 +54,7 @@ void writeOutputLaTeX(T,M)( const T latex_content, M doc_matters, ) { - auto pth_latex = DocReformPathsLaTeX(doc_matters); + auto pth_latex = spinePathsLaTeX(doc_matters); try { { /+ debug +/ if (doc_matters.opt.action.debug_do @@ -391,7 +391,7 @@ string links_and_images(O,M)( return _width; } string _latex_image_path(string _image_path) { - auto pth_latex = DocReformPathsLaTeX(doc_matters); + auto pth_latex = spinePathsLaTeX(doc_matters); _image_path = pth_latex.latex_path_stuff ~ "/" ~ _image_path; return _image_path; } @@ -1224,7 +1224,7 @@ string latex_head(M)( #+name: output_latex_head_0_format_string #+BEGIN_SRC d - string _latex_head = format(q"┃%%%% DocReform LaTeX output + string _latex_head = format(q"┃%%%% spine LaTeX output #+END_SRC ***** description comment diff --git a/org/out_odt.org b/org/out_odt.org index 0a7f93d..966554d 100644 --- a/org/out_odt.org +++ b/org/out_odt.org @@ -48,7 +48,7 @@ module doc_reform.output.odt; template formatODT() { <<output_imports>> - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; struct formatODT { static auto rgx = Rgx(); <<odt_format_objects>> @@ -57,7 +57,7 @@ template formatODT() { template outputODT() { <<output_imports>> mixin InternalMarkup; - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); // mixin outputXmlODT; <<output_odt_variable_content_xml>> @@ -848,7 +848,7 @@ void writeOutputODT(W,I)( const W odt_content, I doc_matters, ) { - auto pth_odt = DocReformPathsODT!()(doc_matters); + auto pth_odt = spinePathsODT!()(doc_matters); auto fn_odt = pth_odt.odt_file; auto zip = new ZipArchive(); // ZipArchive zip = new ZipArchive(); void ODTzip()(string contents, string fn) { @@ -948,7 +948,7 @@ void outputODT(D,I)( string manifest_xml; // image list changes string meta_xml; // time stamp } - // auto pth_odt = DocReformPathsODT!()(doc_matters); + // auto pth_odt = spinePathsODT!()(doc_matters); auto odt = ODT(); odt.mimetype = mimetype; odt.manifest_rdf = manifest_rdf; @@ -990,7 +990,7 @@ import void dirtree(I)( I doc_matters, ) { - auto pth_odt = DocReformPathsODT!()(doc_matters); + auto pth_odt = spinePathsODT!()(doc_matters); if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/ if (!exists(pth_odt.meta_inf_dir("fs"))) { pth_odt.meta_inf_dir("fs").mkdirRecurse; @@ -2391,7 +2391,7 @@ string odt_body(D,I)( #+name: output_odt_variable_content_xml #+BEGIN_SRC d string odt_tail() { - string _odt_tail = format(q"┃<text:p text:style-name="P_normal">DocReform: <<text:a xl:type="simple" xl:href="http://www.doc_reform.org">www.doc_reform.org</text:a>> and <<text:a xl:type="simple" xl:href="http://www.sisudoc.org">www.sisudoc.org</text:a>></text:p> + string _odt_tail = format(q"┃<text:p text:style-name="P_normal">spine: <<text:a xl:type="simple" xl:href="http://www.doc_reform.org">www.doc_reform.org</text:a>> and <<text:a xl:type="simple" xl:href="http://www.sisudoc.org">www.sisudoc.org</text:a>></text:p> </office:text></office:body></office:document-content>┃",); return _odt_tail; } @@ -2498,7 +2498,7 @@ void images_cp(M)( auto ref M doc_matters, ) { { /+ (copy odt images) +/ - auto pth_odt = DocReformPathsODT!()(doc_matters); + auto pth_odt = spinePathsODT!()(doc_matters); foreach (image; doc_matters.srcs.image_list) { auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image; auto fn_src_out_file = pth_odt.image_dir("fs") ~ "/" ~ image; diff --git a/org/out_sqlite.org b/org/out_sqlite.org index 7115a41..bebad0e 100644 --- a/org/out_sqlite.org +++ b/org/out_sqlite.org @@ -28,7 +28,7 @@ module doc_reform.output.sqlite; <<output_imports>> import d2sqlite3; import std.typecons : Nullable; -mixin DocReformOutputRgxInit; +mixin spineOutputRgxInit; mixin InternalMarkup; static auto rgx = Rgx(); static auto mkup = InlineMarkup(); @@ -38,7 +38,7 @@ template SQLiteHubBuildTablesAndPopulate() { const D doc_abstraction, M doc_matters, ) { - auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); template SQLiteDbStatementComposite() { @@ -66,8 +66,8 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { const D doc_abstraction, M doc_matters, ) { - auto url_html = DocReformUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); - auto pth_sqlite = DocReformPathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); + auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); + auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename)); template SQLiteDiscreteDbStatementComposite() { @@ -142,7 +142,7 @@ template SQLiteFormatAndLoadObject() { auto SQLiteFormatAndLoadObject(M)( M doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; struct sqlite_format_and_load_objects { <<sanitize_text_for_search>> <<sanitize_and_munge_inline_html>> @@ -211,7 +211,7 @@ template SQLiteInsertDocObjectsLoop() { M doc_matters, ) { string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid); - auto url_html = DocReformUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); + auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root, doc_matters.src.language); string insertDocObjectsRow(O)(O obj) { <<sqlite_formatted_insertions_doc_objects>> return _insert_doc_objects_row; @@ -243,7 +243,7 @@ template SQLiteTablesCreate() { } if (opt_action.sqlite_db_create) { string _db_statement; - auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = spinePathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); { @@ -262,7 +262,7 @@ template SQLiteDbDrop() { void SQLiteDbDrop(O)(O opt_action) { writeln("db drop"); if ((opt_action.sqlite_db_drop)) { - auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = spinePathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); writeln("remove(", pth_sqlite.sqlite_file, ")"); try { remove(pth_sqlite.sqlite_file); @@ -283,7 +283,7 @@ template SQLiteDbDrop() { string _db_statement; { if ((doc_matters.opt.action.sqlite_db_create)) { - auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; _db_statement ~= SQLiteTablesReCreate!()(); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "TABLE RE-CREATE"); @@ -553,7 +553,7 @@ string inline_links(M,O)( rgx.inline_seg_link, "$1"); } - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); if (_xml_type == "seg") { foreach (m; _txt.match(rgx.inline_link_hash)) { if (m.captures[3] in doc_matters.has.tag_associations) { diff --git a/org/out_src_pod.org b/org/out_src_pod.org index df6be5f..ab0e14b 100644 --- a/org/out_src_pod.org +++ b/org/out_src_pod.org @@ -23,9 +23,9 @@ #+BEGIN_SRC d :tangle "../src/doc_reform/output/source_pod.d" module doc_reform.output.source_pod; -template DocReformPod() { +template spinePod() { <<output_imports>> - void DocReformPod(T)(T doc_matters) { + void spinePod(T)(T doc_matters) { <<source_pod_init>> <<source_pod_archive>> try { @@ -63,12 +63,12 @@ import debug(asserts) { // static assert(is(typeof(doc_matters) == tuple)); } -mixin DocReformOutputRgxInit; +mixin spineOutputRgxInit; string pwd = doc_matters.env.pwd; auto src_path_info = doc_matters.src_path_info; auto pth_dr_doc_src = doc_matters.src_path_info; -auto pths_pod = DocReformPathsPods!()(doc_matters); -mixin DocReformLanguageCodes; +auto pths_pod = spinePathsPods!()(doc_matters); +mixin spineLanguageCodes; auto lang = Lang(); static auto rgx = Rgx(); assert (doc_matters.src.filename.match(rgx.src_fn)); diff --git a/org/out_xmls.org b/org/out_xmls.org index ea1af4a..d29a993 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -26,7 +26,7 @@ module doc_reform.output.xmls; template outputXHTMLs() { <<output_imports>> - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; struct outputXHTMLs { static auto rgx = Rgx(); <<xhtml_format_objects>> @@ -169,7 +169,7 @@ string header_metadata(M)( ) { string _publisher="Publisher"; // TODO string o; - o = format(q"┃<!-- DocReform header metadata --> + o = format(q"┃<!-- spine header metadata --> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="dc.title" content="%s" /> <meta name="dc.author" content="%s" /> @@ -184,7 +184,7 @@ string header_metadata(M)( <meta name="dc.rights" content="%s" /> <meta name="generator" content="%s" /> <link rel="generator" href="%s" /> -<!-- DocReform header metadata -->┃", +<!-- spine header metadata -->┃", doc_matters.conf_make_meta.meta.title_full, doc_matters.conf_make_meta.meta.creator_author, _publisher, @@ -241,7 +241,7 @@ string inline_search_form(M)( M doc_matters, ) { string _action="http://www.sisudoc.org/cgi-bin/search.cgi"; - string _db="DocReform.7a.manual"; + string _db="spine.7a.manual"; string o; string _form; if (doc_matters.opt.action.workon) { @@ -1535,7 +1535,7 @@ void scroll(D,M)( const D doc_abstraction, M doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc_html; @@ -1744,7 +1744,7 @@ void scroll_write_output(D,M)( debug(asserts) { static assert(is(typeof(doc) == string[])); } - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.base)) { pth_html.base.mkdirRecurse; @@ -1771,7 +1771,7 @@ void seg(D,M)( const D doc_abstraction, M doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); auto xhtml_format = outputXHTMLs(); string[][string] doc_html; @@ -2076,9 +2076,9 @@ void seg_write_output(D,E,M)( debug(asserts) { static assert(is(typeof(doc_html) == string[][string])); } - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto rgx = Rgx(); - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); auto xhtml_format = outputXHTMLs(); auto m = doc_matters.src.filename.matchFirst(rgx.src_fn); try { @@ -2109,8 +2109,8 @@ void seg_write_output(D,E,M)( #+name: output_html_css #+BEGIN_SRC d void css(M)(M doc_matters) { - auto css = DocReformCss(doc_matters); - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto css = spineCss(doc_matters); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.css)) { (pth_html.css).mkdirRecurse; @@ -2134,7 +2134,7 @@ void images_cp(M)( ) { { /+ (copy html images) +/ - auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language); if (!exists(pth_html.image)) { pth_html.image.mkdirRecurse; } @@ -2235,7 +2235,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container"> #+BEGIN_SRC d string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) { auto xhtml_format = outputXHTMLs(); - auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language); string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters! string content = format(q"┃ <?xml version='1.0' encoding='utf-8'?> <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID"> @@ -2441,7 +2441,7 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) { <title>%s%s</title> <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> <meta name="dtb:uid" content="urn:uuid:%s" /> - <!-- <meta name="epub-creator" content="DocReform http://www.jus.uio.no/sisu (this copy)" /> --> + <!-- <meta name="epub-creator" content="spine http://www.jus.uio.no/sisu (this copy)" /> --> <meta name="dtb:depth" content="%s" /> <meta name="dtb:totalPageCount" content="0" /> <meta name="dtb:maxPageNumber" content="0" /> @@ -2527,7 +2527,7 @@ void outputEPub3(D,I)( const D doc_abstraction, I doc_matters, ) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc; @@ -2893,7 +2893,7 @@ void epub3_write_output_files(W,M)( static assert(is(typeof(epub_write.oebps_content_opf) == string)); } static auto rgx = Rgx(); - auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = spinePathsEPUB!()(doc_matters.output_path, doc_matters.src.language); auto xhtml_format = outputXHTMLs(); /+ zip file +/ auto fn_epub = pth_epub3.epub_file(doc_matters.src.filename); @@ -3048,7 +3048,7 @@ void epub3_write_output_files(W,M)( } } { /+ OEBPS/epub.css +/ - auto css = DocReformCss(doc_matters); + auto css = spineCss(doc_matters); { /+ debug +/ if (doc_matters.opt.action.debug_do) { fn_dbg = pth_epub3.dbg_fn_oebps_css(doc_matters.src.filename); diff --git a/org/out_xmls_css.org b/org/out_xmls_css.org index b16bee0..a53c065 100644 --- a/org/out_xmls_css.org +++ b/org/out_xmls_css.org @@ -26,9 +26,9 @@ default css settings +/ module doc_reform.output.xmls_css; -template DocReformCss() { +template spineCss() { import std.format; - auto DocReformCss(M)(M doc_matters) { + auto spineCss(M)(M doc_matters) { <<css_insert_shared_insert_variable_indent_values>> <<css_insert_shared_insert_variable_ocn_color_values>> string _css_light_html_seg = format(q"┃ @@ -81,9 +81,9 @@ template DocReformCss() { ); auto css_() { struct _CSS { - string html_seg = "/* DocReform css html seg stylesheet */\n"; - string html_scroll = "/* DocReform css html scroll stylesheet */\n"; - string epub = "/* DocReform css epub stylesheet */\n"; + string html_seg = "/* spine css html seg stylesheet */\n"; + string html_scroll = "/* spine css html scroll stylesheet */\n"; + string epub = "/* spine css epub stylesheet */\n"; } return _CSS(); } diff --git a/org/output_hub.org b/org/output_hub.org index 029595b..a8b9e01 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -30,7 +30,7 @@ template outputHub() { <<output_imports>> import std.parallelism; void outputHub(D,I)(const D doc_abstraction, I doc_matters) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; mixin Msg; auto msg = Msg!()(doc_matters); static auto rgx = Rgx(); @@ -57,7 +57,7 @@ template outputHub() { template outputHubOp() { <<output_imports>> void outputHubOp(E,O)(E env, O opt_action) { - mixin DocReformOutputRgxInit; + mixin spineOutputRgxInit; static auto rgx = Rgx(); <<output_options_op>> } @@ -90,7 +90,7 @@ if (sched == outTask.source_or_pod) { msg.v("spine (doc reform) source pod processing... "); } import doc_reform.output.source_pod; - DocReformPod!()(doc_matters); + spinePod!()(doc_matters); if (doc_matters.opt.action.source) { msg.vv("spine (doc reform) source done"); } diff --git a/org/output_show.org b/org/output_show.org index ea987d4..5d3f4f8 100644 --- a/org/output_show.org +++ b/org/output_show.org @@ -21,8 +21,8 @@ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_summary.d" module doc_reform.meta.metadoc_show_summary; -template DocReformMetaDocSummary() { - void DocReformMetaDocSummary(S,T)( +template spineMetaDocSummary() { + void spineMetaDocSummary(S,T)( const S doc_abstraction, T doc_matters, ) { @@ -136,8 +136,8 @@ writefln( #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_config.d" module doc_reform.meta.metadoc_show_config; -template DocReformShowConfig() { - void DocReformShowConfig(T)( +template spineShowConfig() { + void spineShowConfig(T)( T doc_matters, ) { <<metadoc_show_summary_imports>> @@ -238,8 +238,8 @@ writefln( #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_make.d" module doc_reform.meta.metadoc_show_make; -template DocReformShowMake() { - void DocReformShowMake(T)( +template spineShowMake() { + void spineShowMake(T)( T doc_matters, ) { <<metadoc_show_summary_imports>> @@ -309,8 +309,8 @@ writefln( #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_show_metadata.d" module doc_reform.meta.metadoc_show_metadata; -template DocReformShowMetaData() { - void DocReformShowMetaData(T)( +template spineShowMetaData() { + void spineShowMetaData(T)( T doc_matters, ) { <<metadoc_show_summary_imports>> diff --git a/org/spine.org b/org/spine.org index c88afa8..a0be34d 100644 --- a/org/spine.org +++ b/org/spine.org @@ -78,7 +78,7 @@ import std.algorithm; import std.parallelism; <<mixin_spine_version>> <<mixin_pre_main>> -string project_name = "DocReform"; +string project_name = "spine"; string program_name = "spine"; /++ name "spine" @@ -121,14 +121,14 @@ void main(string[] args) { } if (hvst.harvests.length > 0) { if (_opt_action.harvest_topics) { - DocReformMetaDocHarvestsTopics!()(hvst, _make_and_meta_struct, _opt_action); + spineMetaDocHarvestsTopics!()(hvst, _make_and_meta_struct, _opt_action); } if (_opt_action.harvest_authors) { - DocReformMetaDocHarvestsAuthors!()(hvst.harvests, _make_and_meta_struct, _opt_action); + spineMetaDocHarvestsAuthors!()(hvst.harvests, _make_and_meta_struct, _opt_action); } if (!(_opt_action.quiet)) { 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, ""); if (_opt_action.harvest_authors) { writeln("- ", out_pth.harvest("authors.html")); } @@ -267,10 +267,10 @@ mixin CompileTimeInfo; #+NAME: spine_mixin #+BEGIN_SRC d -mixin DocReformRgxInit; -mixin contentJSONtoDocReformStruct; -mixin DocReformBiblio; -mixin DocReformRgxInitFlags; +mixin spineRgxInit; +mixin contentJSONtoSpineStruct; +mixin spineBiblio; +mixin spineRgxInitFlags; mixin outputHub; #+END_SRC @@ -278,7 +278,7 @@ mixin outputHub; #+NAME: spine_init #+BEGIN_SRC d -auto hvst = DocReformHarvest!(); +auto hvst = spineHarvest!(); #+END_SRC **** args :args: @@ -768,7 +768,7 @@ if (_opt_action.config_path_set.empty) { auto _config_local_site_struct = readConfigSite!()(_manifested, _env); if (_config_local_site_struct.filetype == "yaml") { import doc_reform.meta.conf_make_meta_yaml; - _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifested); // - get local site config + _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifested); // - get local site config break; } } @@ -779,7 +779,7 @@ if (_opt_action.config_path_set.empty) { auto _config_local_site_struct = readConfigSite!()(_manifested, _env, _opt_action.config_path_set); if (_config_local_site_struct.filetype == "yaml") { import doc_reform.meta.conf_make_meta_yaml; - _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifested); // - get local site config + _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifested); // - get local site config } } } @@ -947,7 +947,7 @@ foreach(arg; args[1..$]) { // refigure how args relate to _opt_action, need path auto _config_document_struct = readConfigDoc!()(_manifest, _env); if (_config_document_struct.filetype == "yaml") { import doc_reform.meta.conf_make_meta_yaml; - _make_and_meta_struct = _config_document_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifest); + _make_and_meta_struct = _config_document_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifest); } } #+END_SRC @@ -1014,7 +1014,7 @@ if ((_opt_action.debug_do) ) { writeln("--->\nstepX commence → (document abstraction)"); } -auto t = DocReformAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct); +auto t = spineAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct); static assert(!isTypeTuple!(t)); static assert(t.length==2); auto doc_abstraction = t[dAM.abstraction]; @@ -1038,7 +1038,7 @@ if (doc_matters.opt.action.verbose || doc_matters.opt.action.show_summary ) { import doc_reform.meta.metadoc_show_summary; - DocReformMetaDocSummary!()(doc_abstraction, doc_matters); + spineMetaDocSummary!()(doc_abstraction, doc_matters); } #+END_SRC @@ -1051,7 +1051,7 @@ if (doc_matters.opt.action.verbose if (doc_matters.opt.action.show_metadata ) { import doc_reform.meta.metadoc_show_metadata; - DocReformShowMetaData!()(doc_matters); + spineShowMetaData!()(doc_matters); } #+END_SRC @@ -1064,7 +1064,7 @@ if (doc_matters.opt.action.show_metadata if (doc_matters.opt.action.show_make ) { import doc_reform.meta.metadoc_show_make; - DocReformShowMake!()(doc_matters); + spineShowMake!()(doc_matters); } #+END_SRC @@ -1077,7 +1077,7 @@ if (doc_matters.opt.action.show_make if (doc_matters.opt.action.show_config ) { import doc_reform.meta.metadoc_show_config; - DocReformShowConfig!()(doc_matters); + spineShowConfig!()(doc_matters); } #+END_SRC @@ -1087,7 +1087,7 @@ if (doc_matters.opt.action.show_config #+NAME: spine_each_file_do_debugs_checkdoc #+BEGIN_SRC d if (doc_matters.opt.action.harvest) { - hvst.harvests ~= DocReformMetaDocHarvest!()(doc_matters, hvst); + hvst.harvests ~= spineMetaDocHarvest!()(doc_matters, hvst); } #+END_SRC @@ -1098,7 +1098,7 @@ if (doc_matters.opt.action.harvest) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.debug_do) { - DocReformDebugs!()(doc_abstraction, doc_matters); + spineDebugs!()(doc_abstraction, doc_matters); } #+END_SRC @@ -1154,14 +1154,14 @@ break; // terminate, stop #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc.d" module doc_reform.meta.metadoc; -template DocReformAbstraction() { +template spineAbstraction() { <<imports_spine>> <<spine_mixin>> enum headBody { header, body_content, header_type, insert_file_list, image_list } enum makeMeta { make, meta } enum docAbst { doc_abstract_obj, doc_has } static auto rgx = Rgx(); - auto DocReformAbstraction(E,P,O,M,S)( + auto spineAbstraction(E,P,O,M,S)( E _env, P program_info, O _opt_action, @@ -1218,7 +1218,7 @@ if ((_opt_action.debug_do) ); } auto _header_body_insertfilelist_imagelist - = DocReformRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn); + = spineRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn); static assert(!isTypeTuple!(_header_body_insertfilelist_imagelist)); static assert(_header_body_insertfilelist_imagelist.length==5); if ((_opt_action.debug_do) @@ -1291,7 +1291,7 @@ if ((_opt_action.debug_do) ) { writeln("step3 commence → (document abstraction (da); da keys; segnames; doc_matters)"); } -auto da = DocReformDocAbstraction!()( +auto da = docAbstraction!()( _header_body_insertfilelist_imagelist[headBody.body_content], _make_and_meta_struct, _opt_action, @@ -1339,7 +1339,7 @@ struct DocumentMatters { auto generator_program() { struct Prog_ { string project_name() { - return "DocReform"; + return "spine"; } string name() { return program_info.name; @@ -1437,7 +1437,7 @@ struct DocumentMatters { return _manifest.src; } auto src_path_info() { - return DocReformPathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); // would like (to have and use) relative path + return spinePathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); // would like (to have and use) relative path } auto pod() { return _manifest.pod; @@ -1532,7 +1532,7 @@ struct DocumentMattersAbridged { return _manifest.src; } auto src_path_info() { - return DocReformPathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); + return spinePathsSRC!()(_manifest.env.pwd, _manifest.src.file_with_absolute_path); } auto pod() { return _manifest.pod; |