diff options
Diffstat (limited to 'org')
| -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 |
5 files changed, 10 insertions, 30 deletions
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 ); |