diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2018-09-10 18:15:02 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2019-04-10 15:14:15 -0400 | 
| commit | e95c49b76f4ac7bf72c383ee43a0567dfcbf1603 (patch) | |
| tree | b3aec9058f69be0047bb526052f8deefb5d97463 /src | |
| parent | maker, subprojects arrange, minor (diff) | |
0.1.0 renamed doc-reform, doc_reform (& rad)
- from sdp
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc_reform/conf/compile_time_info.d (renamed from src/sdp/conf/compile_time_info.d) | 2 | ||||
| -rwxr-xr-x | src/doc_reform/doc_reform.d (renamed from src/sdp/sdp.d) | 36 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_json.d (renamed from src/sdp/meta/conf_make_meta_json.d) | 8 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_structs.d (renamed from src/sdp/meta/conf_make_meta_structs.d) | 18 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_toml.d (renamed from src/sdp/meta/conf_make_meta_toml.d) | 12 | ||||
| -rw-r--r-- | src/doc_reform/meta/defaults.d (renamed from src/sdp/meta/defaults.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/doc_debugs.d (renamed from src/sdp/meta/doc_debugs.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc.d (renamed from src/sdp/meta/metadoc.d) | 28 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_from_src.d (renamed from src/sdp/meta/metadoc_from_src.d) | 30 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_summary.d (renamed from src/sdp/meta/metadoc_summary.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/object_setter.d (renamed from src/sdp/meta/object_setter.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/package.d (renamed from src/sdp/meta/package.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/meta/rgx.d (renamed from src/sdp/meta/rgx.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/output/create_zip_file.d (renamed from src/sdp/output/create_zip_file.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/output/defaults.d (renamed from src/sdp/output/defaults.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/output/epub3.d (renamed from src/sdp/output/epub3.d) | 10 | ||||
| -rw-r--r-- | src/doc_reform/output/html.d (renamed from src/sdp/output/html.d) | 10 | ||||
| -rw-r--r-- | src/doc_reform/output/hub.d (renamed from src/sdp/output/hub.d) | 34 | ||||
| -rw-r--r-- | src/doc_reform/output/package.d (renamed from src/sdp/output/package.d) | 12 | ||||
| -rw-r--r-- | src/doc_reform/output/paths_output.d (renamed from src/sdp/output/paths_output.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/output/rgx.d (renamed from src/sdp/output/rgx.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/output/source_sisupod.d (renamed from src/sdp/output/source_sisupod.d) | 8 | ||||
| -rw-r--r-- | src/doc_reform/output/sqlite.d (renamed from src/sdp/output/sqlite.d) | 6 | ||||
| -rw-r--r-- | src/doc_reform/output/xmls.d (renamed from src/sdp/output/xmls.d) | 14 | ||||
| -rw-r--r-- | src/doc_reform/output/xmls_css.d (renamed from src/sdp/output/xmls_css.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/share/defaults.d (renamed from src/sdp/share/defaults.d) | 2 | ||||
| -rw-r--r-- | src/doc_reform/source/paths_source.d (renamed from src/sdp/source/paths_source.d) | 4 | ||||
| -rw-r--r-- | src/doc_reform/source/read_config_files.d (renamed from src/sdp/source/read_config_files.d) | 30 | ||||
| -rw-r--r-- | src/doc_reform/source/read_source_files.d (renamed from src/sdp/source/read_source_files.d) | 17 | 
29 files changed, 160 insertions, 161 deletions
| diff --git a/src/sdp/conf/compile_time_info.d b/src/doc_reform/conf/compile_time_info.d index 80f6e33..0e09edd 100644 --- a/src/sdp/conf/compile_time_info.d +++ b/src/doc_reform/conf/compile_time_info.d @@ -1,7 +1,7 @@  /++    compile_time_info  +/ -module sdp.conf.compile_time_info; +module doc_reform.conf.compile_time_info;  template CompileTimeInfo() {    version(Windows) {      pragma(msg, "[ Windows compilation ]"); diff --git a/src/sdp/sdp.d b/src/doc_reform/doc_reform.d index a135423..f7c9751 100755 --- a/src/sdp/sdp.d +++ b/src/doc_reform/doc_reform.d @@ -1,33 +1,33 @@  #!/usr/bin/env rdmd -module sdp.sisu_document_parser; +module doc_reform.sisu_document_parser;  import -  sdp.conf.compile_time_info, -  sdp.meta.metadoc; +  doc_reform.conf.compile_time_info, +  doc_reform.meta.metadoc;  import    std.getopt,    std.file,    std.path,    std.process;  import -  sdp.meta, -  sdp.meta.metadoc_summary, -  sdp.meta.metadoc_from_src, -  sdp.meta.conf_make_meta_structs, -  sdp.meta.conf_make_meta_toml, -  sdp.meta.conf_make_meta_json, -  sdp.meta.defaults, -  sdp.meta.doc_debugs, -  sdp.meta.rgx, -  sdp.source.paths_source, -  sdp.source.read_config_files, -  sdp.source.read_source_files, -  sdp.output.hub; +  doc_reform.meta, +  doc_reform.meta.metadoc_summary, +  doc_reform.meta.metadoc_from_src, +  doc_reform.meta.conf_make_meta_structs, +  doc_reform.meta.conf_make_meta_toml, +  doc_reform.meta.conf_make_meta_json, +  doc_reform.meta.defaults, +  doc_reform.meta.doc_debugs, +  doc_reform.meta.rgx, +  doc_reform.source.paths_source, +  doc_reform.source.read_config_files, +  doc_reform.source.read_source_files, +  doc_reform.output.hub;  import std.algorithm;  import std.parallelism;  mixin(import("version.txt"));  mixin CompileTimeInfo;  /++ -name        "sdp" +name        "doc_reform"  description "A SiSU inspired document parser writen in D."  homepage    "http://sisudoc.org"  +/ @@ -44,7 +44,7 @@ void main(string[] args) {    scope(success) {      debug(checkdoc) {        writefln( -        "~ run complete, ok ~ (sdp-%s.%s.%s, %s D:%s, %s %s)", +        "~ run complete, ok ~ (doc_reform-%s.%s.%s, %s D:%s, %s %s)",          ver.major, ver.minor, ver.patch,          __VENDOR__, __VERSION__,          bits, os, diff --git a/src/sdp/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d index dbba9af..d6adfa7 100644 --- a/src/sdp/meta/conf_make_meta_json.d +++ b/src/doc_reform/meta/conf_make_meta_json.d @@ -2,7 +2,7 @@    json headers<BR>    extract json header return json  +/ -module sdp.meta.conf_make_meta_json; +module doc_reform.meta.conf_make_meta_json;  static template contentJSONtoSiSUstruct() {    import      std.exception, @@ -14,9 +14,9 @@ static template contentJSONtoSiSUstruct() {      std.utf,      std.conv : to;    import -    sdp.meta.conf_make_meta_structs, -    sdp.meta.conf_make_meta_json, -    sdp.meta.rgx; +    doc_reform.meta.conf_make_meta_structs, +    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; diff --git a/src/sdp/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d index b67b9ad..cf279a5 100644 --- a/src/sdp/meta/conf_make_meta_structs.d +++ b/src/doc_reform/meta/conf_make_meta_structs.d @@ -1,4 +1,4 @@ -module sdp.meta.conf_make_meta_structs; +module doc_reform.meta.conf_make_meta_structs;  import    std.exception,    std.json, @@ -10,8 +10,8 @@ import    std.utf,    std.conv : to;  import -  sdp.meta.defaults, -  sdp.meta.rgx; +  doc_reform.meta.defaults, +  doc_reform.meta.rgx;  mixin SiSUrgxInit;  static auto _rgx = Rgx();  mixin InternalMarkup; @@ -47,9 +47,9 @@ struct ConfCompositeMakeStr {    string[] footer;    string[] headings;    string[] home_button_image; -  string home_button_text = "{SiSU}http://www.sisudoc.org;" -    ~ " {www.sisudoc.org}http://www.sisudoc.org;" -    ~ " {sources / git}http://git.sisudoc.org/gitweb/"; +  string home_button_text = "{Doc Reform}http://www.doc-reform.org;" +    ~ " {www.doc-reform.org}http://www.doc-reform.org;" +    ~ " {sources / git}https://git.doc-reform.org/software/doc-reform";    string italics;    string auto_num_top_at_level;    int auto_num_top_lv               = 9; @@ -130,9 +130,9 @@ struct ConfCompositeMakeInit {    string[] footer;    string[] headings;    string[] home_button_image; -  string home_button_text = "{SiSU}http://www.sisudoc.org;" -    ~ " {www.sisudoc.org}http://www.sisudoc.org;" -    ~ " {sources / git}http://git.sisudoc.org/gitweb/"; +  string home_button_text = "{Doc Reform}http://www.doc-reform.org;" +    ~ " {www.doc-reform.org}http://www.doc-reform.org;" +    ~ " {sources / git}https://git.doc-reform.org/software/doc-reform";    string[] italics;    string auto_num_top_at_level;    int auto_num_top_lv               = 9; diff --git a/src/sdp/meta/conf_make_meta_toml.d b/src/doc_reform/meta/conf_make_meta_toml.d index d434f00..d308ae4 100644 --- a/src/sdp/meta/conf_make_meta_toml.d +++ b/src/doc_reform/meta/conf_make_meta_toml.d @@ -8,7 +8,7 @@    converting the metadata and make instructions to a common json format used by    program internally. Moved to associative array.  +/ -module sdp.meta.conf_make_meta_toml; +module doc_reform.meta.conf_make_meta_toml;  static template configParseTOMLreturnJSON() {    import      toml, @@ -27,8 +27,8 @@ static template configParseTOMLreturnSiSUstruct() {      toml,      toml.json;    import -    sdp.meta.conf_make_meta_structs, -    sdp.meta.conf_make_meta_json; +    doc_reform.meta.conf_make_meta_structs, +    doc_reform.meta.conf_make_meta_json;    mixin contentJSONtoSiSUstruct;    auto configParseTOMLreturnSiSUstruct(CCm, T)(      CCm     _make_and_meta_struct, @@ -53,9 +53,9 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {      toml,      toml.json;    import -    sdp.meta.conf_make_meta_structs, -    sdp.meta.conf_make_meta_json, -    sdp.meta.rgx; +    doc_reform.meta.conf_make_meta_structs, +    doc_reform.meta.conf_make_meta_json, +    doc_reform.meta.rgx;    mixin SiSUrgxInit;    mixin contentJSONtoSiSUstruct;    static auto rgx = Rgx(); diff --git a/src/sdp/meta/defaults.d b/src/doc_reform/meta/defaults.d index 70089e5..2f8c068 100644 --- a/src/sdp/meta/defaults.d +++ b/src/doc_reform/meta/defaults.d @@ -1,7 +1,7 @@  /++    default settings  +/ -module sdp.meta.defaults; +module doc_reform.meta.defaults;  template SiSUrgxInitFlags() {    /+ regex flags +/    static int[string] flags_type_init() { diff --git a/src/sdp/meta/doc_debugs.d b/src/doc_reform/meta/doc_debugs.d index 73b0f3b..04dedb2 100644 --- a/src/sdp/meta/doc_debugs.d +++ b/src/doc_reform/meta/doc_debugs.d @@ -1,11 +1,11 @@  /++    output debugs  +/ -module sdp.meta.doc_debugs; +module doc_reform.meta.doc_debugs;  template SiSUdebugs() {    import -    sdp.meta.defaults, -    sdp.meta.rgx; +    doc_reform.meta.defaults, +    doc_reform.meta.rgx;    import      std.algorithm,      std.array, diff --git a/src/sdp/meta/metadoc.d b/src/doc_reform/meta/metadoc.d index 5821096..7c0e90d 100644 --- a/src/sdp/meta/metadoc.d +++ b/src/doc_reform/meta/metadoc.d @@ -1,4 +1,4 @@ -module sdp.meta.metadoc; +module doc_reform.meta.metadoc;  template SiSUabstraction() {    import      std.getopt, @@ -6,19 +6,19 @@ template SiSUabstraction() {      std.path,      std.process;    import -    sdp.meta, -    sdp.meta.metadoc_summary, -    sdp.meta.metadoc_from_src, -    sdp.meta.conf_make_meta_structs, -    sdp.meta.conf_make_meta_toml, -    sdp.meta.conf_make_meta_json, -    sdp.meta.defaults, -    sdp.meta.doc_debugs, -    sdp.meta.rgx, -    sdp.source.paths_source, -    sdp.source.read_config_files, -    sdp.source.read_source_files, -    sdp.output.hub; +    doc_reform.meta, +    doc_reform.meta.metadoc_summary, +    doc_reform.meta.metadoc_from_src, +    doc_reform.meta.conf_make_meta_structs, +    doc_reform.meta.conf_make_meta_toml, +    doc_reform.meta.conf_make_meta_json, +    doc_reform.meta.defaults, +    doc_reform.meta.doc_debugs, +    doc_reform.meta.rgx, +    doc_reform.source.paths_source, +    doc_reform.source.read_config_files, +    doc_reform.source.read_source_files, +    doc_reform.output.hub;    mixin SiSUrgxInit;    mixin contentJSONtoSiSUstruct;    mixin SiSUbiblio; diff --git a/src/sdp/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 1a568dd..c4a12bb 100644 --- a/src/sdp/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -3,10 +3,10 @@    abstraction of sisu markup for downstream processing    metadoc_from_src.d  +/ -module sdp.meta.metadoc_from_src; +module doc_reform.meta.metadoc_from_src;  template SiSUdocAbstraction() {    /+ ↓ abstraction imports +/ -  import sdp.meta; +  import doc_reform.meta;    import      std.algorithm,      std.container, @@ -14,9 +14,9 @@ template SiSUdocAbstraction() {      std.json,      std.path;    import -    sdp.meta.defaults, -    sdp.meta.object_setter, -    sdp.meta.rgx; +    doc_reform.meta.defaults, +    doc_reform.meta.object_setter, +    doc_reform.meta.rgx;    /+ ↓ abstraction mixins +/    mixin ObjectSetter;    mixin InternalMarkup; @@ -854,7 +854,7 @@ template SiSUdocAbstraction() {                  segment_anchor_tag_that_object_belongs_to = anchor_tag_;                  segment_anchor_tag_that_object_belongs_to_uri = anchor_tag_ ~ ".fnSuffix#" ~ obj_cite_digits.on.to!string;                } else if (an_object["lev_markup_number"].to!int < 4) { -              string segn; +                string segn;                  switch (an_object["lev_markup_number"].to!int) {                  case 0:                    segn = "_the_title"; @@ -1732,7 +1732,7 @@ template SiSUdocAbstraction() {              if (obj.metainfo.heading_lev_markup == 4) {                obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ @@ -1761,7 +1761,7 @@ template SiSUdocAbstraction() {              if (obj.metainfo.heading_lev_markup == 4) {                obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            if ((opt_action.html) @@ -1791,7 +1791,7 @@ template SiSUdocAbstraction() {                  obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                }                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ @@ -1833,7 +1833,7 @@ template SiSUdocAbstraction() {                  obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                }                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ @@ -1867,7 +1867,7 @@ template SiSUdocAbstraction() {                  obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                }                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ @@ -1904,7 +1904,7 @@ template SiSUdocAbstraction() {                  obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                }                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ @@ -1946,7 +1946,7 @@ template SiSUdocAbstraction() {                  obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                }                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ @@ -1984,7 +1984,7 @@ template SiSUdocAbstraction() {                  obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                }                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ @@ -2026,7 +2026,7 @@ template SiSUdocAbstraction() {                  obj.tags.segname_next = html_segnames[obj.ptr.html_segnames + 1];                }                assert(obj.tags.segment_anchor_tag == html_segnames[obj.ptr.html_segnames], -              obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]); +                obj.tags.segment_anchor_tag ~ "!=" ~ html_segnames[obj.ptr.html_segnames]);              }            }            /+ dom structure (marked up & collapsed) +/ diff --git a/src/sdp/meta/metadoc_summary.d b/src/doc_reform/meta/metadoc_summary.d index 2ac2454..f2e0632 100644 --- a/src/sdp/meta/metadoc_summary.d +++ b/src/doc_reform/meta/metadoc_summary.d @@ -1,12 +1,12 @@ -module sdp.meta.metadoc_summary; +module doc_reform.meta.metadoc_summary;  template SiSUabstractionSummary() {    auto SiSUabstractionSummary(S,T)(      auto ref const S  doc_abstraction,      auto ref       T  doc_matters,    ) {      import -      sdp.meta.defaults, -      sdp.meta.rgx; +      doc_reform.meta.defaults, +      doc_reform.meta.rgx;      import        std.array,        std.exception, diff --git a/src/sdp/meta/object_setter.d b/src/doc_reform/meta/object_setter.d index fc0781e..f481ec1 100644 --- a/src/sdp/meta/object_setter.d +++ b/src/doc_reform/meta/object_setter.d @@ -3,7 +3,7 @@    setting of sisu objects for downstream processing    meta_object_setter.d  +/ -module sdp.meta.object_setter; +module doc_reform.meta.object_setter;  template ObjectSetter() {    /+ structs +/    struct DocObj_MetaInfo_ { diff --git a/src/sdp/meta/package.d b/src/doc_reform/meta/package.d index fcc6b13..2981b6a 100644 --- a/src/sdp/meta/package.d +++ b/src/doc_reform/meta/package.d @@ -1,7 +1,7 @@ -module sdp.meta; +module doc_reform.meta;  public import -  sdp.meta.defaults, -  sdp.meta.rgx; +  doc_reform.meta.defaults, +  doc_reform.meta.rgx;  /+ std +/  public import    std.array, diff --git a/src/sdp/meta/rgx.d b/src/doc_reform/meta/rgx.d index b64f7ba..63bb4ee 100644 --- a/src/sdp/meta/rgx.d +++ b/src/doc_reform/meta/rgx.d @@ -1,9 +1,9 @@  /++    regex: regular expressions used in sisu document parser  +/ -module sdp.meta.rgx; +module doc_reform.meta.rgx;  static template SiSUrgxInit() { -  import sdp.meta.defaults; +  import doc_reform.meta.defaults;    static struct Rgx {      /+ misc +/      static true_dollar                                    = ctRegex!(`\$`, "gm"); diff --git a/src/sdp/output/create_zip_file.d b/src/doc_reform/output/create_zip_file.d index 5380744..fa752ad 100644 --- a/src/sdp/output/create_zip_file.d +++ b/src/doc_reform/output/create_zip_file.d @@ -1,4 +1,4 @@ -module sdp.output.create_zip_file; +module doc_reform.output.create_zip_file;  template createZipFile() {    import std.file;    import std.outbuffer; diff --git a/src/sdp/output/defaults.d b/src/doc_reform/output/defaults.d index 0d215c7..97ba691 100644 --- a/src/sdp/output/defaults.d +++ b/src/doc_reform/output/defaults.d @@ -1,7 +1,7 @@  /++    default settings  +/ -module sdp.output.defaults; +module doc_reform.output.defaults;  template InternalMarkup() {    import std.array; diff --git a/src/sdp/output/epub3.d b/src/doc_reform/output/epub3.d index 52e3ce2..45e632a 100644 --- a/src/sdp/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -1,6 +1,6 @@ -module sdp.output.epub3; +module doc_reform.output.epub3;  template outputEPub3() { -  import sdp.output; +  import doc_reform.output;    import      std.digest.sha,      std.file, @@ -8,9 +8,9 @@ template outputEPub3() {      std.zip,      std.conv : to;    import -    sdp.output.create_zip_file, -    sdp.output.xmls, -    sdp.output.xmls_css; +    doc_reform.output.create_zip_file, +    doc_reform.output.xmls, +    doc_reform.output.xmls_css;    mixin InternalMarkup;    mixin outputXHTMLs;    string epub3_mimetypes() { diff --git a/src/sdp/output/html.d b/src/doc_reform/output/html.d index f1c25e8..07fe081 100644 --- a/src/sdp/output/html.d +++ b/src/doc_reform/output/html.d @@ -1,6 +1,6 @@ -module sdp.output.html; +module doc_reform.output.html;  template outputHTML() { -  import sdp.output; +  import doc_reform.output;    import      std.digest.sha,      std.file, @@ -8,9 +8,9 @@ template outputHTML() {      std.zip,      std.conv : to;    import -    sdp.output.create_zip_file, -    sdp.output.xmls, -    sdp.output.xmls_css; +    doc_reform.output.create_zip_file, +    doc_reform.output.xmls, +    doc_reform.output.xmls_css;    mixin outputXHTMLs;    void scroll(D,I)(      const D    doc_abstraction, diff --git a/src/sdp/output/hub.d b/src/doc_reform/output/hub.d index a95c348..b40c929 100644 --- a/src/sdp/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -2,16 +2,16 @@    output hub<BR>    check & generate output types requested  +/ -module sdp.output.hub; +module doc_reform.output.hub;  template outputHub() { -  import sdp.output, -    sdp.output.epub3, -    sdp.output.html, -    sdp.output.sqlite, -    sdp.output.xmls, -    sdp.output.source_sisupod, -    sdp.output.create_zip_file, -    sdp.output.paths_output; +  import doc_reform.output, +    doc_reform.output.epub3, +    doc_reform.output.html, +    doc_reform.output.sqlite, +    doc_reform.output.xmls, +    doc_reform.output.source_sisupod, +    doc_reform.output.create_zip_file, +    doc_reform.output.paths_output;    import std.parallelism;    void outputHub(D,I)(D doc_abstraction, I doc_matters) {      mixin SiSUoutputRgxInit; @@ -73,14 +73,14 @@ template outputHub() {    }  }  template outputHubOp() { -  import sdp.output, -    sdp.output.epub3, -    sdp.output.html, -    sdp.output.sqlite, -    sdp.output.xmls, -    sdp.output.source_sisupod, -    sdp.output.create_zip_file, -    sdp.output.paths_output; +  import doc_reform.output, +    doc_reform.output.epub3, +    doc_reform.output.html, +    doc_reform.output.sqlite, +    doc_reform.output.xmls, +    doc_reform.output.source_sisupod, +    doc_reform.output.create_zip_file, +    doc_reform.output.paths_output;    void outputHubOp(E,O)(E env, O opt_action) {      mixin SiSUoutputRgxInit;      static auto rgx = Rgx(); diff --git a/src/sdp/output/package.d b/src/doc_reform/output/package.d index 40b4c20..5e14e8a 100644 --- a/src/sdp/output/package.d +++ b/src/doc_reform/output/package.d @@ -1,4 +1,4 @@ -module sdp.output; +module doc_reform.output;  public import    std.algorithm,    std.array, @@ -15,8 +15,8 @@ public import    // std.uni,    std.utf;  public import -  sdp.share.defaults, -  sdp.source.paths_source, -  sdp.output.defaults, -  sdp.output.paths_output, -  sdp.output.rgx; +  doc_reform.share.defaults, +  doc_reform.source.paths_source, +  doc_reform.output.defaults, +  doc_reform.output.paths_output, +  doc_reform.output.rgx; diff --git a/src/sdp/output/paths_output.d b/src/doc_reform/output/paths_output.d index 112f47c..abd21b6 100644 --- a/src/sdp/output/paths_output.d +++ b/src/doc_reform/output/paths_output.d @@ -1,12 +1,12 @@  /++    default settings  +/ -module sdp.output.paths_output; +module doc_reform.output.paths_output;  import std.array,    std.path,    std.regex,    std.stdio; -import sdp.meta.rgx; +import doc_reform.meta.rgx;  template SiSUoutPaths() {    auto SiSUoutPaths(Po,Lng)(      Po  output_pth_root, diff --git a/src/sdp/output/rgx.d b/src/doc_reform/output/rgx.d index a62791c..0d23f11 100644 --- a/src/sdp/output/rgx.d +++ b/src/doc_reform/output/rgx.d @@ -1,9 +1,9 @@  /++    regex: regular expressions used in sisu document parser  +/ -module sdp.output.rgx; +module doc_reform.output.rgx;  static template SiSUoutputRgxInit() { -  import sdp.output.defaults; +  import doc_reform.output.defaults;    static struct Rgx {      static newline                                        = ctRegex!("\n", "mg");      static strip_br                                       = ctRegex!("^<br>\n|<br>\n*$"); diff --git a/src/sdp/output/source_sisupod.d b/src/doc_reform/output/source_sisupod.d index 44cf56b..fa041fd 100644 --- a/src/sdp/output/source_sisupod.d +++ b/src/doc_reform/output/source_sisupod.d @@ -1,6 +1,6 @@ -module sdp.output.source_sisupod; +module doc_reform.output.source_sisupod;  template SiSUpod() { -  import sdp.output; +  import doc_reform.output;    import      std.digest.sha,      std.file, @@ -8,8 +8,8 @@ template SiSUpod() {      std.zip,      std.conv : to;    import -    sdp.output.create_zip_file, -    sdp.output.xmls; +    doc_reform.output.create_zip_file, +    doc_reform.output.xmls;    void SiSUpod(T)(T doc_matters) {      debug(asserts) {        // static assert(is(typeof(doc_matters) == tuple)); diff --git a/src/sdp/output/sqlite.d b/src/doc_reform/output/sqlite.d index 82484e5..a765fd7 100644 --- a/src/sdp/output/sqlite.d +++ b/src/doc_reform/output/sqlite.d @@ -1,5 +1,5 @@ -module sdp.output.sqlite; -import sdp.output; +module doc_reform.output.sqlite; +import doc_reform.output;  import    std.file,    std.conv : to; @@ -35,7 +35,7 @@ template SQLiteHubBuildTablesAndPopulate() {                _db_statement ~= SQLiteDeleteDocument!()(doc_matters);                SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document");              } -            if (doc_matters.opt.action.sqlite_update) { // sqlite_update is .opt.action sqlite_delete & sqlite_insert (set in sdp) +            if (doc_matters.opt.action.sqlite_update) {                _db_statement ~= SQLiteDeleteDocument!()(doc_matters);                SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document");                _db_statement ~= SQLiteInsertMetadata!()(doc_matters); diff --git a/src/sdp/output/xmls.d b/src/doc_reform/output/xmls.d index 32b46e5..8428204 100644 --- a/src/sdp/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -1,6 +1,6 @@ -module sdp.output.xmls; +module doc_reform.output.xmls;  template outputXHTMLs() { -  import sdp.output; +  import doc_reform.output;    import      std.digest.sha,      std.file, @@ -8,9 +8,9 @@ template outputXHTMLs() {      std.zip,      std.conv : to;    import -    sdp.output.create_zip_file, -    sdp.output.xmls, -    sdp.output.xmls_css; +    doc_reform.output.create_zip_file, +    doc_reform.output.xmls, +    doc_reform.output.xmls_css;    mixin SiSUoutputRgxInit;    struct outputXHTMLs {      static auto rgx = Rgx(); @@ -114,7 +114,7 @@ template outputXHTMLs() {        string _date_modified="Date";        string _language="en";        string _rights="Copyright: Copyright (C) year holder"; -      string _generator="sdp [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)"; +      string _generator="doc_reform [SiSU 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"¶<!-- SiSU header metadata --> @@ -284,7 +284,7 @@ template outputXHTMLs() {        <meta name="dc.date.modified" content="year" />        <meta name="dc.language" content="US" />        <meta name="dc.rights" content="Copyright: Copyright (C) year holder" /> -      <meta name="generator" content="sdp [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" /> +      <meta name="generator" content="doc_reform [SiSU 7.1.8 of 2016w08/5 (2016-02-26)] (n*x and D)" />        <link rel="generator" href="http://www.sisudoc.org/" />        <link rel="shortcut icon" href="../_sisu/image/rb7.ico" />        <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> diff --git a/src/sdp/output/xmls_css.d b/src/doc_reform/output/xmls_css.d index dc8d274..f3c0545 100644 --- a/src/sdp/output/xmls_css.d +++ b/src/doc_reform/output/xmls_css.d @@ -1,7 +1,7 @@  /++    default css settings  +/ -module sdp.output.xmls_css; +module doc_reform.output.xmls_css;  template SiSUcss() {    auto SiSUcss() {      string _css_html_seg=" diff --git a/src/sdp/share/defaults.d b/src/doc_reform/share/defaults.d index ed76846..ee0dbcb 100644 --- a/src/sdp/share/defaults.d +++ b/src/doc_reform/share/defaults.d @@ -1,7 +1,7 @@  /++    shared default settings  +/ -module sdp.share.defaults; +module doc_reform.share.defaults;  template Msg() {    import std.stdio;    auto Msg(I)(I doc_matters) { diff --git a/src/sdp/source/paths_source.d b/src/doc_reform/source/paths_source.d index 462fc85..dc2928f 100644 --- a/src/sdp/source/paths_source.d +++ b/src/doc_reform/source/paths_source.d @@ -3,14 +3,14 @@    - read config files<BR>    meta_config_files.d  +/ -module sdp.source.paths_source; +module doc_reform.source.paths_source;  import std.array,    std.file,    std.path,    std.regex,    std.stdio,    std.conv : to; -import sdp.meta.rgx; +import doc_reform.meta.rgx;  template PodManifest() {    mixin SiSUrgxInit;    static auto rgx = Rgx(); diff --git a/src/sdp/source/read_config_files.d b/src/doc_reform/source/read_config_files.d index 7e6221e..fc5ce2f 100644 --- a/src/sdp/source/read_config_files.d +++ b/src/doc_reform/source/read_config_files.d @@ -3,11 +3,11 @@    - read config files<BR>    meta_config_files.d  +/ -module sdp.source.read_config_files; +module doc_reform.source.read_config_files;  static template configReadInSiteTOML() {    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    final string configReadInSiteTOML(M,E)(M manifest, E env) { @@ -41,8 +41,8 @@ static template configReadInSiteTOML() {  }  static template configReadInDocTOML() {    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    final string configReadInDocTOML(M,E)(M manifest, E env) { @@ -77,8 +77,8 @@ static template configReadInDocTOML() {  static template configTOML() {    import toml; //    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    auto configTOML(string configuration, string conf_toml_filename) { @@ -94,8 +94,8 @@ static template configTOML() {  }  static template readConfigSite() {    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    final auto readConfigSite(M,E)(M _manifest, E _env) { @@ -141,8 +141,8 @@ static template readConfigSite() {  }  static template readConfigDoc() {    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    final auto readConfigDoc(M,E)(M _manifest, E _env) { @@ -188,8 +188,8 @@ static template readConfigDoc() {  }  static template configReadSiteTOML() {    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    import toml; @@ -203,8 +203,8 @@ static template configReadSiteTOML() {  }  static template configReadDocTOML() {    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    import toml; diff --git a/src/sdp/source/read_source_files.d b/src/doc_reform/source/read_source_files.d index 271adfa..294b081 100644 --- a/src/sdp/source/read_source_files.d +++ b/src/doc_reform/source/read_source_files.d @@ -3,13 +3,13 @@    - open markup files<BR>    - if master file scan for addional files to import/insert  +/ -module sdp.source.read_source_files; +module doc_reform.source.read_source_files;  static template SiSUrawMarkupContent() {    import -    sdp.meta.rgx; +    doc_reform.meta.rgx;    import -    sdp.meta, -    sdp.source.paths_source, +    doc_reform.meta, +    doc_reform.source.paths_source,      std.file,      std.path;    mixin SiSUrgxInit; @@ -210,9 +210,8 @@ static template SiSUrawMarkupContent() {            auto markup_sourcesubfile_insert_content              = raw.getInsertMarkupSourceContentRawLineArray(fn_src_insert, rgx.src_fn_find_inserts);            debug(insert_file) { -            tell_l("red", line); -            tell_l("red", fn_src_insert); -            tell_l("fuchsia", "ERROR"); +            writeln(line); +            writeln(fn_src_insert);              writeln(                "  length contents insert array: ",                markup_sourcesubfile_insert_content.length @@ -292,8 +291,8 @@ static template SiSUrawMarkupContent() {            auto markup_sourcefile_insert_content              = raw.getInsertMarkupSourceContentRawLineArray(fn_src_insert, rgx.src_fn_find_inserts);            debug(insert_file) { -            tell_l("red", line); -            tell_l("red", fn_src_insert); +            writeln(line); +            writeln(fn_src_insert);              writeln(                "  length contents insert array: ",                markup_sourcefile_insert_content.length | 
