From 736cd4feb17efd47ba97e0d997450b6e737ba805 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 14 Oct 2016 15:15:23 -0400 Subject: 0.7.2 removed screen ansi colors (use previously depreciated) --- src/sdp.d | 11 +++--- src/sdp/ao_abstract_doc_source.d | 7 +--- src/sdp/ao_ansi_colors.d | 73 ---------------------------------------- src/sdp/ao_output_debugs.d | 5 +-- src/sdp/ao_read_source_files.d | 1 - 5 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 src/sdp/ao_ansi_colors.d (limited to 'src') diff --git a/src/sdp.d b/src/sdp.d index 24c85bc..3370433 100755 --- a/src/sdp.d +++ b/src/sdp.d @@ -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 -- cgit v1.2.3