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 --- org/default_misc.org | 8 ++-- org/default_paths.org | 62 ++++++++++++++-------------- org/default_regex.org | 4 +- org/doc_reform.org | 32 +++++++------- org/meta_abstraction.org | 18 ++++---- org/meta_conf_make_meta.org | 28 ++++++------- org/meta_debugs.org | 6 +-- org/output_hub.org | 6 +-- org/output_sisupod.org | 10 ++--- org/output_sqlite.org | 14 +++---- org/output_xmls.org | 42 +++++++++---------- org/output_xmls_css.org | 10 ++--- org/source_files_read.org | 10 ++--- src/doc_reform/doc_reform.d | 14 +++---- 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_toml.d | 14 +++---- src/doc_reform/meta/defaults.d | 8 ++-- 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_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/paths_output.d | 44 ++++++++++---------- src/doc_reform/output/rgx.d | 2 +- src/doc_reform/output/source_sisupod.d | 10 ++--- src/doc_reform/output/sqlite.d | 14 +++---- src/doc_reform/output/xmls.d | 16 +++---- src/doc_reform/output/xmls_css.d | 10 ++--- src/doc_reform/source/paths_source.d | 18 ++++---- src/doc_reform/source/read_source_files.d | 10 ++--- 35 files changed, 252 insertions(+), 252 deletions(-) diff --git a/org/default_misc.org b/org/default_misc.org index 55fa418..5d175ee 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -35,7 +35,7 @@ module doc_reform.meta.defaults; #+name: meta_defaults_template_init_flags #+BEGIN_SRC d -template SiSUrgxInitFlags() { +template DocReformRgxInitFlags() { /+ regex flags +/ static int[string] flags_type_init() { int[string] flags_type_init = [ @@ -81,7 +81,7 @@ template SiSUrgxInitFlags() { #+name: meta_defaults_template_node #+BEGIN_SRC d -template SiSUnode() { +template DocReformNode() { static string[string] node_metadata_heading_str() { auto _node = [ "is" : "", @@ -129,7 +129,7 @@ template SiSUnode() { #+name: meta_defaults_template_biblio #+BEGIN_SRC d -template SiSUbiblio() { +template DocReformBiblio() { // required: deemed_author (author || editor); year; fulltitle; struct BibJsnStr { static auto biblio_entry_tags_jsonstr() { @@ -256,7 +256,7 @@ template InternalMarkup() { #+name: defaults_template_language_codes #+BEGIN_SRC d -template SiSUlanguageCodes() { +template DocReformLanguageCodes() { /+ language codes +/ struct Lang { static string[string][string] codes() { diff --git a/org/default_paths.org b/org/default_paths.org index 9859758..932b034 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -42,7 +42,7 @@ import doc_reform.meta.rgx; #+name: template_paths_src #+BEGIN_SRC d template PodManifest() { - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); auto PodManifest(P)( P _pth @@ -111,7 +111,7 @@ sisupod #+name: template_paths_src #+BEGIN_SRC d template PathMatters() { - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); auto PathMatters(O,E)( O _opt_actions, @@ -441,7 +441,7 @@ template PathMatters() { #+name: template_paths_src #+BEGIN_SRC d template ConfigFilePaths() { - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); auto ConfigFilePaths(M,E)( M _manifest, @@ -601,10 +601,10 @@ filelist for processing [things to ponder] #+name: template_paths_src #+BEGIN_SRC d -template SiSUpathsSRC() { - mixin SiSUrgxInit; +template DocReformPathsSRC() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSRC(D,Fn)( + auto DocReformPathsSRC(D,Fn)( D _pwd, Fn _fn_src_and_path, ) { @@ -656,11 +656,11 @@ template SiSUpathsSRC() { #+name: template_paths_sisupods #+BEGIN_SRC d -template SiSUpathsSisupods() { - mixin SiSUrgxInit; +template DocReformPathsSisupods() { + mixin DocReformRgxInit; static auto rgx = Rgx(); string _suffix = ".zip"; - auto SiSUpathsSisupods(Dm)(Dm doc_matters) { + auto DocReformPathsSisupods(Dm)(Dm doc_matters) { string _base_dir_pod = (doc_matters.output_path.length > 0) ? doc_matters.output_path ~ "/sisupod" : "/sisupod"; @@ -932,8 +932,8 @@ import doc_reform.meta.rgx; #+name: template_paths_out #+BEGIN_SRC d -template SiSUoutPaths() { - auto SiSUoutPaths(Po,Lng)( +template DocReformOutPaths() { + auto DocReformOutPaths(Po,Lng)( Po output_pth_root, Lng lng, ) { @@ -950,8 +950,8 @@ template SiSUoutPaths() { return _PathsStruct(); } } -template SiSUoutPathSQLite() { - auto SiSUoutPathSQLite(Po)( +template DocReformOutPathSQLite() { + auto DocReformOutPathSQLite(Po)( Po output_pth_root, ) { struct _PathsStruct { @@ -973,9 +973,9 @@ template SiSUoutPathSQLite() { #+name: template_paths_out #+BEGIN_SRC d -template SiSUoutPathsFnPd() { +template DocReformOutPathsFnPd() { /+ TODO stuff to work out here +/ - auto SiSUoutPathsFnPd(Fn,Pn)( + auto DocReformOutPathsFnPd(Fn,Pn)( Fn fn_src_pth, Pn pod_name ) { @@ -1016,14 +1016,14 @@ template SiSUoutPathsFnPd() { #+name: template_paths_html #+BEGIN_SRC d -template SiSUpathsHTML() { - mixin SiSUrgxInit; +template DocReformPathsHTML() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsHTML(Po,Lng)( + auto DocReformPathsHTML(Po,Lng)( Po output_pth_root, Lng lng, ) { - auto out_pth = SiSUoutPaths!()(output_pth_root, lng); + auto out_pth = DocReformOutPaths!()(output_pth_root, lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -1064,14 +1064,14 @@ template SiSUpathsHTML() { #+name: template_paths_epub #+BEGIN_SRC d -template SiSUpathsEPUB() { - mixin SiSUrgxInit; +template DocReformPathsEPUB() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsEPUB(Po,Lng)( + auto DocReformPathsEPUB(Po,Lng)( Po output_pth_root, Lng lng, ) { - auto out_pth = SiSUoutPaths!()( output_pth_root, lng); + auto out_pth = DocReformOutPaths!()( output_pth_root, lng); string base_dir = "epub"; struct _PathsStruct { string base() { @@ -1171,10 +1171,10 @@ template SiSUpathsEPUB() { #+name: template_paths_sqlite #+BEGIN_SRC d -template SiSUpathsSQLiteDiscrete() { - mixin SiSUrgxInit; +template DocReformPathsSQLiteDiscrete() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSQLiteDiscrete(Po,Lng)( + auto DocReformPathsSQLiteDiscrete(Po,Lng)( Po output_pth_root, Lng lng, ) { @@ -1183,7 +1183,7 @@ template SiSUpathsSQLiteDiscrete() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = SiSUoutPaths!()(output_pth_root, lng); + auto out_pth = DocReformOutPaths!()(output_pth_root, lng); string base_dir = "sqlite"; return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array; } @@ -1203,10 +1203,10 @@ template SiSUpathsSQLiteDiscrete() { #+name: template_paths_sqlite #+BEGIN_SRC d -template SiSUpathsSQLite() { - mixin SiSUrgxInit; +template DocReformPathsSQLite() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSQLite(DbN, Po)( + auto DocReformPathsSQLite(DbN, Po)( DbN db_name, Po output_pth_root, ) { @@ -1215,7 +1215,7 @@ template SiSUpathsSQLite() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = SiSUoutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language + auto out_pth = DocReformOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language string base_dir = "sqlite"; return asNormalizedPath((out_pth.output_root).chainPath(base_dir)).array; } diff --git a/org/default_regex.org b/org/default_regex.org index 933a1b1..6fbe87b 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -35,7 +35,7 @@ http://dlang.org/phobos/std_regex.html 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 { <> @@ -383,7 +383,7 @@ http://dlang.org/phobos/std_regex.html regex: regular expressions used in sisu document parser +/ module doc_reform.output.rgx; -static template SiSUoutputRgxInit() { +static template DocReformOutputRgxInit() { import doc_reform.output.defaults; static struct Rgx { <> diff --git a/org/doc_reform.org b/org/doc_reform.org index eb10646..47a26c7 100644 --- a/org/doc_reform.org +++ b/org/doc_reform.org @@ -175,10 +175,10 @@ mixin CompileTimeInfo; #+NAME: doc_reform_mixin #+BEGIN_SRC d -mixin SiSUrgxInit; -mixin contentJSONtoSiSUstruct; -mixin SiSUbiblio; -mixin SiSUrgxInitFlags; +mixin DocReformRgxInit; +mixin contentJSONtoDocReformStruct; +mixin DocReformBiblio; +mixin DocReformRgxInitFlags; mixin outputHub; #+END_SRC @@ -620,8 +620,8 @@ foreach(arg; args[1..$]) { 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); #+END_SRC *** opt actions independent of processing files (no files no processing loop) @@ -681,7 +681,7 @@ enforce( debug(steps) { writeln("--->\nstepX commence → (document abstraction)"); } -auto t = SiSUabstraction!()(_env, _opt_action, manifest); +auto t = DocReformAbstraction!()(_env, _opt_action, manifest); static assert(!isTypeTuple!(t)); static assert(t.length==2); auto doc_abstraction = t[dAM.abstraction]; @@ -698,7 +698,7 @@ debug(steps) { #+BEGIN_SRC d /+ ↓ debugs +/ if (doc_matters.opt.action.verbose) { - SiSUabstractionSummary!()(doc_abstraction, doc_matters); + DocReformAbstractionSummary!()(doc_abstraction, doc_matters); } #+END_SRC @@ -711,7 +711,7 @@ if (doc_matters.opt.action.verbose) { if ((doc_matters.opt.action.debug_do) || (doc_matters.opt.action.verbose) ) { - SiSUdebugs!()(doc_abstraction, doc_matters); + DocReformDebugs!()(doc_abstraction, doc_matters); } #+END_SRC @@ -760,14 +760,14 @@ break; // terminate, stop #+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc.d module doc_reform.meta.metadoc; -template SiSUabstraction() { +template DocReformAbstraction() { <> <> 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 @@ -819,7 +819,7 @@ debug(steps) { ); } 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) { @@ -881,7 +881,7 @@ debug(steps) { 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, @@ -941,7 +941,7 @@ struct DocumentMatters { 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_ { @@ -995,8 +995,8 @@ debug(steps) { #+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc_summary.d 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/org/meta_abstraction.org b/org/meta_abstraction.org index 50a0e78..54833bd 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -27,7 +27,7 @@ Process markup document, create document abstraction. metadoc_from_src.d +/ module doc_reform.meta.metadoc_from_src; -template SiSUdocAbstraction() { +template DocReformDocAbstraction() { /+ ↓ abstraction imports +/ <> /+ ↓ abstraction mixins +/ @@ -35,7 +35,7 @@ template SiSUdocAbstraction() { /+ ↓ abstraction struct init +/ <> /+ ↓ 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, @@ -139,7 +139,7 @@ template SiSUdocAbstraction() { /+ ↓ abstraction functions assertions +/ <> /+ abstraction functions assertions ↑ +/ -} /+ ← closed: template SiSUdocAbstraction +/ +} /+ ← closed: template DocReformDocAbstraction +/ <> #+END_SRC @@ -168,7 +168,7 @@ import #+BEGIN_SRC d mixin ObjectSetter; mixin InternalMarkup; -mixin SiSUrgxInit; +mixin DocReformRgxInit; #+END_SRC *** initialize :initialize: @@ -440,8 +440,8 @@ scope(exit) { #+name: abs_init_rest #+BEGIN_SRC d -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; @@ -3431,7 +3431,7 @@ void _biblio_block_( 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)) { @@ -6684,7 +6684,7 @@ struct BookIndexReportSection { 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; @@ -6945,7 +6945,7 @@ struct NotesSection { in { } body { - mixin SiSUnode; + mixin DocReformNode; ObjGenericComposite[] the_endnotes_section; auto endnotes_ = gathered_notes(); string type_is; diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index 240be44..fcae4bb 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -65,7 +65,7 @@ import import doc_reform.meta.defaults, doc_reform.meta.rgx; -mixin SiSUrgxInit; +mixin DocReformRgxInit; static auto _rgx = Rgx(); mixin InternalMarkup; auto _mkup = InlineMarkup(); @@ -418,7 +418,7 @@ auto config_jsonstr = `{ }`; #+END_SRC -* 1. JSON to SiSUstruct :module:doc_reform:meta_conf_make_meta_json: +* 1. JSON to DocReformStruct :module:doc_reform:meta_conf_make_meta_json: ** 0. module template #+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_json.d @@ -427,7 +427,7 @@ auto config_jsonstr = `{ extract json header return json +/ module doc_reform.meta.conf_make_meta_json; -static template contentJSONtoSiSUstruct() { +static template contentJSONtoDocReformStruct() { import std.exception, std.regex, @@ -442,8 +442,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(">> --------------------------- >>"); @@ -1050,7 +1050,7 @@ if (_struct_composite.meta.title_main.empty) { } #+END_SRC -* 2. TOML returns SiSUstruct (via JSON) :module:doc_reform:meta_conf_make_meta: +* 2. TOML returns DocReformStruct (via JSON) :module:doc_reform:meta_conf_make_meta: ** 0. parse TOML config return JSON #+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d @@ -1080,24 +1080,24 @@ static template configParseTOMLreturnJSON() { } #+END_SRC -** 1. parse TOML config to JSON return SiSUstruct +** 1. parse TOML config to JSON return DocReformStruct #+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d -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; } } @@ -1122,8 +1122,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, @@ -1137,7 +1137,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/org/meta_debugs.org b/org/meta_debugs.org index fc77271..687e1b2 100644 --- a/org/meta_debugs.org +++ b/org/meta_debugs.org @@ -22,13 +22,13 @@ output debugs +/ module doc_reform.meta.doc_debugs; -template SiSUdebugs() { +template DocReformDebugs() { <> - auto SiSUdebugs(S,T)( + auto DocReformDebugs(S,T)( const S contents, T doc_matters, ) { - mixin SiSUrgxInit; + mixin DocReformRgxInit; mixin InternalMarkup; <> <> diff --git a/org/output_hub.org b/org/output_hub.org index b6e526c..9345458 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -28,7 +28,7 @@ template outputHub() { <> import std.parallelism; void outputHub(D,I)(D doc_abstraction, I doc_matters) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; mixin Msg; auto msg = Msg!()(doc_matters); static auto rgx = Rgx(); @@ -52,7 +52,7 @@ template outputHub() { template outputHubOp() { <> void outputHubOp(E,O)(E env, O opt_action) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; static auto rgx = Rgx(); <> } @@ -77,7 +77,7 @@ import doc_reform.output, #+BEGIN_SRC d if (sched == outTask.sisupod) { msg.v("sisu source processing... "); - SiSUpod!()(doc_matters); + DocReformPod!()(doc_matters); msg.vv("sisu source done"); } if (sched == outTask.sqlite) { diff --git a/org/output_sisupod.org b/org/output_sisupod.org index 5022d24..9d6abe0 100644 --- a/org/output_sisupod.org +++ b/org/output_sisupod.org @@ -21,9 +21,9 @@ #+BEGIN_SRC d :tangle ../src/doc_reform/output/source_sisupod.d module doc_reform.output.source_sisupod; -template SiSUpod() { +template DocReformPod() { <> - void SiSUpod(T)(T doc_matters) { + void DocReformPod(T)(T doc_matters) { <> try { <> @@ -60,12 +60,12 @@ import debug(asserts) { // static assert(is(typeof(doc_matters) == tuple)); } -mixin SiSUoutputRgxInit; +mixin DocReformOutputRgxInit; string pwd = doc_matters.env.pwd; auto src_path_info = doc_matters.src_path_info; auto pth_sisudoc_src = doc_matters.src_path_info; -auto pths_sisupod = SiSUpathsSisupods!()(doc_matters); -mixin SiSUlanguageCodes; +auto pths_sisupod = DocReformPathsSisupods!()(doc_matters); +mixin DocReformLanguageCodes; auto lang = Lang(); static auto rgx = Rgx(); assert (doc_matters.src.filename.match(rgx.src_fn)); diff --git a/org/output_sqlite.org b/org/output_sqlite.org index fc22089..8d792c6 100644 --- a/org/output_sqlite.org +++ b/org/output_sqlite.org @@ -27,7 +27,7 @@ module doc_reform.output.sqlite; <> import d2sqlite3; import std.typecons : Nullable; -mixin SiSUoutputRgxInit; +mixin DocReformOutputRgxInit; static auto rgx = Rgx(); long _metadata_tid_lastrowid; template SQLiteHubBuildTablesAndPopulate() { @@ -35,7 +35,7 @@ template SQLiteHubBuildTablesAndPopulate() { D doc_abstraction, I doc_matters, ) { - auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); template SQLiteDbStatementComposite() { @@ -63,7 +63,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { D doc_abstraction, I doc_matters, ) { - auto pth_sqlite = SiSUpathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); + auto pth_sqlite = DocReformPathsSQLiteDiscrete!()(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() { @@ -135,7 +135,7 @@ template SQLiteFormatAndLoadObject() { auto SQLiteFormatAndLoadObject(I)( I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; struct sqlite_format_and_load_objects { <> <> @@ -232,7 +232,7 @@ template SQLiteTablesCreate() { } if (opt_action.sqlite_db_create) { string _db_statement; - auto pth_sqlite = SiSUpathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); { @@ -251,7 +251,7 @@ template SQLiteDbDrop() { void SQLiteDbDrop(O)(O opt_action) { writeln("db drop"); if ((opt_action.sqlite_db_drop)) { - auto pth_sqlite = SiSUpathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); writeln("remove(", pth_sqlite.sqlite_file, ")"); try { remove(pth_sqlite.sqlite_file); @@ -272,7 +272,7 @@ template SQLiteDbDrop() { string _db_statement; { if ((doc_matters.opt.action.sqlite_db_create)) { - auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = DocReformPathsSQLite!()(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"); diff --git a/org/output_xmls.org b/org/output_xmls.org index 78f7bfb..8ebee95 100644 --- a/org/output_xmls.org +++ b/org/output_xmls.org @@ -24,7 +24,7 @@ module doc_reform.output.xmls; template outputXHTMLs() { <> - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; struct outputXHTMLs { static auto rgx = Rgx(); <> @@ -185,10 +185,10 @@ auto header_metadata(M)( string _date_modified="Date"; string _language="en"; string _rights="Copyright: Copyright (C) year holder"; - string _generator="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; + string _generator="doc_reform [DocReform 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; string _generator_home="http://www.sisudoc.org"; string o; - o = format(q"¶ + o = format(q"¶ @@ -203,7 +203,7 @@ auto header_metadata(M)( -¶", +¶", _title, _author, _publisher, @@ -240,7 +240,7 @@ auto site_info_button(M)( .replaceAll( rgx.br_nl, ""); } else { - _locations = "

SiSU

\n

www.sisudoc.org

\n

sources / git

"; + _locations = "

DocReform

\n

www.sisudoc.org

\n

sources / git

"; } string o; o = format(q"¶
@@ -260,7 +260,7 @@ auto inline_search_form(M)( M doc_matters, ) { string _action="http://www.sisudoc.org/cgi-bin/search.cgi"; - string _db="SiSU.7a.manual"; + string _db="DocReform.7a.manual"; string o; o = format(q"¶
@@ -370,7 +370,7 @@ auto epub3_seg_head(M)( - + @@ -379,7 +379,7 @@ auto epub3_seg_head(M)( - + @@ -1356,7 +1356,7 @@ void scroll(D,I)( const D doc_abstraction, I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc_html; @@ -1511,7 +1511,7 @@ void scroll_write_output(M,C)( debug(asserts) { static assert(is(typeof(doc) == string[])); } - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.base)) { pth_html.base.mkdirRecurse; @@ -1538,7 +1538,7 @@ void seg(D,M)( const D doc_abstraction, M doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto rgx = Rgx(); auto xhtml_format = outputXHTMLs(); string[][string] doc_html; @@ -1771,9 +1771,9 @@ void seg_write_output(M,D,E)( debug(asserts) { static assert(is(typeof(doc_html) == string[][string])); } - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto rgx = Rgx(); - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); auto xhtml_format = outputXHTMLs(); auto m = doc_matters.src.filename.matchFirst(rgx.src_fn); try { @@ -1806,8 +1806,8 @@ void seg_write_output(M,D,E)( void css(M)( auto ref M doc_matters, ) { - auto css = SiSUcss(); - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto css = DocReformCss(); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.css)) { (pth_html.css).mkdirRecurse; @@ -1831,7 +1831,7 @@ void images_cp(M)( ) { { /+ (copy html images) +/ - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); if (!exists(pth_html.image)) { pth_html.image.mkdirRecurse; } @@ -1930,7 +1930,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 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language); string uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters! string content = format(q"¶ @@ -2136,7 +2136,7 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) { %s%s - + @@ -2218,7 +2218,7 @@ void outputEPub3(D,I)( const D doc_abstraction, I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[][string] doc_epub3; @@ -2518,7 +2518,7 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)( static assert(is(typeof(oebps_toc_ncx) == string)); static assert(is(typeof(oebps_content_opf) == string)); } - auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = DocReformPathsEPUB!()(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); @@ -2672,7 +2672,7 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)( } } { /+ OEBPS/epub.css +/ - auto css = SiSUcss(); + auto css = DocReformCss(); debug(epub_output) { fn_dbg = pth_epub3.dbg_fn_oebps_css(doc_matters.src.filename); File(fn_dbg, "w").writeln(css.epub_css); diff --git a/org/output_xmls_css.org b/org/output_xmls_css.org index e63ada0..b95d0d9 100644 --- a/org/output_xmls_css.org +++ b/org/output_xmls_css.org @@ -24,8 +24,8 @@ default css settings +/ module doc_reform.output.xmls_css; -template SiSUcss() { - auto SiSUcss() { +template DocReformCss() { + auto DocReformCss() { string _css_html_seg=" <> <> @@ -40,15 +40,15 @@ template SiSUcss() { "; struct _css { auto html_seg_css() { - string _css = "/* SiSU css html seg stylesheet */\n" ~ _css_html_seg; + string _css = "/* DocReform css html seg stylesheet */\n" ~ _css_html_seg; return _css; } auto html_scroll_css() { - string _css = "/* SiSU css html scroll stylesheet */\n" ~ _css_html_scroll; + string _css = "/* DocReform css html scroll stylesheet */\n" ~ _css_html_scroll; return _css; } auto epub_css() { - string _css = "/* SiSU css epub stylesheet */\n" ~ _css_epub; + string _css = "/* DocReform css epub stylesheet */\n" ~ _css_epub; return _css; } } diff --git a/org/source_files_read.org b/org/source_files_read.org index db066fe..9ff0cc9 100644 --- a/org/source_files_read.org +++ b/org/source_files_read.org @@ -273,11 +273,11 @@ static template configReadDocTOML() { - if master file scan for addional files to import/insert +/ module doc_reform.source.read_source_files; -static template SiSUrawMarkupContent() { +static template DocReformRawMarkupContent() { import doc_reform.meta.rgx; <> - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); string[] _images=[]; auto _extract_images(S)(S content_block) { @@ -289,7 +289,7 @@ static template SiSUrawMarkupContent() { return images_; } auto rawsrc = RawMarkupContent(); - auto SiSUrawMarkupContent(O,Fn)(O _opt_action, Fn fn_src) { + auto DocReformRawMarkupContent(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; @@ -349,7 +349,7 @@ static template SiSUrawMarkupContent() { char[][] markup_sourcefile_insert_content, string fn_src ) { - mixin SiSUrgxInitFlags; + mixin DocReformRgxInitFlags; <> foreach (line; markup_sourcefile_insert_content) { <> @@ -362,7 +362,7 @@ static template SiSUrawMarkupContent() { string fn_src ) { import std.algorithm; - mixin SiSUrgxInitFlags; + mixin DocReformRgxInitFlags; <> foreach (line; sourcefile_body_content) { <> diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/doc_reform.d index f7c9751..5ac96ec 100755 --- a/src/doc_reform/doc_reform.d +++ b/src/doc_reform/doc_reform.d @@ -32,10 +32,10 @@ description "A SiSU inspired document parser writen in D." homepage "http://sisudoc.org" +/ void main(string[] args) { - mixin SiSUrgxInit; - mixin contentJSONtoSiSUstruct; - mixin SiSUbiblio; - mixin SiSUrgxInitFlags; + mixin DocReformRgxInit; + mixin contentJSONtoDocReformStruct; + mixin DocReformBiblio; + mixin DocReformRgxInitFlags; mixin outputHub; string flag_action; string arg_unrecognized; @@ -465,7 +465,7 @@ void main(string[] args) { debug(steps) { writeln("--->\nstepX commence → (document abstraction)"); } - auto t = SiSUabstraction!()(_env, _opt_action, manifest); + auto t = DocReformAbstraction!()(_env, _opt_action, manifest); static assert(!isTypeTuple!(t)); static assert(t.length==2); auto doc_abstraction = t[dAM.abstraction]; @@ -475,13 +475,13 @@ void main(string[] args) { } /+ ↓ debugs +/ if (doc_matters.opt.action.verbose) { - SiSUabstractionSummary!()(doc_abstraction, doc_matters); + DocReformAbstractionSummary!()(doc_abstraction, doc_matters); } /+ ↓ debugs +/ if ((doc_matters.opt.action.debug_do) || (doc_matters.opt.action.verbose) ) { - SiSUdebugs!()(doc_abstraction, doc_matters); + DocReformDebugs!()(doc_abstraction, doc_matters); } /+ ↓ output hub +/ if (!(doc_matters.opt.action.skip_output)) { 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 +/ diff --git a/src/doc_reform/output/defaults.d b/src/doc_reform/output/defaults.d index 97ba691..f0173cc 100644 --- a/src/doc_reform/output/defaults.d +++ b/src/doc_reform/output/defaults.d @@ -35,7 +35,7 @@ template InternalMarkup() { } } } -template SiSUlanguageCodes() { +template DocReformLanguageCodes() { /+ language codes +/ struct Lang { static string[string][string] codes() { diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d index 45e632a..7c4e346 100644 --- a/src/doc_reform/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -31,7 +31,7 @@ template outputEPub3() { } string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) { auto xhtml_format = outputXHTMLs(); - auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language); string uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters! string content = format(q"¶ @@ -220,7 +220,7 @@ template outputEPub3() { %s%s - + @@ -296,7 +296,7 @@ template outputEPub3() { const D doc_abstraction, I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[][string] doc_epub3; @@ -590,7 +590,7 @@ template outputEPub3() { static assert(is(typeof(oebps_toc_ncx) == string)); static assert(is(typeof(oebps_content_opf) == string)); } - auto pth_epub3 = SiSUpathsEPUB!()(doc_matters.output_path, doc_matters.src.language); + auto pth_epub3 = DocReformPathsEPUB!()(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); @@ -744,7 +744,7 @@ template outputEPub3() { } } { /+ OEBPS/epub.css +/ - auto css = SiSUcss(); + auto css = DocReformCss(); debug(epub_output) { fn_dbg = pth_epub3.dbg_fn_oebps_css(doc_matters.src.filename); File(fn_dbg, "w").writeln(css.epub_css); diff --git a/src/doc_reform/output/html.d b/src/doc_reform/output/html.d index 07fe081..5d5ccb5 100644 --- a/src/doc_reform/output/html.d +++ b/src/doc_reform/output/html.d @@ -16,7 +16,7 @@ template outputHTML() { const D doc_abstraction, I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto xhtml_format = outputXHTMLs(); auto rgx = Rgx(); string[] doc_html; @@ -165,7 +165,7 @@ template outputHTML() { debug(asserts) { static assert(is(typeof(doc) == string[])); } - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.base)) { pth_html.base.mkdirRecurse; @@ -185,7 +185,7 @@ template outputHTML() { const D doc_abstraction, M doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto rgx = Rgx(); auto xhtml_format = outputXHTMLs(); string[][string] doc_html; @@ -412,9 +412,9 @@ template outputHTML() { debug(asserts) { static assert(is(typeof(doc_html) == string[][string])); } - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; auto rgx = Rgx(); - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); auto xhtml_format = outputXHTMLs(); auto m = doc_matters.src.filename.matchFirst(rgx.src_fn); try { @@ -441,8 +441,8 @@ template outputHTML() { void css(M)( auto ref M doc_matters, ) { - auto css = SiSUcss(); - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto css = DocReformCss(); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); try { if (!exists(pth_html.css)) { (pth_html.css).mkdirRecurse; @@ -460,7 +460,7 @@ template outputHTML() { ) { { /+ (copy html images) +/ - auto pth_html = SiSUpathsHTML!()(doc_matters.output_path, doc_matters.src.language); + auto pth_html = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language); if (!exists(pth_html.image)) { pth_html.image.mkdirRecurse; } diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d index b40c929..9e933d8 100644 --- a/src/doc_reform/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -14,7 +14,7 @@ template outputHub() { doc_reform.output.paths_output; import std.parallelism; void outputHub(D,I)(D doc_abstraction, I doc_matters) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; mixin Msg; auto msg = Msg!()(doc_matters); static auto rgx = Rgx(); @@ -23,7 +23,7 @@ template outputHub() { auto msg = Msg!()(doc_matters); if (sched == outTask.sisupod) { msg.v("sisu source processing... "); - SiSUpod!()(doc_matters); + DocReformPod!()(doc_matters); msg.vv("sisu source done"); } if (sched == outTask.sqlite) { @@ -82,7 +82,7 @@ template outputHubOp() { doc_reform.output.create_zip_file, doc_reform.output.paths_output; void outputHubOp(E,O)(E env, O opt_action) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; static auto rgx = Rgx(); if ((opt_action.sqlite_db_drop)) { if ((opt_action.verbose)) { diff --git a/src/doc_reform/output/paths_output.d b/src/doc_reform/output/paths_output.d index abd21b6..451c40d 100644 --- a/src/doc_reform/output/paths_output.d +++ b/src/doc_reform/output/paths_output.d @@ -7,8 +7,8 @@ import std.array, std.regex, std.stdio; import doc_reform.meta.rgx; -template SiSUoutPaths() { - auto SiSUoutPaths(Po,Lng)( +template DocReformOutPaths() { + auto DocReformOutPaths(Po,Lng)( Po output_pth_root, Lng lng, ) { @@ -25,8 +25,8 @@ template SiSUoutPaths() { return _PathsStruct(); } } -template SiSUoutPathSQLite() { - auto SiSUoutPathSQLite(Po)( +template DocReformOutPathSQLite() { + auto DocReformOutPathSQLite(Po)( Po output_pth_root, ) { struct _PathsStruct { @@ -42,9 +42,9 @@ template SiSUoutPathSQLite() { return _PathsStruct(); } } -template SiSUoutPathsFnPd() { +template DocReformOutPathsFnPd() { /+ TODO stuff to work out here +/ - auto SiSUoutPathsFnPd(Fn,Pn)( + auto DocReformOutPathsFnPd(Fn,Pn)( Fn fn_src_pth, Pn pod_name ) { @@ -79,14 +79,14 @@ template SiSUoutPathsFnPd() { return _PathsStruct(); } } -template SiSUpathsHTML() { - mixin SiSUrgxInit; +template DocReformPathsHTML() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsHTML(Po,Lng)( + auto DocReformPathsHTML(Po,Lng)( Po output_pth_root, Lng lng, ) { - auto out_pth = SiSUoutPaths!()(output_pth_root, lng); + auto out_pth = DocReformOutPaths!()(output_pth_root, lng); string base_dir = "html"; string suffix = ".html"; struct _PathsStruct { @@ -121,14 +121,14 @@ template SiSUpathsHTML() { return _PathsStruct(); } } -template SiSUpathsEPUB() { - mixin SiSUrgxInit; +template DocReformPathsEPUB() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsEPUB(Po,Lng)( + auto DocReformPathsEPUB(Po,Lng)( Po output_pth_root, Lng lng, ) { - auto out_pth = SiSUoutPaths!()( output_pth_root, lng); + auto out_pth = DocReformOutPaths!()( output_pth_root, lng); string base_dir = "epub"; struct _PathsStruct { string base() { @@ -221,10 +221,10 @@ template SiSUpathsEPUB() { return _PathsStruct(); } } -template SiSUpathsSQLiteDiscrete() { - mixin SiSUrgxInit; +template DocReformPathsSQLiteDiscrete() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSQLiteDiscrete(Po,Lng)( + auto DocReformPathsSQLiteDiscrete(Po,Lng)( Po output_pth_root, Lng lng, ) { @@ -233,7 +233,7 @@ template SiSUpathsSQLiteDiscrete() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = SiSUoutPaths!()(output_pth_root, lng); + auto out_pth = DocReformOutPaths!()(output_pth_root, lng); string base_dir = "sqlite"; return asNormalizedPath((out_pth.output_base).chainPath(base_dir)).array; } @@ -247,10 +247,10 @@ template SiSUpathsSQLiteDiscrete() { return _PathsStruct(); } } -template SiSUpathsSQLite() { - mixin SiSUrgxInit; +template DocReformPathsSQLite() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSQLite(DbN, Po)( + auto DocReformPathsSQLite(DbN, Po)( DbN db_name, Po output_pth_root, ) { @@ -259,7 +259,7 @@ template SiSUpathsSQLite() { return fn_src.baseName.stripExtension; } string base() { - auto out_pth = SiSUoutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language + auto out_pth = DocReformOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language string base_dir = "sqlite"; return asNormalizedPath((out_pth.output_root).chainPath(base_dir)).array; } diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d index 0d23f11..a15e709 100644 --- a/src/doc_reform/output/rgx.d +++ b/src/doc_reform/output/rgx.d @@ -2,7 +2,7 @@ regex: regular expressions used in sisu document parser +/ module doc_reform.output.rgx; -static template SiSUoutputRgxInit() { +static template DocReformOutputRgxInit() { import doc_reform.output.defaults; static struct Rgx { static newline = ctRegex!("\n", "mg"); diff --git a/src/doc_reform/output/source_sisupod.d b/src/doc_reform/output/source_sisupod.d index fa041fd..7d6b0fb 100644 --- a/src/doc_reform/output/source_sisupod.d +++ b/src/doc_reform/output/source_sisupod.d @@ -1,5 +1,5 @@ module doc_reform.output.source_sisupod; -template SiSUpod() { +template DocReformPod() { import doc_reform.output; import std.digest.sha, @@ -10,16 +10,16 @@ template SiSUpod() { import doc_reform.output.create_zip_file, doc_reform.output.xmls; - void SiSUpod(T)(T doc_matters) { + void DocReformPod(T)(T doc_matters) { debug(asserts) { // static assert(is(typeof(doc_matters) == tuple)); } - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; string pwd = doc_matters.env.pwd; auto src_path_info = doc_matters.src_path_info; auto pth_sisudoc_src = doc_matters.src_path_info; - auto pths_sisupod = SiSUpathsSisupods!()(doc_matters); - mixin SiSUlanguageCodes; + auto pths_sisupod = DocReformPathsSisupods!()(doc_matters); + mixin DocReformLanguageCodes; auto lang = Lang(); static auto rgx = Rgx(); assert (doc_matters.src.filename.match(rgx.src_fn)); diff --git a/src/doc_reform/output/sqlite.d b/src/doc_reform/output/sqlite.d index a765fd7..6fbb4a7 100644 --- a/src/doc_reform/output/sqlite.d +++ b/src/doc_reform/output/sqlite.d @@ -5,7 +5,7 @@ import std.conv : to; import d2sqlite3; import std.typecons : Nullable; -mixin SiSUoutputRgxInit; +mixin DocReformOutputRgxInit; static auto rgx = Rgx(); long _metadata_tid_lastrowid; template SQLiteHubBuildTablesAndPopulate() { @@ -13,7 +13,7 @@ template SQLiteHubBuildTablesAndPopulate() { D doc_abstraction, I doc_matters, ) { - auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); template SQLiteDbStatementComposite() { @@ -26,7 +26,7 @@ template SQLiteHubBuildTablesAndPopulate() { string _db_statement; { if ((doc_matters.opt.action.sqlite_db_create)) { - auto pth_sqlite = SiSUpathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); + auto pth_sqlite = DocReformPathsSQLite!()(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"); @@ -60,7 +60,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { D doc_abstraction, I doc_matters, ) { - auto pth_sqlite = SiSUpathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); + auto pth_sqlite = DocReformPathsSQLiteDiscrete!()(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() { @@ -131,7 +131,7 @@ template SQLiteFormatAndLoadObject() { auto SQLiteFormatAndLoadObject(I)( I doc_matters, ) { - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; struct sqlite_format_and_load_objects { auto generic_munge_sanitize_text_for_search( string _txt, @@ -1216,7 +1216,7 @@ template SQLiteTablesCreate() { } if (opt_action.sqlite_db_create) { string _db_statement; - auto pth_sqlite = SiSUpathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); { @@ -1230,7 +1230,7 @@ template SQLiteDbDrop() { void SQLiteDbDrop(O)(O opt_action) { writeln("db drop"); if ((opt_action.sqlite_db_drop)) { - auto pth_sqlite = SiSUpathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); + auto pth_sqlite = DocReformPathsSQLite!()(opt_action.sqlite_filename, opt_action.output_dir_set); writeln("remove(", pth_sqlite.sqlite_file, ")"); try { remove(pth_sqlite.sqlite_file); diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d index 8428204..f2f09fa 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -11,7 +11,7 @@ template outputXHTMLs() { doc_reform.output.create_zip_file, doc_reform.output.xmls, doc_reform.output.xmls_css; - mixin SiSUoutputRgxInit; + mixin DocReformOutputRgxInit; struct outputXHTMLs { static auto rgx = Rgx(); string div_delimit( @@ -114,10 +114,10 @@ template outputXHTMLs() { string _date_modified="Date"; string _language="en"; string _rights="Copyright: Copyright (C) year holder"; - string _generator="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; + string _generator="doc_reform [DocReform 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; string _generator_home="http://www.sisudoc.org"; string o; - o = format(q"¶ + o = format(q"¶ @@ -132,7 +132,7 @@ template outputXHTMLs() { - ¶", + ¶", _title, _author, _publisher, @@ -163,7 +163,7 @@ template outputXHTMLs() { .replaceAll( rgx.br_nl, ""); } else { - _locations = "

SiSU

\n

www.sisudoc.org

\n

sources / git

"; + _locations = "

DocReform

\n

www.sisudoc.org

\n

sources / git

"; } string o; o = format(q"¶
@@ -177,7 +177,7 @@ template outputXHTMLs() { M doc_matters, ) { string _action="http://www.sisudoc.org/cgi-bin/search.cgi"; - string _db="SiSU.7a.manual"; + string _db="DocReform.7a.manual"; string o; o = format(q"¶
@@ -275,7 +275,7 @@ template outputXHTMLs() { - + @@ -284,7 +284,7 @@ template outputXHTMLs() { - + diff --git a/src/doc_reform/output/xmls_css.d b/src/doc_reform/output/xmls_css.d index f3c0545..01c114d 100644 --- a/src/doc_reform/output/xmls_css.d +++ b/src/doc_reform/output/xmls_css.d @@ -2,8 +2,8 @@ default css settings +/ module doc_reform.output.xmls_css; -template SiSUcss() { - auto SiSUcss() { +template DocReformCss() { + auto DocReformCss() { string _css_html_seg=" *{ padding: 0px; @@ -2854,15 +2854,15 @@ template SiSUcss() { "; struct _css { auto html_seg_css() { - string _css = "/* SiSU css html seg stylesheet */\n" ~ _css_html_seg; + string _css = "/* DocReform css html seg stylesheet */\n" ~ _css_html_seg; return _css; } auto html_scroll_css() { - string _css = "/* SiSU css html scroll stylesheet */\n" ~ _css_html_scroll; + string _css = "/* DocReform css html scroll stylesheet */\n" ~ _css_html_scroll; return _css; } auto epub_css() { - string _css = "/* SiSU css epub stylesheet */\n" ~ _css_epub; + string _css = "/* DocReform css epub stylesheet */\n" ~ _css_epub; return _css; } } diff --git a/src/doc_reform/source/paths_source.d b/src/doc_reform/source/paths_source.d index dc2928f..1131b20 100644 --- a/src/doc_reform/source/paths_source.d +++ b/src/doc_reform/source/paths_source.d @@ -12,7 +12,7 @@ import std.array, std.conv : to; import doc_reform.meta.rgx; template PodManifest() { - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); auto PodManifest(P)( P _pth @@ -59,7 +59,7 @@ template PodManifest() { } } template PathMatters() { - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); auto PathMatters(O,E)( O _opt_actions, @@ -383,7 +383,7 @@ template PathMatters() { } } template ConfigFilePaths() { - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); auto ConfigFilePaths(M,E)( M _manifest, @@ -491,10 +491,10 @@ template ConfigFilePaths() { return ConfFilePaths(); } } -template SiSUpathsSRC() { - mixin SiSUrgxInit; +template DocReformPathsSRC() { + mixin DocReformRgxInit; static auto rgx = Rgx(); - auto SiSUpathsSRC(D,Fn)( + auto DocReformPathsSRC(D,Fn)( D _pwd, Fn _fn_src_and_path, ) { @@ -542,11 +542,11 @@ template SiSUpathsSRC() { } -template SiSUpathsSisupods() { - mixin SiSUrgxInit; +template DocReformPathsSisupods() { + mixin DocReformRgxInit; static auto rgx = Rgx(); string _suffix = ".zip"; - auto SiSUpathsSisupods(Dm)(Dm doc_matters) { + auto DocReformPathsSisupods(Dm)(Dm doc_matters) { string _base_dir_pod = (doc_matters.output_path.length > 0) ? doc_matters.output_path ~ "/sisupod" : "/sisupod"; diff --git a/src/doc_reform/source/read_source_files.d b/src/doc_reform/source/read_source_files.d index 294b081..374c113 100644 --- a/src/doc_reform/source/read_source_files.d +++ b/src/doc_reform/source/read_source_files.d @@ -4,7 +4,7 @@ - if master file scan for addional files to import/insert +/ module doc_reform.source.read_source_files; -static template SiSUrawMarkupContent() { +static template DocReformRawMarkupContent() { import doc_reform.meta.rgx; import @@ -12,7 +12,7 @@ static template SiSUrawMarkupContent() { doc_reform.source.paths_source, std.file, std.path; - mixin SiSUrgxInit; + mixin DocReformRgxInit; static auto rgx = Rgx(); string[] _images=[]; auto _extract_images(S)(S content_block) { @@ -24,7 +24,7 @@ static template SiSUrawMarkupContent() { return images_; } auto rawsrc = RawMarkupContent(); - auto SiSUrawMarkupContent(O,Fn)(O _opt_action, Fn fn_src) { + auto DocReformRawMarkupContent(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; @@ -157,7 +157,7 @@ static template SiSUrawMarkupContent() { char[][] markup_sourcefile_insert_content, string fn_src ) { - mixin SiSUrgxInitFlags; + mixin DocReformRgxInitFlags; char[][] contents_insert; auto type1 = flags_type_init; auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm); @@ -255,7 +255,7 @@ static template SiSUrawMarkupContent() { string fn_src ) { import std.algorithm; - mixin SiSUrgxInitFlags; + mixin DocReformRgxInitFlags; char[][] contents; auto type = flags_type_init; auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm); -- cgit v1.2.3