primarily org related

author: Ralph Amissah <ralph.amissah@gmail.com> 2021-10-05 12:39:53 -0400
committer: Ralph Amissah <ralph.amissah@gmail.com> 2021-11-27 19:40:42 -0500
commit: 02718313824caa0e87eb0f1448684ff8d2dbe4d1 (patch)
tree: cb916873c46c57d18643d26fb6731f5258824a0f /org
parent: nix related config, direnv else minor (diff)
29 files changed, 182 insertions, 154 deletions
diff --git a/org/COPYRIGHT b/org/COPYRIGHT
index c04e09b..5f52cb7 100644
--- a/org/COPYRIGHT
+++ b/org/COPYRIGHT
@@ -14,7 +14,7 @@
     - docReform object numbering (based on SiSU object citation numbering)
       - standard SiSU document object numbering
 
-  - Hompages:
+  - Homepages:
     [https://www.sisudoc.org]
 
 - Spine, Doc Reform (SiSU) markup samples
diff --git a/org/cgi_spine_search.org b/org/cgi_spine_search.org
index 0a1b244..75d0ca1 100644
--- a/org/cgi_spine_search.org
+++ b/org/cgi_spine_search.org
@@ -2160,7 +2160,7 @@ see configuration_cfte.org
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/compile_time_info.org b/org/compile_time_info.org
index 7f75ece..4591799 100644
--- a/org/compile_time_info.org
+++ b/org/compile_time_info.org
@@ -85,7 +85,7 @@ template CompileTimeInfo() {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/config_d_cfte.org b/org/config_d_cfte.org
index 9efa9ea..ae3f9c4 100644
--- a/org/config_d_cfte.org
+++ b/org/config_d_cfte.org
@@ -63,7 +63,58 @@ version (Posix) {
 #+END_SRC
 
 ** set configuration SET :configuration:
-*** shared settings SET
+
+SEE NOTES on configuration hierarchy in spine.org
+
+*** spine: configuration.txt SET
+
+#+HEADER: :tangle "../views/configuration_suggested.txt"
+#+BEGIN_SRC d
+/+ obt - org-mode generated file +/
+struct Cfg {
+  string www_http              = "<<www_http>>";
+  string www_host              = "<<www_host>>";
+  string www_url_doc_root      = "<<www_url_doc_root>>";
+  string www_doc_root          = "<<www_doc_root>>";
+  string www_host_doc_root     = "localhost";
+  string cgi_bin_root          = "<<cgi_bin_root>>";
+  string cgi_bin_subpath       = "<<cgi_bin_subpath>>";
+  string cgi_filename          = "<<cgi_filename>>";
+  string cgi_url_root          = "<<www_http>>://<<www_host>><<cgi_bin_subpath>>";
+  string cgi_port              = "";
+  string cgi_user              = "";
+  string cgi_url_action        = "<<www_http>>://<<www_host>><<cgi_bin_subpath>>/<<cgi_filename>>";
+  string cgi_search_form_title = "<<cgi_search_form_title>>";
+  string db_sqlite_path        = "<<db_sqlite_path>>";
+  string db_sqlite_filename    = "<<db_sqlite_filename>>";
+  string default_language      = "en";
+  string default_papersize     = "a4";
+  string default_text_wrap     = "80";
+  string default_hash_digest   = "sha256";
+}
+enum _cfg = Cfg();
+#+END_SRC
+
+*** spine_search: configuration.txt SET
+
+#+HEADER: :tangle "../sundry/spine_search_cgi/views/configuration_suggested.txt"
+#+BEGIN_SRC d
+/+ obt - org-mode generated file +/
+struct Cfg {
+  string http_request_type     = "<<www_http>>";
+  string http_host             = "<<www_host>>";
+  string www_url_doc_root      = "<<www_url_doc_root>>";
+  string www_doc_root          = "<<www_doc_root>>";
+  string cgi_bin_subpath       = "<<cgi_bin_subpath>>";
+  string cgi_filename          = "<<cgi_filename>>";                          // "spine-search"
+  string cgi_search_form_title = "<<cgi_search_form_title>>";
+  string db_sqlite_path        = "<<db_sqlite_path>>";
+  string db_sqlite_filename    = "<<db_sqlite_filename>>";
+}
+enum _cfg = Cfg();
+#+END_SRC
+
+*** shared settings SET defaults
 
 #+NAME: www_http
 #+BEGIN_SRC sh
@@ -114,51 +165,3 @@ spine_search
 #+BEGIN_SRC sh
 spine.search.db
 #+END_SRC
-
-*** spine: configuration.txt SET
-
-#+HEADER: :tangle "../views/configuration_suggested.txt"
-#+BEGIN_SRC d
-/+ obt - org-mode generated file +/
-struct Cfg {
-  string www_http              = "<<www_http>>";
-  string www_host              = "<<www_host>>";
-  string www_url_doc_root      = "<<www_url_doc_root>>";
-  string www_doc_root          = "<<www_doc_root>>";
-  string www_host_doc_root     = "localhost";
-  string cgi_bin_root          = "<<cgi_bin_root>>";
-  string cgi_bin_subpath       = "<<cgi_bin_subpath>>";
-  string cgi_filename          = "<<cgi_filename>>";
-  string cgi_url_root          = "<<www_http>>://<<www_host>><<cgi_bin_subpath>>";
-  string cgi_port              = "";
-  string cgi_user              = "";
-  string cgi_url_action        = "<<www_http>>://<<www_host>><<cgi_bin_subpath>>/<<cgi_filename>>";
-  string cgi_search_form_title = "<<cgi_search_form_title>>";
-  string db_sqlite_path        = "<<db_sqlite_path>>";
-  string db_sqlite_filename    = "<<db_sqlite_filename>>";
-  string default_language      = "en";
-  string default_papersize     = "a4";
-  string default_text_wrap     = "80";
-  string default_hash_digest   = "sha256";
-}
-enum _cfg = Cfg();
-#+END_SRC
-
-*** spine_search: configuration.txt SET
-
-#+HEADER: :tangle "../sundry/spine_search_cgi/views/configuration_suggested.txt"
-#+BEGIN_SRC d
-/+ obt - org-mode generated file +/
-struct Cfg {
-  string http_request_type     = "<<www_http>>";
-  string http_host             = "<<www_host>>";
-  string www_url_doc_root      = "<<www_url_doc_root>>";
-  string www_doc_root          = "<<www_doc_root>>";
-  string cgi_bin_subpath       = "<<cgi_bin_subpath>>";
-  string cgi_filename          = "<<cgi_filename>>";                          // "spine-search"
-  string cgi_search_form_title = "<<cgi_search_form_title>>";
-  string db_sqlite_path        = "<<db_sqlite_path>>";
-  string db_sqlite_filename    = "<<db_sqlite_filename>>";
-}
-enum _cfg = Cfg();
-#+END_SRC
diff --git a/org/default_misc.org b/org/default_misc.org
index 0a1dad4..75db5d8 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -402,7 +402,7 @@ template spineLanguageCodes() {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/default_paths.org b/org/default_paths.org
index 1eae1c7..30a2abf 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -1718,7 +1718,7 @@ template spinePathsSQLiteCGI() {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/default_regex.org b/org/default_regex.org
index fdd9e01..5398aaa 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -636,7 +636,7 @@ static table_delimiter_row                           = ctRegex!("[ ]*\n", "mg");
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/default_shared.org b/org/default_shared.org
index d39b7ee..505d93b 100644
--- a/org/default_shared.org
+++ b/org/default_shared.org
@@ -100,7 +100,7 @@ template Msg() {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/imports.org b/org/imports.org
index 63eb70c..6066622 100644
--- a/org/imports.org
+++ b/org/imports.org
@@ -129,7 +129,7 @@ public import
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/in_source_files.org b/org/in_source_files.org
index db0f65e..205ac98 100644
--- a/org/in_source_files.org
+++ b/org/in_source_files.org
@@ -59,6 +59,8 @@ import
 *** read config files (config local site & dr document make) (yaml)
 **** site configuration
 
+SEE NOTES on configuration hierarchy in spine.org
+
 #+NAME: meta_config_file_hub_read_site_config
 #+BEGIN_SRC d
 template readConfigSite() {
@@ -105,11 +107,11 @@ webserv:
   _cfg.www_doc_root,          // doc root
   _cfg.www_http,              // http
   _cfg.www_host,              // host / domain
-  _cfg.www_http,              // data http
-  _cfg.www_host,              // data domain
-  _cfg.www_url_doc_root,      // data root url
+  _cfg.www_http,              // data "http" or "https"
+  _cfg.www_host,              // data domain "localhost"
+  _cfg.www_url_doc_root,      // data root url "http://locahost" "https://sisudoc.org"
   _cfg.www_doc_root,          // data root path
-  _cfg.cgi_search_form_title, // cgi title
+  _cfg.cgi_search_form_title, // cgi title // e.g. "≅ SiSU Spine search"
   _cfg.www_http,              // cgi http
   _cfg.www_host,              // cgi host
   _cfg.cgi_url_root,          // cgi bin url
@@ -772,7 +774,7 @@ return t;
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index e9f770c..1bd2d7a 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -87,18 +87,18 @@ import doc_reform.meta.conf_make_meta_structs;
 #+BEGIN_SRC d
 <<doc_header_including_copyright_and_license>>
 module doc_reform.meta.conf_make_meta_structs;
-<<meta_defaults_template_structs_0>>
-<<meta_defaults_template_structs_1>>
-<<meta_defaults_template_structs_2>>
-<<meta_defaults_template_structs_3>>
-<<meta_defaults_template_structs_4>>
-<<meta_defaults_template_structs_5>>
-<<meta_defaults_template_structs_6>>
+<<meta_defaults_template_structs_init>>
+<<meta_defaults_template_structs_setup>>
+<<meta_defaults_template_structs_composite_make_init>>
+<<meta_defaults_template_structs_conf_composite_site_local>>
+<<meta_defaults_template_structs_meta_composite>>
+<<meta_defaults_template_structs_conf_composite>>
+<<meta_defaults_template_structs_json>>
 #+END_SRC
 
 ** initialize, imports etc.
 
-#+NAME: meta_defaults_template_structs_0
+#+NAME: meta_defaults_template_structs_init
 #+BEGIN_SRC d
 import
   std.exception,
@@ -121,7 +121,7 @@ static auto mkup = InlineMarkup();
 
 ** struct Generic ConfComposite
 
-#+NAME: meta_defaults_template_structs_1
+#+NAME: meta_defaults_template_structs_setup
 #+BEGIN_SRC d
 @safe string url_markup(string line) {
   string line_ = line
@@ -233,7 +233,7 @@ struct confCompositeMakeBuild {
 ** initialize make & meta
 *** composite make
 
-#+NAME: meta_defaults_template_structs_2
+#+NAME: meta_defaults_template_structs_composite_make_init
 #+BEGIN_SRC d
 struct ConfCompositeMakeInit {
   string[]   bold;
@@ -258,7 +258,9 @@ struct ConfCompositeMakeInit {
 
 *** struct: conf site local
 
-#+NAME: meta_defaults_template_structs_3
+SEE NOTES on configuration hierarchy in spine.org
+
+#+NAME: meta_defaults_template_structs_conf_composite_site_local
 #+BEGIN_SRC d
 struct ConfCompositeSiteLocal {
   string   w_srv_http;
@@ -318,7 +320,7 @@ struct ConfCompositeSiteLocal {
 
 *** struct: composite meta
 
-#+NAME: meta_defaults_template_structs_4
+#+NAME: meta_defaults_template_structs_meta_composite
 #+BEGIN_SRC d
 struct MetaComposite {
   string   classify_dewey;
@@ -378,7 +380,7 @@ struct MetaComposite {
 
 *** composite structs
 
-#+NAME: meta_defaults_template_structs_5
+#+NAME: meta_defaults_template_structs_conf_composite
 #+BEGIN_SRC d
 struct ConfComposite {
   MetaComposite               meta;
@@ -390,7 +392,7 @@ struct ConfComposite {
 
 *** JSONValue
 
-#+NAME: meta_defaults_template_structs_6
+#+NAME: meta_defaults_template_structs_json
 #+BEGIN_SRC d
 JSONValue config_jsonstr = `{
 }`;
@@ -2226,7 +2228,7 @@ template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/meta_debugs.org b/org/meta_debugs.org
index c8971f2..d810c89 100644
--- a/org/meta_debugs.org
+++ b/org/meta_debugs.org
@@ -912,7 +912,7 @@ debug(checkdoc) {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/metaverse.org b/org/metaverse.org
index 0118542..3ea4b56 100644
--- a/org/metaverse.org
+++ b/org/metaverse.org
@@ -8121,7 +8121,7 @@ struct TheObjects {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_cgi_search_sqlite.org b/org/out_cgi_search_sqlite.org
index d8d9064..6709e8b 100644
--- a/org/out_cgi_search_sqlite.org
+++ b/org/out_cgi_search_sqlite.org
@@ -2332,7 +2332,7 @@ https://localhost/cgi-bin/spine-search?
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_curate_metadata.org b/org/out_curate_metadata.org
index e085fe7..215c507 100644
--- a/org/out_curate_metadata.org
+++ b/org/out_curate_metadata.org
@@ -1021,7 +1021,7 @@ string theme_light_1 = format(q"┃
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_latex.org b/org/out_latex.org
index 91ef042..5aecfbd 100644
--- a/org/out_latex.org
+++ b/org/out_latex.org
@@ -2100,7 +2100,7 @@ __END__
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_metadata.org b/org/out_metadata.org
index b8c2652..6fb420c 100644
--- a/org/out_metadata.org
+++ b/org/out_metadata.org
@@ -613,7 +613,7 @@ string theme_light_1 = format(q"┃
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_odt.org b/org/out_odt.org
index eefd3be..6ba4b93 100644
--- a/org/out_odt.org
+++ b/org/out_odt.org
@@ -2616,7 +2616,7 @@ doc_matters.generated_time,
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_sqlite.org b/org/out_sqlite.org
index 2f09101..b01bb1f 100644
--- a/org/out_sqlite.org
+++ b/org/out_sqlite.org
@@ -2054,7 +2054,7 @@ string _insert_doc_objects_row = format(q"┃
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_src_pod.org b/org/out_src_pod.org
index f96cda9..f1c6ff1 100644
--- a/org/out_src_pod.org
+++ b/org/out_src_pod.org
@@ -495,7 +495,7 @@ if (exists(fn_pod)) {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_xmls.org b/org/out_xmls.org
index 41175be..e3ae216 100644
--- a/org/out_xmls.org
+++ b/org/out_xmls.org
@@ -3283,7 +3283,7 @@ zip -0 file.epub mimetype && zip -r -9 file.epub META-INF OEBPS
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_xmls_css.org b/org/out_xmls_css.org
index c5e39f0..e42faf0 100644
--- a/org/out_xmls_css.org
+++ b/org/out_xmls_css.org
@@ -2468,7 +2468,7 @@ Consider what if anything should be used here
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/out_zip.org b/org/out_zip.org
index 36c217e..c84e59e 100644
--- a/org/out_zip.org
+++ b/org/out_zip.org
@@ -90,7 +90,7 @@ template createZipFile() {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/output_hub.org b/org/output_hub.org
index 3957e6e..d66956a 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -340,7 +340,7 @@ if ((opt_action.cgi_search_form_codegen)) {
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/output_show.org b/org/output_show.org
index e8bb130..f99f169 100644
--- a/org/output_show.org
+++ b/org/output_show.org
@@ -605,7 +605,7 @@ char_repeat_number = (char_repeat_number > min_repeat_number)
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/spine.org b/org/spine.org
index 2696511..d9db466 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -1,5 +1,5 @@
 -*- mode: org -*-
-#+TITLE:       spine (doc_reform) hub
+#+TITLE:       spine ≅ (doc-reform) hub
 #+DESCRIPTION: documents - structuring, various output representations & search
 #+FILETAGS:    :spine:hub:
 #+AUTHOR:      Ralph Amissah
@@ -44,7 +44,7 @@
 module doc_reform.sisu_document_parser;
 /++
 name        "spine"
-description "A SiSU inspired document parser writen in D."
+description "A SiSU inspired document parser written in D."
 homepage    "https://sisudoc.org"
 +/
 <<imports_spine>>
@@ -55,17 +55,17 @@ string project_name = "spine";
 string program_name = "spine";
 @system void main(string[] args) {
   <<spine_mixin>>
-  <<spine_init_0>>
-  <<spine_init_1>>
-  <<spine_init_2>>
-  <<spine_args_0_args_init_opts>>
-  <<spine_args_0_args_init_settings>>
-  <<spine_args_1_args_get_options_aa>>
-  <<spine_args_2_args_get_options_aa2str>>
-  <<spine_args_3_program_info>>
-  <<spine_args_4_get_configuration_details>>
-  <<spine_args_5_call_output_hub>>
-  <<spine_args_6_process_args>>
+  <<spine_init_curate_metadata>>
+  <<spine_init_few>>
+  <<spine_init_scope>>
+  <<spine_args_init_opts>>
+  <<spine_args_init_settings>>
+  <<spine_args_get_options_aa>>
+  <<spine_args_get_options_aa2str>>
+  <<spine_args_program_info>>
+  <<spine_args_get_configuration_details>>
+  <<spine_args_call_output_hub>>
+  <<spine_args_process_args>>
   if (_manifests.length > 1                            // _manifests[0] initialized dummy element
   && _opt_action.abstraction) {
     if (_opt_action.parallelise) {                     // see else
@@ -74,12 +74,7 @@ string program_name = "spine";
         if (!empty(manifest.src.filename)) {
           <<spine_each_file_do_scope>>
           <<spine_each_file_do_abstraction>>
-          <<spine_each_file_do_debugs_checkdoc_0>>
-          <<spine_each_file_do_debugs_checkdoc_1>>
-          <<spine_each_file_do_debugs_checkdoc_2>>
-          <<spine_each_file_do_debugs_checkdoc_3>>
-          <<spine_each_file_do_debugs_checkdoc_4>>
-          <<spine_each_file_do_debugs_checkdoc_5>>
+          <<spine_each_file_do_show>>
           <<spine_each_file_do_selected_output>>
           <<spine_each_file_do_scope_exit>>
         } else {
@@ -94,12 +89,7 @@ string program_name = "spine";
         if (!empty(manifest.src.filename)) {
           <<spine_each_file_do_scope>>
           <<spine_each_file_do_abstraction>>
-          <<spine_each_file_do_debugs_checkdoc_0>>
-          <<spine_each_file_do_debugs_checkdoc_1>>
-          <<spine_each_file_do_debugs_checkdoc_2>>
-          <<spine_each_file_do_debugs_checkdoc_3>>
-          <<spine_each_file_do_debugs_checkdoc_4>>
-          <<spine_each_file_do_debugs_checkdoc_5>>
+          <<spine_each_file_do_show>>
           <<spine_each_file_do_selected_output>>
           <<spine_each_file_do_scope_exit>>
         } else {
@@ -175,7 +165,7 @@ string program_name = "spine";
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
@@ -292,14 +282,14 @@ mixin outputHub;
 
 **** init :init:
 
-#+NAME: spine_init_0
+#+NAME: spine_init_curate_metadata
 #+BEGIN_SRC d
 auto hvst = spineCurateMetadata!();
 #+END_SRC
 
 **** args :args:
 
-#+NAME: spine_init_1
+#+NAME: spine_init_few
 #+BEGIN_SRC d
 string flag_action;
 string arg_unrecognized;
@@ -309,7 +299,7 @@ static auto rgx = RgxI();
 
 *** scope (run complete) :scope:
 
-#+NAME: spine_init_2
+#+NAME: spine_init_scope
 #+BEGIN_SRC d
 scope(success) {
   writefln(
@@ -335,7 +325,7 @@ scope(failure) {
 
 ***** initialize opts
 
-#+NAME: spine_args_0_args_init_opts
+#+NAME: spine_args_init_opts
 #+BEGIN_SRC d
 bool[string] opts = [
   "abstraction"                 : false,
@@ -347,11 +337,11 @@ bool[string] opts = [
   "debug"                       : false,
   "digest"                      : false,
   "epub"                        : false,
-  "curate"                     : false,
-  "curate-authors"             : false,
-  "curate-topics"              : false,
+  "curate"                      : false,
+  "curate-authors"              : false,
+  "curate-topics"               : false,
   "html"                        : false,
-  "html-link-curate"           : false,
+  "html-link-curate"            : false,
   "html-link-search"            : false,
   "html-seg"                    : false,
   "html-scroll"                 : false,
@@ -403,9 +393,27 @@ bool[string] opts = [
 
 ***** initialize settings
 
-see also: config_d_cfte.org
-
-#+NAME: spine_args_0_args_init_settings
+NOTES on configuration hierarchy:
+- compile time program defaults views/configuration.txt in config_d_cfte.org
+  - config_d_cfte.org (writes views/configuration.txt)
+    - compile time program defaults, set in views/configuration.txt
+    - found in: _cfg.*
+- run time default configuration administrators config ".dr/config_site_local"
+  - in_source_files.org readConfigSite (reads administrators site defaults from
+    yaml config file)
+  - meta_conf_make_meta.org struct ConfCompositeSiteLocal
+    - administrator site defaults read from yaml configuration file
+      ".dr/config_site_local"
+    - found in: "doc_matters.conf_make_meta.conf." (incorporates _cfg.* as
+      initial default values that are overridden if set)
+    - ("conf_make_meta.make" (& "conf_make_meta.meta") also available taken from
+      document headers)
+- command line execution configuration instruction
+  - spine.org (org heading: initialize settings) (command line overrides)
+    - command line settings/overrides
+    - found in: doc_matters.opt.action.*
+
+#+NAME: spine_args_init_settings
 #+BEGIN_SRC d
 string[string] settings = [
   "output"                      : "",    //_cfg.www_doc_root,          // "/srv/www/spine/static" or "/var/www/html"
@@ -413,6 +421,8 @@ string[string] settings = [
   "www-host"                    : "",    //_cfg.www_host,              // start with "localhost" ?
   "www-host-doc-root"           : "",    //_cfg.www_host_doc_root,     // start with "localhost" ?
   "www-url-doc-root"            : "",    //_cfg.www_url_doc_root,      // start with "http://localhost" ?
+  "cgi-http"                    : "",    //_cfg.cgi_http,              // suggest
+  "cgi-host"                    : "",    //_cfg.cgi_host,              // suggest
   "cgi-bin-root"                : "",    //_cfg.cgi_bin_root,          // suggest "/var/www/cgi/cgi-bin"
   "cgi-sqlite-search-filename"  : "",    //_cfg.cgi_filename,          // suggest "spine_search" (though "spine-search" would have been preferable?)
   "cgi-url-root"                : "",    //_cfg.cgi_url_root,          // start with "http://localhost/cgi-bin" ?
@@ -430,7 +440,7 @@ string[string] settings = [
 
 ***** set & describe
 
-#+NAME: spine_args_1_args_get_options_aa
+#+NAME: spine_args_get_options_aa
 #+BEGIN_SRC d
 auto helpInfo = getopt(args,
   std.getopt.config.passThrough,
@@ -524,7 +534,7 @@ if (helpInfo.helpWanted) {
 **** getopt hash to struct
 - move getopt options to struct
 
-#+NAME: spine_args_2_args_get_options_aa2str
+#+NAME: spine_args_get_options_aa2str
 #+BEGIN_SRC d
 enum outTask { source_or_pod, sqlite, sqlite_multi, latex, odt, epub, html_scroll, html_seg, html_stuff }
 struct OptActions {
@@ -752,7 +762,7 @@ struct OptActions {
     return settings["www-host-doc-root"];
   }
   @trusted string  webserver_url_doc_root() {
-    return settings["www-url-root"];
+    return settings["www-url-doc-root"];
   }
   @trusted string  webserver_http() {
     return settings["www-http"];
@@ -879,7 +889,7 @@ OptActions _opt_action = OptActions();
 **** env
 - environmental info
 
-#+NAME: spine_args_3_program_info
+#+NAME: spine_args_program_info
 #+BEGIN_SRC d
 @safe auto program_info() {
   struct ProgramInfo {
@@ -911,12 +921,12 @@ auto _env = [
 
 *** get/read site config
 
-#+NAME: spine_args_4_get_configuration_details
+#+NAME: spine_args_get_configuration_details
 #+BEGIN_SRC d
 auto _manifested = PathMatters!()(_opt_action, _env, "");
 auto _manifests = [ _manifested ];
 auto _conf_file_details = configFilePaths!()(_manifested, _env, _opt_action.config_path_set);
-ConfComposite _config;
+ConfComposite _siteConfig;
 if (
   _opt_action.require_processing_files
   && _opt_action.config_path_set.empty
@@ -928,7 +938,7 @@ if (
         _conf_file_details = configFilePaths!()(_manifested, _env, _opt_action.config_path_set);
         auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg);
         import doc_reform.meta.conf_make_meta_yaml;
-        _config = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_config, _manifested, _opt_action); // - get local site config
+        _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action); // - get local site config
         break;
       }
     }
@@ -936,17 +946,17 @@ if (
 } else { /+ local site config +/
   auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg);
   import doc_reform.meta.conf_make_meta_yaml;
-  _config = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_config, _manifested, _opt_action); // - get local site config
+  _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action); // - get local site config
 }
 if (_opt_action.show_config) {
   import doc_reform.meta.metadoc_show_config;
-  spineShowSiteConfig!()(_opt_action, _config);
+  spineShowSiteConfig!()(_opt_action, _siteConfig);
 }
 #+END_SRC
 
 *** use config for operations that do not require file processing
 
-#+NAME: spine_args_5_call_output_hub
+#+NAME: spine_args_call_output_hub
 #+BEGIN_SRC d
 if (!(_opt_action.skip_output)) {
   if ((_opt_action.debug_do)
@@ -954,7 +964,7 @@ if (!(_opt_action.skip_output)) {
   ) {
     writeln("step0 commence → (without processing files)");
   }
-  outputHubOp!()(_env, _opt_action, _config);
+  outputHubOp!()(_env, _opt_action, _siteConfig);
   if ((_opt_action.debug_do)
   || (_opt_action.very_verbose)
   ) {
@@ -965,10 +975,10 @@ if (!(_opt_action.skip_output)) {
 
 *** opt action on processing files (loop args)
 
-#+NAME: spine_args_6_process_args
+#+NAME: spine_args_process_args
 #+BEGIN_SRC d
-ConfComposite _make_and_meta_struct = _config;
-destroy(_config);
+ConfComposite _make_and_meta_struct = _siteConfig;
+destroy(_siteConfig);
 foreach(arg; args[1..$]) {
   if (arg.match(rgx.flag_action)) { /+ cli instruction, flag do +/
     flag_action ~= " " ~ arg;   // flags not taken by getopt
@@ -1200,6 +1210,17 @@ if ((doc_matters.opt.action.debug_do)
 *** 2. _output processing_ (post abstraction processing)
 **** 0. abstraction
 ***** show document summary - abstraction _print summary_ (to screen) :abstraction:summary:
+
+#+NAME: spine_each_file_do_show
+#+BEGIN_SRC d
+<<spine_each_file_do_debugs_checkdoc_0>>
+<<spine_each_file_do_debugs_checkdoc_1>>
+<<spine_each_file_do_debugs_checkdoc_2>>
+<<spine_each_file_do_debugs_checkdoc_3>>
+<<spine_each_file_do_debugs_checkdoc_4>>
+<<spine_each_file_do_debugs_checkdoc_5>>
+#+END_SRC
+
 --show-summary (abstraction summary)
 
 #+NAME: spine_each_file_do_debugs_checkdoc_0
diff --git a/org/spine_info.org b/org/spine_info.org
index 4babdca..a23f110 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -54,7 +54,7 @@ project_name:  Spine, Doc Reform
 
     license:   "AGPL 3 or later"
 
-    hompage: [
+    homepage: [
         "https://www.doc_reform.org",
         "https://www.sisudoc.org"
       ]
@@ -415,7 +415,7 @@ project_name:  Spine, Doc Reform
 
     license:   "AGPL 3 or later"
 
-    hompage: [
+    homepage: [
         "https://www.doc_reform.org",
         "https://www.sisudoc.org"
       ]
@@ -4661,13 +4661,13 @@ matches are found.
     - docReform object numbering (based on SiSU object citation numbering)
       - standard SiSU document object numbering
 
-  - Hompages:
+  - Homepages:
     [https://www.sisudoc.org]
 
 #+END_SRC
 
 #+BEGIN_SRC txt
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
@@ -4706,7 +4706,7 @@ matches are found.
         Boost Software License 1.0
         [https://www.boost.org/LICENSE_1_0.txt]
 
-    - Hompages:
+    - Homepages:
       [https://github.com/dlang-community/d2sqlite3]
       [https://code.dlang.org/packages/d2sqlite3]
 
@@ -4724,7 +4724,7 @@ matches are found.
         Boost Software License 1.0
         [https://www.boost.org/LICENSE_1_0.txt]
 
-    - Hompages:
+    - Homepages:
       [https://github.com/dlang-community/D-YAML]
       [https://code.dlang.org/packages/dyaml]
 
@@ -4741,7 +4741,7 @@ matches are found.
         Boost Software License 1.0
         [https://www.boost.org/LICENSE_1_0.txt]
 
-    - Hompages:
+    - Homepages:
       [https://github.com/lgvz/imageformats]
       [https://code.dlang.org/packages/imageformats]
 
@@ -4759,7 +4759,7 @@ matches are found.
         Boost Software License 1.0
         [https://www.boost.org/LICENSE_1_0.txt]
 
-    - Hompages:
+    - Homepages:
       [https://github.com/dlang-community/tinyendian]
       [https://code.dlang.org/packages/tinyendian]
 
@@ -4779,7 +4779,7 @@ matches are found.
       [https://www.boost.org/LICENSE_1_0.txt]
       (Check the bottom of the file for details)
 
-  - Hompages:
+  - Homepages:
     [https://github.com/adamdruppe/arsd]
 
 
@@ -4794,7 +4794,7 @@ matches are found.
   - code: mkDub.nix (modified as needed)
     - License: MIT License
 
-  - Hompages:
+  - Homepages:
     [https://github.com/lionello/dub2nix]
 
 #+END_SRC
diff --git a/org/util_cgi_d_sqlite_search.org b/org/util_cgi_d_sqlite_search.org
index 892da06..84d1b1e 100644
--- a/org/util_cgi_d_sqlite_search.org
+++ b/org/util_cgi_d_sqlite_search.org
@@ -118,7 +118,7 @@ mixin GenericMain!cgi_function_intro;
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
diff --git a/org/util_cgi_rb_fcgi_sqlite_search.org b/org/util_cgi_rb_fcgi_sqlite_search.org
index 5e1d058..a11c9dc 100644
--- a/org/util_cgi_rb_fcgi_sqlite_search.org
+++ b/org/util_cgi_rb_fcgi_sqlite_search.org
@@ -83,7 +83,7 @@ document home currently at /var/www/html (better placed at /var/www or srv/proje
    * Standard SiSU meta-markup syntax, and the
    * Standard SiSU object citation numbering and system
 
- * Hompages:
+ * Homepages:
    <https://www.sisudoc.org>
 
  * Ralph Amissah
author	Ralph Amissah <ralph.amissah@gmail.com>	2021-10-05 12:39:53 -0400
committer	Ralph Amissah <ralph.amissah@gmail.com>	2021-11-27 19:40:42 -0500
commit	02718313824caa0e87eb0f1448684ff8d2dbe4d1 (patch)
tree	cb916873c46c57d18643d26fb6731f5258824a0f /org
parent	nix related config, direnv else minor (diff)