diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2019-11-15 23:58:15 -0500 | 
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2019-11-22 09:54:24 -0500 | 
| commit | 96b03396ddb487816ebd85d1c6f30400019702fc (patch) | |
| tree | 4519db10b3f50efa07e5f9f34783c9b7e7eaa114 /src/doc_reform/meta | |
| parent | org renaming (diff) | |
name changes
Diffstat (limited to 'src/doc_reform/meta')
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_json.d | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_structs.d | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_yaml.d | 20 | ||||
| -rw-r--r-- | src/doc_reform/meta/defaults.d | 12 | ||||
| -rw-r--r-- | src/doc_reform/meta/doc_debugs.d | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc.d | 22 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_from_src.d | 18 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_harvest.d | 8 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_harvests_authors.d | 12 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_harvests_topics.d | 12 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_show_config.d | 4 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_show_make.d | 4 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_show_metadata.d | 4 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_show_summary.d | 4 | ||||
| -rw-r--r-- | src/doc_reform/meta/rgx.d | 2 | 
15 files changed, 68 insertions, 68 deletions
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d index 4b3a29c..b80ea4f 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 contentJSONtoDocReformStruct() { +static template contentJSONtoSpineStruct() {    import      std.algorithm,      std.array, @@ -21,8 +21,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(">> --------------------------- >>"); diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d index 0678b4f..7875777 100644 --- a/src/doc_reform/meta/conf_make_meta_structs.d +++ b/src/doc_reform/meta/conf_make_meta_structs.d @@ -13,7 +13,7 @@ import  import    doc_reform.meta.defaults,    doc_reform.meta.rgx; -mixin DocReformRgxInit; +mixin spineRgxInit;  static auto rgx = Rgx();  mixin InternalMarkup;  auto mkup = InlineMarkup(); diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d index aa4d77d..3d39471 100644 --- a/src/doc_reform/meta/conf_make_meta_yaml.d +++ b/src/doc_reform/meta/conf_make_meta_yaml.d @@ -3,7 +3,7 @@    extract yaml header return struct  +/  module doc_reform.meta.conf_make_meta_yaml; -static template contentYAMLtoDocReformStruct() { +static template contentYAMLtoSpineStruct() {    import      std.algorithm,      std.array, @@ -21,13 +21,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;      /+ make ------------------------------------------------------------------- +/ @@ -775,13 +775,13 @@ static template contentYAMLtoDocReformStruct() {      return _struct_composite;    }  } -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 @@ -790,7 +790,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"); @@ -813,8 +813,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, @@ -831,7 +831,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/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d index 6c01139..847dcb9 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 DocReformRgxInitFlags() { +template spineRgxInitFlags() {    /+ regex flags +/    static int[string] flags_type_init() {      int[string] flags_type_init = [ @@ -44,7 +44,7 @@ template DocReformRgxInitFlags() {      return flags_type_init;    }  } -template DocReformNode() { +template spineNode() {    static string[string] node_metadata_heading_str() {      string[string] _node = [          "is"                            : "", @@ -87,8 +87,8 @@ template DocReformNode() {      return _node;    }  } -template DocReformHarvest() { -  auto DocReformHarvest() { +template spineHarvest() { +  auto spineHarvest() {      struct _Harvest {        struct Harvest {          string   title                = ""; @@ -118,7 +118,7 @@ template DocReformHarvest() {      return _Harvest();    }  } -template DocReformBiblio() { +template spineBiblio() {    // required: deemed_author (author || editor); year; fulltitle;    struct BibJsnStr {      static auto biblio_entry_tags_jsonstr() { @@ -199,7 +199,7 @@ template InternalMarkup() {      }    }  } -template DocReformLanguageCodes() { +template spineLanguageCodes() {    /+ 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 f96a942..4a9a591 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 DocReformDebugs() { +template spineDebugs() {    import      doc_reform.meta.defaults,      doc_reform.meta.rgx; @@ -22,11 +22,11 @@ template DocReformDebugs() {      std.typecons,      std.utf,      std.conv : to; -  auto DocReformDebugs(S,T)( +  auto spineDebugs(S,T)(      const S  contents,            T  doc_matters,    ) { -    mixin DocReformRgxInit; +    mixin spineRgxInit;      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 4fb9677..0d6e7a5 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 DocReformAbstraction() { +template spineAbstraction() {    import      std.datetime,      std.getopt, @@ -21,16 +21,16 @@ template DocReformAbstraction() {      doc_reform.source.read_config_files,      doc_reform.source.read_source_files,      doc_reform.output.hub; -  mixin DocReformRgxInit; -  mixin contentJSONtoDocReformStruct; -  mixin DocReformBiblio; -  mixin DocReformRgxInitFlags; +  mixin spineRgxInit; +  mixin contentJSONtoSpineStruct; +  mixin spineBiblio; +  mixin spineRgxInitFlags;    mixin outputHub;    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, @@ -41,7 +41,7 @@ template DocReformAbstraction() {        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);        }      }      /+ ↓ read file (filename with path) +/ @@ -53,7 +53,7 @@ template DocReformAbstraction() {        );      }      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) @@ -92,7 +92,7 @@ template DocReformAbstraction() {      ) {        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, @@ -117,7 +117,7 @@ template DocReformAbstraction() {        auto generator_program() {          struct Prog_ {            string project_name() { -            return "DocReform"; +            return "spine";            }            string name() {              return program_info.name; @@ -191,7 +191,7 @@ template DocReformAbstraction() {          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; diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 4eb7771..511f761 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 DocReformDocAbstraction() { +template docAbstraction() {                                                                                  /+ ↓ abstraction imports +/    import doc_reform.meta;    import @@ -20,7 +20,7 @@ template DocReformDocAbstraction() {                                                                                  /+ ↓ abstraction mixins +/    mixin ObjectSetter;    mixin InternalMarkup; -  mixin DocReformRgxInit; +  mixin spineRgxInit;                                                                                  /+ ↓ abstraction struct init +/    /+ initialize +/    ObjGenericComposite[] the_table_of_contents_section; @@ -309,7 +309,7 @@ template DocReformDocAbstraction() {      return tag_assoc;    }                                                                                  /+ ↓ 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, @@ -333,8 +333,8 @@ template DocReformDocAbstraction() {        previous_length=0;        reset_note_numbers=true;      } -    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; @@ -3170,7 +3170,7 @@ template DocReformDocAbstraction() {      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) @@ -5230,7 +5230,7 @@ template DocReformDocAbstraction() {        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; @@ -5481,7 +5481,7 @@ template DocReformDocAbstraction() {        N              obj_cite_digits,        O              opt_action,      ) { -      mixin DocReformNode; +      mixin spineNode;        ObjGenericComposite[] the_endnotes_section;        auto endnotes_ = gathered_notes();        string type_is; @@ -6125,7 +6125,7 @@ template DocReformDocAbstraction() {        "block status: off or closing");    }                                                                                  /+ abstraction functions assertions ↑ +/ -}                                                                               /+ ← closed: template DocReformDocAbstraction +/ +}                                                                               /+ ← closed: template docAbstraction +/  template docSectKeysSeq() {    auto docSectKeysSeq(string[][string] document_section_keys_sequenced) {      struct doc_sect_keys_seq { diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_harvest.d index 2e6c426..37c375a 100644 --- a/src/doc_reform/meta/metadoc_harvest.d +++ b/src/doc_reform/meta/metadoc_harvest.d @@ -1,6 +1,6 @@  module doc_reform.meta.metadoc_harvest; -template DocReformMetaDocHarvest() { -  auto DocReformMetaDocHarvest(T,H)( +template spineMetaDocHarvest() { +  auto spineMetaDocHarvest(T,H)(      T  doc_matters,      H  hvst,    ) { @@ -21,8 +21,8 @@ template DocReformMetaDocHarvest() {      mixin InternalMarkup;      auto markup = InlineMarkup();      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; diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d index acb21ce..21e8f28 100644 --- a/src/doc_reform/meta/metadoc_harvests_authors.d +++ b/src/doc_reform/meta/metadoc_harvests_authors.d @@ -10,12 +10,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, @@ -174,7 +174,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; @@ -348,7 +348,7 @@ string theme_light_1 = format(q"┃  </html>  ┃") ~ "\n";      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) { diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_harvests_topics.d index 9f889b2..ea43d5a 100644 --- a/src/doc_reform/meta/metadoc_harvests_topics.d +++ b/src/doc_reform/meta/metadoc_harvests_topics.d @@ -10,12 +10,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, @@ -215,7 +215,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; @@ -507,7 +507,7 @@ string theme_light_1 = format(q"┃  </html>  ┃") ~ "\n";      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) { diff --git a/src/doc_reform/meta/metadoc_show_config.d b/src/doc_reform/meta/metadoc_show_config.d index 25300aa..6e18516 100644 --- a/src/doc_reform/meta/metadoc_show_config.d +++ b/src/doc_reform/meta/metadoc_show_config.d @@ -1,6 +1,6 @@  module doc_reform.meta.metadoc_show_config; -template DocReformShowConfig() { -  void DocReformShowConfig(T)( +template spineShowConfig() { +  void spineShowConfig(T)(      T  doc_matters,    ) {      import diff --git a/src/doc_reform/meta/metadoc_show_make.d b/src/doc_reform/meta/metadoc_show_make.d index 017480c..ed334d0 100644 --- a/src/doc_reform/meta/metadoc_show_make.d +++ b/src/doc_reform/meta/metadoc_show_make.d @@ -1,6 +1,6 @@  module doc_reform.meta.metadoc_show_make; -template DocReformShowMake() { -  void DocReformShowMake(T)( +template spineShowMake() { +  void spineShowMake(T)(      T  doc_matters,    ) {      import diff --git a/src/doc_reform/meta/metadoc_show_metadata.d b/src/doc_reform/meta/metadoc_show_metadata.d index 11769db..e860452 100644 --- a/src/doc_reform/meta/metadoc_show_metadata.d +++ b/src/doc_reform/meta/metadoc_show_metadata.d @@ -1,6 +1,6 @@  module doc_reform.meta.metadoc_show_metadata; -template DocReformShowMetaData() { -  void DocReformShowMetaData(T)( +template spineShowMetaData() { +  void spineShowMetaData(T)(      T  doc_matters,    ) {      import diff --git a/src/doc_reform/meta/metadoc_show_summary.d b/src/doc_reform/meta/metadoc_show_summary.d index 67db962..71d8d87 100644 --- a/src/doc_reform/meta/metadoc_show_summary.d +++ b/src/doc_reform/meta/metadoc_show_summary.d @@ -1,6 +1,6 @@  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,    ) { diff --git a/src/doc_reform/meta/rgx.d b/src/doc_reform/meta/rgx.d index a7826be..d08100b 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 DocReformRgxInit() { +static template spineRgxInit() {    import doc_reform.meta.defaults;    static struct Rgx {      /+ misc +/  | 
