diff options
| -rw-r--r-- | docs/ao_ansi_colors.html | 15 | ||||
| -rw-r--r-- | org/ao_abstract_doc_source.org | 7 | ||||
| -rw-r--r-- | org/ao_defaults.org | 13 | ||||
| -rw-r--r-- | org/ao_output_debugs.org | 5 | ||||
| -rw-r--r-- | org/ao_read_source_files.org | 1 | ||||
| -rw-r--r-- | org/sdp.org | 14 | ||||
| -rwxr-xr-x | src/sdp.d | 11 | ||||
| -rw-r--r-- | src/sdp/ao_abstract_doc_source.d | 7 | ||||
| -rw-r--r-- | src/sdp/ao_ansi_colors.d | 73 | ||||
| -rw-r--r-- | src/sdp/ao_output_debugs.d | 5 | ||||
| -rw-r--r-- | src/sdp/ao_read_source_files.d | 1 | ||||
| -rw-r--r-- | views/version.txt | 2 | 
12 files changed, 19 insertions, 135 deletions
| diff --git a/docs/ao_ansi_colors.html b/docs/ao_ansi_colors.html deleted file mode 100644 index dac2751..0000000 --- a/docs/ao_ansi_colors.html +++ /dev/null @@ -1,15 +0,0 @@ -<html><head>
 -        <!-- Generated by Ddoc from src/sdp/ao_ansi_colors.d -->
 -        <META http-equiv="content-type" content="text/html; charset=utf-8">
 -        <title>ao_ansi_colors</title>
 -        </head><body>
 -        <h1>ao_ansi_colors</h1>
 -<br><br>
 -<dl><dt><big><a name="ScreenTxtColors"></a>template <u>ScreenTxtColors</u>()</big></dt>
 -<dd>ansi colors, depreciate use<br><br>
 -
 -</dd>
 -</dl>
 -
 -        <hr><small>Page generated by <a href="http://dlang.org/ddoc.html">Ddoc</a>. </small>
 -        </body></html>
 diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org index 9061f35..8b564d3 100644 --- a/org/ao_abstract_doc_source.org +++ b/org/ao_abstract_doc_source.org @@ -26,8 +26,7 @@ Process markup document, create document abstraction.  import    ao_defaults,                  // sdp/ao_defaults.d    ao_object_setter,             // sdp/ao_object_setter.d -  ao_rgx,                       // sdp/ao_rgx.d -  ao_ansi_colors;               // sdp/ao_ansi_colors.d +  ao_rgx;                       // sdp/ao_rgx.d  #+END_SRC  *** mixins                                                           :mixins: @@ -3121,7 +3120,6 @@ struct BookIndexNuggetHash {    string[][string][string] bookindex_nugget_hash(string bookindex_section, int obj_cite_number)    in {      debug(bookindexraw) { -      mixin ScreenTxtColors;        if (!bookindex_section.empty) {          writeln(            "* [bookindex] ", @@ -3677,7 +3675,6 @@ struct NodeStructureMetadata {        " }"      );      debug(node) { -      mixin ScreenTxtColors;        if (match(lev_markup_number, rgx.levels_numbered_headings)) {          writeln("* ", to!string(node));        } else { @@ -3831,13 +3828,11 @@ struct NodeStructureMetadata {        " }"      );      debug(heading) { -      mixin ScreenTxtColors;        if (match(lev_markup_number, rgx.levels_numbered_headings)) {          writeln("* ", to!string(node));        }      }      debug(node) { -      mixin ScreenTxtColors;        if (match(lev_markup_number, rgx.levels_numbered_headings)) {          writeln("* ", to!string(node));        } else { diff --git a/org/ao_defaults.org b/org/ao_defaults.org index 1ba90fe..3758a2f 100644 --- a/org/ao_defaults.org +++ b/org/ao_defaults.org @@ -814,7 +814,7 @@ static bi_sub_terms_plus_obj_cite_number_offset_split = ctRegex!(`\s*\|\s*`);  static bi_term_and_obj_cite_numbers_match    = ctRegex!(`^(.+?)\+(\d+)`);  #+END_SRC -* set colors for terminal                                  :colors:terminal: +* +set colors for terminal+ (unused)                                  :colors:terminal:  #+name: ao_ansi_colors  #+BEGIN_SRC d @@ -912,14 +912,3 @@ template RgxInit() {    }  }  #+END_SRC - -** ansi_colors:                                        :ao_ansi_colors.d: - -#+BEGIN_SRC d :tangle ../src/sdp/ao_ansi_colors.d -/++ -  ansi colors, depreciate use -+/ -template ScreenTxtColors() { -  <<ao_ansi_colors>> -} -#+END_SRC diff --git a/org/ao_output_debugs.org b/org/ao_output_debugs.org index 4f17969..85e349c 100644 --- a/org/ao_output_debugs.org +++ b/org/ao_output_debugs.org @@ -113,11 +113,9 @@ debug(objects) {    foreach (obj; contents) {      if (obj.use == "content") {        writefln( -        "%s* [%s][%s] %s%s", -        scr_txt_color["green"], +        "* [%s][%s] %s",          obj.obj_cite_number,          obj.is_a, -        scr_txt_color["off"],          obj.object        );      } @@ -632,7 +630,6 @@ template SiSUoutputDebugs() {        bool[string]             opt_action_bool      ) {        mixin RgxInit; -      mixin ScreenTxtColors;        auto rgx = Rgx();        <<ao_output_debugs>>          <<ao_output_debugs_summary>> diff --git a/org/ao_read_source_files.org b/org/ao_read_source_files.org index be7a3a5..a004fc2 100644 --- a/org/ao_read_source_files.org +++ b/org/ao_read_source_files.org @@ -512,7 +512,6 @@ template SiSUmarkupRaw() {    }    struct Inserts {      private import ao_defaults;    // ao_defaults.d -    private import ao_ansi_colors; // ao_ansi_colors.d      auto scan_subdoc_source(        char[][] markup_sourcefile_insert_content,        string fn_src diff --git a/org/sdp.org b/org/sdp.org index ebf427e..75cffea 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -24,7 +24,7 @@ struct Version {    int minor;    int patch;  } -enum ver = Version(0, 7, 1); +enum ver = Version(0, 7, 2);  #+END_SRC  * sdp.d   sisu document parser                                       :sdp.d: @@ -47,7 +47,6 @@ enum ver = Version(0, 7, 1);  import    compile_time_info,          // sdp/compile_time_info.d    ao_abstract_doc_source,     // sdp/ao_abstract_doc_source.d -  ao_ansi_colors,             // sdp/ao_ansi_colors.d    ao_conf_make_meta,          // sdp/ao_conf_make_meta.d    ao_conf_make_meta_native,   // sdp/ao_conf_make_meta_native.d    ao_conf_make_meta_sdlang,   // sdp/ao_conf_make_meta_sdlang.d @@ -72,7 +71,6 @@ import  [[./compile_time_info.org][compile time info]]  [[./ao_abstract_doc_source.org][ao_abstract_doc_source]] -[[./ao_ansi_colors.org][ao_ansi_colors]]  [[./ao_conf_make_meta.org][ao_onf_make_meta]]  [[./ao_conf_make_meta_native.org][ao_onf_make_meta_native]]  [[./ao_conf_make_meta_sdlang.org][ao_onf_make_meta_sdlang]] @@ -160,7 +158,6 @@ mixin SiSUmarkupRaw;  mixin SiSUdocAbstraction;  mixin SiSUoutputDebugs;  mixin SiSUoutputHub; -mixin ScreenTxtColors;  #+END_SRC  *** init                                                               :init: @@ -301,15 +298,18 @@ auto conf_doc_make_aa = confsdl.documentMakeSDLangToAAmake(sdl_root_doc_make);  #+BEGIN_SRC d  scope(success) {    debug(checkdoc) { -    writeln("~ document complete, ok ~"); +    writefln( +      "%s\n%s", +      "~ document complete, ok ~", +      "-------------------------------", +    );    }    // stderr.writeln("0");  }  scope(failure) {    debug(checkdoc) {      stderr.writefln( -      "%s~ document run failure ~%s (%s  v%s)\n\t%s", -      scr_txt_color["red"], scr_txt_color["off"], +      "~ document run failure ~ (%s  v%s)\n\t%s",        __VENDOR__, __VERSION__,        fn_src      ); @@ -6,7 +6,6 @@  import    compile_time_info,          // sdp/compile_time_info.d    ao_abstract_doc_source,     // sdp/ao_abstract_doc_source.d -  ao_ansi_colors,             // sdp/ao_ansi_colors.d    ao_conf_make_meta,          // sdp/ao_conf_make_meta.d    ao_conf_make_meta_native,   // sdp/ao_conf_make_meta_native.d    ao_conf_make_meta_sdlang,   // sdp/ao_conf_make_meta_sdlang.d @@ -53,7 +52,6 @@ void main(string[] args) {    mixin SiSUdocAbstraction;    mixin SiSUoutputDebugs;    mixin SiSUoutputHub; -  mixin ScreenTxtColors;    auto raw = MarkupRaw();    auto head = HeaderDocMetadataAndMake();    auto abs = Abstraction(); @@ -160,15 +158,18 @@ void main(string[] args) {      if (!empty(fn_src)) {        scope(success) {          debug(checkdoc) { -          writeln("~ document complete, ok ~"); +          writefln( +            "%s\n%s", +            "~ document complete, ok ~", +            "-------------------------------", +          );          }          // stderr.writeln("0");        }        scope(failure) {          debug(checkdoc) {            stderr.writefln( -            "%s~ document run failure ~%s (%s  v%s)\n\t%s", -            scr_txt_color["red"], scr_txt_color["off"], +            "~ document run failure ~ (%s  v%s)\n\t%s",              __VENDOR__, __VERSION__,              fn_src            ); diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d index 1f0ac7b..17ffa35 100644 --- a/src/sdp/ao_abstract_doc_source.d +++ b/src/sdp/ao_abstract_doc_source.d @@ -10,8 +10,7 @@ template SiSUdocAbstraction() {      import        ao_defaults,                  // sdp/ao_defaults.d        ao_object_setter,             // sdp/ao_object_setter.d -      ao_rgx,                       // sdp/ao_rgx.d -      ao_ansi_colors;               // sdp/ao_ansi_colors.d +      ao_rgx;                       // sdp/ao_rgx.d      /+ ↓ abstraction mixins +/      mixin ObjectSetter;      mixin InternalMarkup; @@ -2532,7 +2531,6 @@ template SiSUdocAbstraction() {        string[][string][string] bookindex_nugget_hash(string bookindex_section, int obj_cite_number)        in {          debug(bookindexraw) { -          mixin ScreenTxtColors;            if (!bookindex_section.empty) {              writeln(                "* [bookindex] ", @@ -2990,7 +2988,6 @@ template SiSUdocAbstraction() {            " }"          );          debug(node) { -          mixin ScreenTxtColors;            if (match(lev_markup_number, rgx.levels_numbered_headings)) {              writeln("* ", to!string(node));            } else { @@ -3138,13 +3135,11 @@ template SiSUdocAbstraction() {            " }"          );          debug(heading) { -          mixin ScreenTxtColors;            if (match(lev_markup_number, rgx.levels_numbered_headings)) {              writeln("* ", to!string(node));            }          }          debug(node) { -          mixin ScreenTxtColors;            if (match(lev_markup_number, rgx.levels_numbered_headings)) {              writeln("* ", to!string(node));            } else { diff --git a/src/sdp/ao_ansi_colors.d b/src/sdp/ao_ansi_colors.d deleted file mode 100644 index dea331d..0000000 --- a/src/sdp/ao_ansi_colors.d +++ /dev/null @@ -1,73 +0,0 @@ -/++ -  ansi colors, depreciate use -+/ -template ScreenTxtColors() { -  string[string] scr_txt_color = [ -    "off"           : "\033[0m", -    "white"         : "\033[37m", -    "white_bold"    : "\033[1m", -    "marker"        : "\033[42m", -    "bold"          : "\033[1m", -    "underline"     : "\033[4m", -    "invert"        : "\033[7m", -    "darkgrey_hi"   : "\033[100m", -    "grey_hi"       : "\033[47m", -    "pink_hi"       : "\033[105m", -    "fuchsia_hi"    : "\033[45m", -    "red_hi"        : "\033[41m", -    "orange_hi"     : "\033[101m", -    "yellow_hi"     : "\033[103m", -    "brown_hi"      : "\033[43m", -    "lightgreen_hi" : "\033[102m", -    "green_hi"      : "\033[42m", -    "cyan_hi"       : "\033[106m", -    "blue_hi"       : "\033[104m", -    "navy_hi"       : "\033[44m", -    "grey"          : "\033[90m", -    "pink"          : "\033[95m", -    "fuchsia"       : "\033[35m", -    "ruby"          : "\033[31m", -    "red"           : "\033[91m", -    "orange"        : "\033[91m", -    "yellow"        : "\033[93m", -    "brown"         : "\033[33m", -    "green"         : "\033[92m", -    "darkgreen"     : "\033[32m", -    "cyan"          : "\033[36m", -    "blue"          : "\033[94m", -    "navy"          : "\033[34m", -    "black"         : "\033[30m" -  ]; -  string[string] scr_txt_marker = [ -    "white"         : "\033[37m*\033[0m ", -    "bold"          : "\033[1m*\033[0m ", -    "invert"        : "\033[7m*\033[0m ", -    "darkgrey_hi"   : "\033[100m*\033[0m ", -    "grey_hi"       : "\033[47m*\033[0m ", -    "pink_hi"       : "\033[105m*\033[0m ", -    "fuchsia_hi"    : "\033[45m*\033[0m ", -    "red_hi"        : "\033[41m*\033[0m ", -    "orange_hi"     : "\033[101m*\033[0m ", -    "yellow_hi"     : "\033[103m*\033[0m ", -    "brown_hi"      : "\033[43m*\033[0m ", -    "lightgreen_hi" : "\033[102m*\033[0m ", -    "green_hi"      : "\033[42m*\033[0m ", -    "cyan_hi"       : "\033[106m*\033[0m ", -    "blue_hi"       : "\033[104m*\033[0m ", -    "navy_hi"       : "\033[44m*\033[0m ", -    "grey"          : "\033[90m*\033[0m ", -    "pink"          : "\033[95m*\033[0m ", -    "fuchsia"       : "\033[35m*\033[0m ", -    "ruby"          : "\033[31m*\033[0m ", -    "red"           : "\033[91m*\033[0m ", -    "orange"        : "\033[91m*\033[0m ", -    "yellow"        : "\033[93m*\033[0m ", -    "brown"         : "\033[33m*\033[0m ", -    "green"         : "\033[92m*\033[0m ", -    "darkgreen"     : "\033[32m*\033[0m ", -    "cyan"          : "\033[36m*\033[0m ", -    "blue"          : "\033[94m*\033[0m ", -    "navy"          : "\033[34m*\033[0m ", -    "black"         : "\033[30m*\033[0m " -  ]; -} diff --git a/src/sdp/ao_output_debugs.d b/src/sdp/ao_output_debugs.d index 9111cd6..1725ed9 100644 --- a/src/sdp/ao_output_debugs.d +++ b/src/sdp/ao_output_debugs.d @@ -40,7 +40,6 @@ template SiSUoutputDebugs() {        bool[string]             opt_action_bool      ) {        mixin RgxInit; -      mixin ScreenTxtColors;        auto rgx = Rgx();        debug(parent) {          writefln( @@ -91,11 +90,9 @@ template SiSUoutputDebugs() {          foreach (obj; contents) {            if (obj.use == "content") {              writefln( -              "%s* [%s][%s] %s%s", -              scr_txt_color["green"], +              "* [%s][%s] %s",                obj.obj_cite_number,                obj.is_a, -              scr_txt_color["off"],                obj.object              );            } diff --git a/src/sdp/ao_read_source_files.d b/src/sdp/ao_read_source_files.d index 3fd070d..66ea561 100644 --- a/src/sdp/ao_read_source_files.d +++ b/src/sdp/ao_read_source_files.d @@ -130,7 +130,6 @@ template SiSUmarkupRaw() {    }    struct Inserts {      private import ao_defaults;    // ao_defaults.d -    private import ao_ansi_colors; // ao_ansi_colors.d      auto scan_subdoc_source(        char[][] markup_sourcefile_insert_content,        string fn_src diff --git a/views/version.txt b/views/version.txt index 26d1821..11844df 100644 --- a/views/version.txt +++ b/views/version.txt @@ -4,4 +4,4 @@ struct Version {    int minor;    int patch;  } -enum ver = Version(0, 7, 1); +enum ver = Version(0, 7, 2); | 
