From 6886780b440286d452aec35f9b13d090c0646b04 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 24 Sep 2019 10:21:24 -0400 Subject: flag --show-summary --- org/doc_reform.org | 14 +++++++++++--- org/output_harvest_metadata.org | 4 +++- src/doc_reform/doc_reform.d | 19 +++++++++++++++---- src/doc_reform/meta/metadoc_summary.d | 4 +++- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/org/doc_reform.org b/org/doc_reform.org index 7d8fee3..62ab9c7 100644 --- a/org/doc_reform.org +++ b/org/doc_reform.org @@ -92,7 +92,7 @@ void main(string[] args) { <> if (_manifests.length > 1 // _manifests[0] initialized dummy element && _opt_action.abstraction) { - if (_opt_action.parallelise) { // note cannot parallelise sqlite shared db + if (_opt_action.parallelise) { // see else foreach(manifest; parallel(_manifests[1..$])) { if (!empty(manifest.src.filename)) { <> @@ -104,7 +104,7 @@ void main(string[] args) { <> } } - } else { + } else { // note cannot parallelise sqlite shared db foreach(manifest; _manifests[1..$]) { writeln("parallelisation off: actions include sqlite shared db"); if (!empty(manifest.src.filename)) { @@ -349,6 +349,7 @@ bool[string] opts = [ "quiet" : false, "pod" : false, "serial" : false, + "show-summary" : false, "source" : false, "sqlite-discrete" : false, "sqlite-db-create" : false, @@ -408,6 +409,7 @@ auto helpInfo = getopt(args, "pdf", "--pdf latex output for pdfs", &opts["pdf"], "pod", "--pod doc reform pod source content bundled", &opts["pod"], "serial", "--serial serial processing", &opts["serial"], + "show-summary", "--show-summary", &opts["show-summary"], "source", "--source markup source text content", &opts["source"], "sqlite-discrete", "--sqlite process discrete sqlite output", &opts["sqlite-discrete"], "sqlite-db-create", "--sqlite-db-create create db, create tables", &opts["sqlite-db-create"], @@ -552,6 +554,9 @@ struct OptActions { bool pod() { return opts["pod"]; } + bool show_summary() { + return opts["show-summary"]; + } bool source() { return opts["source"]; } @@ -957,7 +962,10 @@ if ((doc_matters.opt.action.debug_do) #+NAME: doc_reform_each_file_do_debugs_checkdoc #+BEGIN_SRC d /+ ↓ debugs +/ -if (doc_matters.opt.action.verbose) { +if (doc_matters.opt.action.verbose + || doc_matters.opt.action.show_summary +) { + import doc_reform.meta.metadoc_summary; DocReformMetaDocSummary!()(doc_abstraction, doc_matters); } #+END_SRC diff --git a/org/output_harvest_metadata.org b/org/output_harvest_metadata.org index 199a504..e6d5ab5 100644 --- a/org/output_harvest_metadata.org +++ b/org/output_harvest_metadata.org @@ -29,7 +29,9 @@ template DocReformMetaDocSummary() { <> mixin InternalMarkup; <> - if (doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.verbose + || doc_matters.opt.action.show_summary + ) { <> } } diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/doc_reform.d index 2378785..6275963 100755 --- a/src/doc_reform/doc_reform.d +++ b/src/doc_reform/doc_reform.d @@ -142,6 +142,7 @@ void main(string[] args) { "quiet" : false, "pod" : false, "serial" : false, + "show-summary" : false, "source" : false, "sqlite-discrete" : false, "sqlite-db-create" : false, @@ -201,6 +202,7 @@ void main(string[] args) { "pdf", "--pdf latex output for pdfs", &opts["pdf"], "pod", "--pod doc reform pod source content bundled", &opts["pod"], "serial", "--serial serial processing", &opts["serial"], + "show-summary", "--show-summary", &opts["show-summary"], "source", "--source markup source text content", &opts["source"], "sqlite-discrete", "--sqlite process discrete sqlite output", &opts["sqlite-discrete"], "sqlite-db-create", "--sqlite-db-create create db, create tables", &opts["sqlite-db-create"], @@ -338,6 +340,9 @@ void main(string[] args) { bool pod() { return opts["pod"]; } + bool show_summary() { + return opts["show-summary"]; + } bool source() { return opts["source"]; } @@ -647,7 +652,7 @@ void main(string[] args) { } if (_manifests.length > 1 // _manifests[0] initialized dummy element && _opt_action.abstraction) { - if (_opt_action.parallelise) { // note cannot parallelise sqlite shared db + if (_opt_action.parallelise) { // see else foreach(manifest; parallel(_manifests[1..$])) { if (!empty(manifest.src.filename)) { scope(success) { @@ -689,7 +694,10 @@ void main(string[] args) { writeln("- stepX complete"); } /+ ↓ debugs +/ - if (doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.verbose + || doc_matters.opt.action.show_summary + ) { + import doc_reform.meta.metadoc_summary; DocReformMetaDocSummary!()(doc_abstraction, doc_matters); } if (doc_matters.opt.action.harvest) { @@ -729,7 +737,7 @@ void main(string[] args) { break; // terminate, stop } } - } else { + } else { // note cannot parallelise sqlite shared db foreach(manifest; _manifests[1..$]) { writeln("parallelisation off: actions include sqlite shared db"); if (!empty(manifest.src.filename)) { @@ -772,7 +780,10 @@ void main(string[] args) { writeln("- stepX complete"); } /+ ↓ debugs +/ - if (doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.verbose + || doc_matters.opt.action.show_summary + ) { + import doc_reform.meta.metadoc_summary; DocReformMetaDocSummary!()(doc_abstraction, doc_matters); } if (doc_matters.opt.action.harvest) { diff --git a/src/doc_reform/meta/metadoc_summary.d b/src/doc_reform/meta/metadoc_summary.d index 4beada8..7395e81 100644 --- a/src/doc_reform/meta/metadoc_summary.d +++ b/src/doc_reform/meta/metadoc_summary.d @@ -20,7 +20,9 @@ template DocReformMetaDocSummary() { std.conv : to; mixin InternalMarkup; auto markup = InlineMarkup(); - if (doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.verbose + || doc_matters.opt.action.show_summary + ) { string[string] check = [ "last_object_number" : "NA [debug \"checkdoc\" not run]", "last_object_number_body" : "0", -- cgit v1.2.3