From 7520bb9fbd1eb03968805717ed751eb9e8bf86a9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 7 Sep 2016 18:31:39 -0400 Subject: heading debug info, moved --- org/ao_abstract_doc_source.org | 62 ----------------------- org/ao_output_debugs.org | 103 ++++++++++++++++++++++++++++++++------- src/sdp/ao_abstract_doc_source.d | 78 ----------------------------- src/sdp/ao_output_debugs.d | 77 +++++++++++++++++++++++++---- 4 files changed, 154 insertions(+), 166 deletions(-) diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org index af47654..12fd0a5 100644 --- a/org/ao_abstract_doc_source.org +++ b/org/ao_abstract_doc_source.org @@ -763,68 +763,6 @@ auto document_the = *** misc heading #+name: abs_post -#+BEGIN_SRC d -debug(heading) { // heading - string spc; - foreach (o; document_the) { - if (o.is_a == "heading") { - switch (o.heading_attrib.lev_markup_number) { - case 0: - // case to!string(DocStructMarkupHeading.h_sect_A): - spc=""; - break; - case 1: - // case to!string(DocStructMarkupHeading.h_sect_B): - spc=" "; - break; - case 2: - // case to!string(DocStructMarkupHeading.h_sect_C): - spc=" "; - break; - case 3: - // case to!string(DocStructMarkupHeading.h_sect_D): - spc=" "; - break; - case 4: - // case to!string(DocStructMarkupHeading.h_text_1): - spc=" "; - break; - case 5: - // case to!string(DocStructMarkupHeading.h_text_2): - spc=" "; - break; - case 6: - // case to!string(DocStructMarkupHeading.h_text_3): - spc=" "; - break; - case 7: - // case to!string(DocStructMarkupHeading.h_text_4): - spc=" "; - break; - case 8: - // case to!string(DocStructMarkupHeading.h_text_5): - spc=" "; - break; - default: - spc=""; - break; - } - // writeln( - // spc, "* ", " ", - // o - // ); - writefln( - "%s* %s\n (markup level: %s; collapsed level: %s)", - spc, - strip(o.object), - o.heading_attrib.lev_markup_number, - o.heading_attrib.lev_collapsed_number - ); - // writeln(spc, "* ", to!string(o["lev_collapsed_number"]), " ", strip(o["obj"])); - // tell_l("yellow", spc, strip(o["obj"])); - } - } -} destroy(contents_the_objects); destroy(endnotes_section); destroy(bookindex_section); diff --git a/org/ao_output_debugs.org b/org/ao_output_debugs.org index c52b622..4b79a54 100644 --- a/org/ao_output_debugs.org +++ b/org/ao_output_debugs.org @@ -319,32 +319,72 @@ debug(biblio) { #+END_SRC -** (summary) [+1] :summary: +** (headings) :headings: #+name: ao_output_debugs #+BEGIN_SRC d -debug(summary) { - string[string] check = [ - "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]", - ]; -#+END_SRC - -*** (checkdoc) :checkdoc: - -#+name: ao_output_debugs_summary -#+BEGIN_SRC d -debug(checkdoc) { - foreach (obj; contents) { - if (obj.use == "content") { - if (!empty(obj.obj_cite_number)) { - check["last_obj_cite_number"] = obj.obj_cite_number; +debug(heading) { // heading + string spc; + foreach (o; contents) { + if (o.is_a == "heading") { + switch (o.heading_attrib.lev_markup_number) { + case 0: + // case to!string(DocStructMarkupHeading.h_sect_A): + spc=""; + break; + case 1: + // case to!string(DocStructMarkupHeading.h_sect_B): + spc=" "; + break; + case 2: + // case to!string(DocStructMarkupHeading.h_sect_C): + spc=" "; + break; + case 3: + // case to!string(DocStructMarkupHeading.h_sect_D): + spc=" "; + break; + case 4: + // case to!string(DocStructMarkupHeading.h_text_1): + spc=" "; + break; + case 5: + // case to!string(DocStructMarkupHeading.h_text_2): + spc=" "; + break; + case 6: + // case to!string(DocStructMarkupHeading.h_text_3): + spc=" "; + break; + case 7: + // case to!string(DocStructMarkupHeading.h_text_4): + spc=" "; + break; + case 8: + // case to!string(DocStructMarkupHeading.h_text_5): + spc=" "; + break; + default: + spc=""; + break; } + // writeln( + // spc, "* ", " ", + // o + // ); + writefln( + "%s* %s\n (markup level: %s; collapsed level: %s)", + spc, + strip(o.object), + o.heading_attrib.lev_markup_number, + o.heading_attrib.lev_collapsed_number + ); } } } #+END_SRC -*** (headings) :headings: +** (summary) [+1] :summary: #+name: ao_output_debugs_summary #+BEGIN_SRC d @@ -368,6 +408,35 @@ debug(headings) { } } } +#+END_SRC + +#+name: ao_output_debugs +#+BEGIN_SRC d +debug(summary) { + string[string] check = [ + "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]", + ]; +#+END_SRC + +*** (checkdoc) :checkdoc: + +#+name: ao_output_debugs_summary +#+BEGIN_SRC d +debug(checkdoc) { + foreach (obj; contents) { + if (obj.use == "content") { + if (!empty(obj.obj_cite_number)) { + check["last_obj_cite_number"] = obj.obj_cite_number; + } + } + } +} +#+END_SRC + +*** output summary + +#+name: ao_output_debugs_summary +#+BEGIN_SRC d writefln( "%s%s%s\n%s\n%s%s\n%s%s\n%s%s\n%s:%s", scr_txt_color["green"], diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d index 0428291..603c025 100644 --- a/src/sdp/ao_abstract_doc_source.d +++ b/src/sdp/ao_abstract_doc_source.d @@ -538,84 +538,6 @@ template SiSUdocAbstraction() { } auto document_the = contents_the_objects ~ endnotes_section ~ bookindex_section; - debug(heading) { // heading - string spc; - foreach (o; document_the) { - if (o.is_a == "heading") { - switch (o.heading_attrib.lev_markup_number) { - case 0: - // case to!string(DocStructMarkupHeading.h_sect_A): - spc=""; - break; - case 1: - // case to!string(DocStructMarkupHeading.h_sect_B): - spc=" "; - break; - case 2: - // case to!string(DocStructMarkupHeading.h_sect_C): - spc=" "; - break; - case 3: - // case to!string(DocStructMarkupHeading.h_sect_D): - spc=" "; - break; - case 4: - // case to!string(DocStructMarkupHeading.h_text_1): - spc=" "; - break; - case 5: - // case to!string(DocStructMarkupHeading.h_text_2): - spc=" "; - break; - case 6: - // case to!string(DocStructMarkupHeading.h_text_3): - spc=" "; - break; - case 7: - // case to!string(DocStructMarkupHeading.h_text_4): - spc=" "; - break; - case 8: - // case to!string(DocStructMarkupHeading.h_text_5): - spc=" "; - break; - default: - spc=""; - break; - } - // writeln( - // spc, "* ", " ", - // o - // ); - writefln( - "%s* %s\n (markup level: %s; collapsed level: %s)", - spc, - strip(o.object), - o.heading_attrib.lev_markup_number, - o.heading_attrib.lev_collapsed_number - ); - // writeln(spc, "* ", to!string(o["lev_collapsed_number"]), " ", strip(o["obj"])); - // tell_l("yellow", spc, strip(o["obj"])); - } - } - } - destroy(contents_the_objects); - destroy(endnotes_section); - destroy(bookindex_section); - // struct Document { - // char content; - // char head_make; - // char head_meta; - // char bookindex_section; - // char biblio; - // } - // struct Document { - // char content; - // char head_make; - // char head_meta; - // char bookindex_section; - // char biblio; - // } auto t = tuple( document_the, bookindex_unordered_hashes, diff --git a/src/sdp/ao_output_debugs.d b/src/sdp/ao_output_debugs.d index a17f8ea..b80c53d 100644 --- a/src/sdp/ao_output_debugs.d +++ b/src/sdp/ao_output_debugs.d @@ -272,19 +272,69 @@ template SiSUoutputDebugs() { } } + debug(heading) { // heading + string spc; + foreach (o; contents) { + if (o.is_a == "heading") { + switch (o.heading_attrib.lev_markup_number) { + case 0: + // case to!string(DocStructMarkupHeading.h_sect_A): + spc=""; + break; + case 1: + // case to!string(DocStructMarkupHeading.h_sect_B): + spc=" "; + break; + case 2: + // case to!string(DocStructMarkupHeading.h_sect_C): + spc=" "; + break; + case 3: + // case to!string(DocStructMarkupHeading.h_sect_D): + spc=" "; + break; + case 4: + // case to!string(DocStructMarkupHeading.h_text_1): + spc=" "; + break; + case 5: + // case to!string(DocStructMarkupHeading.h_text_2): + spc=" "; + break; + case 6: + // case to!string(DocStructMarkupHeading.h_text_3): + spc=" "; + break; + case 7: + // case to!string(DocStructMarkupHeading.h_text_4): + spc=" "; + break; + case 8: + // case to!string(DocStructMarkupHeading.h_text_5): + spc=" "; + break; + default: + spc=""; + break; + } + // writeln( + // spc, "* ", " ", + // o + // ); + writefln( + "%s* %s\n (markup level: %s; collapsed level: %s)", + spc, + strip(o.object), + o.heading_attrib.lev_markup_number, + o.heading_attrib.lev_collapsed_number + ); + } + } + } debug(summary) { string[string] check = [ "last_obj_cite_number" : "NA [debug \"checkdoc\" not run]", ]; - debug(checkdoc) { - foreach (obj; contents) { - if (obj.use == "content") { - if (!empty(obj.obj_cite_number)) { - check["last_obj_cite_number"] = obj.obj_cite_number; - } - } - } - } debug(headings) { writefln( "%s\n%s:%s", @@ -305,6 +355,15 @@ template SiSUoutputDebugs() { } } } + debug(checkdoc) { + foreach (obj; contents) { + if (obj.use == "content") { + if (!empty(obj.obj_cite_number)) { + check["last_obj_cite_number"] = obj.obj_cite_number; + } + } + } + } writefln( "%s%s%s\n%s\n%s%s\n%s%s\n%s%s\n%s:%s", scr_txt_color["green"], -- cgit v1.2.3