0.23.2 config paths for pod

1 files changed, 189 insertions, 189 deletions

diff --git a/org/sdp.org b/org/sdp.org
index 4afed8b..13ce647 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -26,7 +26,7 @@ struct Version {
   int minor;
   int patch;
 }
-enum ver = Version(0, 23, 1);
+enum ver = Version(0, 23, 2);
 #+END_SRC
 
 ** compilation restrictions (supported compilers)
@@ -492,7 +492,7 @@ foreach(arg; args[1..$]) {
   _manifest_start = PodManifest!()(arg);
   if (arg.match(rgx.flag_action)) {
     flag_action ~= " " ~ arg;   // flags not taken by getopt
-  } else if (arg.match(rgx.src_pth)) {
+  } else if (arg.match(rgx.src_pth_sst_or_ssm)) {
     _manifests ~= PodMatters!()(_opt_action, _env, arg, arg); // gather input markup source file names for processing
   } else if (_manifest_start.pod_manifest_file_with_path) {
     string contents_location_raw_;
@@ -526,7 +526,7 @@ foreach(arg; args[1..$]) {
       (cast(char[]) contents_location_).split;
     auto tmp_dir_ = (sisudoc_txt_).dirName.array;
     foreach (contents_location; contents_locations_arr) {
-      assert(contents_location.match(rgx.src_pth),
+      assert(contents_location.match(rgx.src_pth_sst_or_ssm),
         "not a recognised file: «" ~
         contents_location ~ "»"
       );
@@ -552,9 +552,9 @@ foreach(arg; args[1..$]) {
 
 #+NAME: sdp_conf_files
 #+BEGIN_SRC d
-auto sdl_root_config_share = configRead!()("config_share", _env);
-auto sdl_root_config_local = configRead!()("config_local", _env);
-auto conf_files_composite_make = confFilesSDLtoStruct!()(sdl_root_config_share, sdl_root_config_local);
+auto sdl_root_config_document = configRead!()(_manifest, _env, "config_document"); // document config file
+auto sdl_root_config_local_site = configRead!()(_manifest, _env, "config_local_site"); // local site config
+auto conf_files_composite_make = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site);
 #+END_SRC
 
 ** 2a. actions independent of processing files
@@ -603,7 +603,7 @@ enforce(
 
 #+NAME: sdp_abstraction
 #+BEGIN_SRC d
-auto t = SiSUabstraction!()(manifest, _opt_action, _env);
+auto t = SiSUabstraction!()(_env, _opt_action, manifest);
 static assert(!isTypeTuple!(t));
 static assert(t.length==2);
 auto doc_abstraction = t[dAM.abstraction];
@@ -680,10 +680,10 @@ template SiSUabstraction() {
   enum makeMeta { make, meta }
   enum docAbst  { doc_abstraction, section_keys, segnames, segnames_0_4, images }
   static auto rgx = Rgx();
-  auto SiSUabstraction(M,O,E)(
-    M _manifest,
-    O _opt_action,
+  auto SiSUabstraction(E,O,M)(
     E _env,
+    O _opt_action,
+    M _manifest,
   ){
     <<sdp_conf_files>>
     <<sdp_each_file_do_read_and_split_sisu_markup_file_content_into_header_and_body>>
@@ -1245,10 +1245,10 @@ provide the result as a single set of make instructions for each document parsed
 |    | set of make instructions        | provided below, provide interface      |                     |   |
 |----+---------------------------------+----------------------------------------+---------------------+---|
 | 1. | document_make file              | to be applied to all documents         | per directory       |   |
-|    | "config_share"                  | (unless subsequently overridden)       | (all docs within)   |   |
+|    | "config_document"               | (unless subsequently overridden)       | (all docs within)   |   |
 |----+---------------------------------+----------------------------------------+---------------------+---|
 | 2. | config file                     | local site specific                    | per directory       |   |
-|    | "config_local"                  |                                        | (all docs within)   |   |
+|    | "config_local_site"             |                                        | (all docs within)   |   |
 |----+---------------------------------+----------------------------------------+---------------------+---|
 | 3. | document header make            | make instructions contained            | per document        |   |
 |    |                                 | in document header                     | (single doc)        |   |
@@ -1259,180 +1259,180 @@ provide the result as a single set of make instructions for each document parsed
 
 *** config & metadata (from instruction sources)
 
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     | 1. document make file | 2. config file          | 3. document header     | 4. command line instruction |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-| comment, fixed:     | per dir (sisupod)     | per dir                 | per document (sisupod) | per command instruction     |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     | sdl_root_config_share | sdl_root_config_local   |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-| local site specific |                       | *                       |                        | *?                          |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | webserv                 |                        |                             |
-|                     |                       | - url_root              |                        |                             |
-|                     |                       | - path                  |                        |                             |
-|                     |                       | - images                |                        |                             |
-|                     |                       | - cgi                   |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | webserv_cgi             |                        |                             |
-|                     |                       | - host                  |                        |                             |
-|                     |                       | - base_path             |                        |                             |
-|                     |                       | - port                  |                        |                             |
-|                     |                       | - user                  |                        |                             |
-|                     |                       | - file_links            |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | processing              |                        |                             |
-|                     |                       | - path                  |                        |                             |
-|                     |                       | - dir                   |                        |                             |
-|                     |                       | - concord_max           |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | flag (configure)        |                        | (call)                      |
-|                     |                       | - act0                  |                        | act0                        |
-|                     |                       | - act1                  |                        | act1                        |
-|                     |                       | - act2                  |                        | act2                        |
-|                     |                       | - act3                  |                        | act3                        |
-|                     |                       | - act4                  |                        | act4                        |
-|                     |                       | - act5                  |                        | act5                        |
-|                     |                       | - act6                  |                        | act6                        |
-|                     |                       | - act7                  |                        | act7                        |
-|                     |                       | - act8                  |                        | act8                        |
-|                     |                       | - act9                  |                        | act9                        |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | default                 |                        |                             |
-|                     |                       | - papersize             |                        |                             |
-|                     |                       | - text_wrap             |                        |                             |
-|                     |                       | - emphasis              |                        |                             |
-|                     |                       | - language              |                        |                             |
-|                     |                       | - digest                |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | permission              |                        |                             |
-|                     |                       | - share_source          |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | program_select          |                        |                             |
-|                     |                       | - editor                |                        |                             |
-|                     |                       | - epub_viewer           |                        |                             |
-|                     |                       | - html_viewer           |                        |                             |
-|                     |                       | - odf_viewer            |                        |                             |
-|                     |                       | - pdf_viewer            |                        |                             |
-|                     |                       | - xml_viewer            |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       | search                  |                        |                             |
-|                     |                       | - flag                  |                        |                             |
-|                     |                       | - action                |                        |                             |
-|                     |                       | - db                    |                        |                             |
-|                     |                       | - title                 |                        |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-| make instruction    | **                    | omit or override share? | **                     | *?                          |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     | make                  | make                    | make                   |                             |
-|                     | - bold                | - bold                  | - bold                 |                             |
-|                     | - breaks              | - breaks                | - breaks               |                             |
-|                     | - cover_image         | - cover_image           | - cover_image          |                             |
-|                     | - css                 | - css                   | - css                  |                             |
-|                     | - emphasis            | - emphasis              | - emphasis             |                             |
-|                     | - footer              | - footer                | - footer               |                             |
-|                     | - headings            | - headings              | - headings             |                             |
-|                     | - home_button_image   | - home_button_image     | - home_button_image    |                             |
-|                     | - home_button_text    | - home_button_text      | - home_button_text     |                             |
-|                     | - italics             | - italics               | - italics              |                             |
-|                     | - num_top             | - num_top               | - num_top              |                             |
-|                     | - num_depth           | - num_depth             | - num_depth            |                             |
-|                     | - substitute          | - substitute            | - substitute           |                             |
-|                     | - texpdf_font         | - texpdf_font           | - texpdf_font          |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-| actions             |                       |                         |                        | *                           |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         |                        | assertions                  |
-|                     |                       |                         |                        | concordance                 |
-|                     |                       |                         |                        | debug                       |
-|                     |                       |                         |                        | digest                      |
-|                     |                       |                         |                        | docbook                     |
-|                     |                       |                         |                        | epub                        |
-|                     |                       |                         |                        | html                        |
-|                     |                       |                         |                        | html-seg                    |
-|                     |                       |                         |                        | html-scroll                 |
-|                     |                       |                         |                        | manifest                    |
-|                     |                       |                         |                        | ocn                         |
-|                     |                       |                         |                        | odt                         |
-|                     |                       |                         |                        | pdf                         |
-|                     |                       |                         |                        | postgresql                  |
-|                     |                       |                         |                        | qrcode                      |
-|                     |                       |                         |                        | sisupod                     |
-|                     |                       |                         |                        | source                      |
-|                     |                       |                         |                        | sqlite                      |
-|                     |                       |                         |                        | sqlite-create               |
-|                     |                       |                         |                        | sqlite-drop                 |
-|                     |                       |                         |                        | text                        |
-|                     |                       |                         |                        | verbose                     |
-|                     |                       |                         |                        | xhtml                       |
-|                     |                       |                         |                        | xml-dom                     |
-|                     |                       |                         |                        | xml-sax                     |
-|                     |                       |                         |                        | section_toc                 |
-|                     |                       |                         |                        | section_body                |
-|                     |                       |                         |                        | section_endnotes            |
-|                     |                       |                         |                        | section_glossary            |
-|                     |                       |                         |                        | section_biblio              |
-|                     |                       |                         |                        | section_bookindex           |
-|                     |                       |                         |                        | section_blurb               |
-|                     |                       |                         |                        | backmatter                  |
-|                     |                       |                         |                        | skip-output                 |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-| metadata            |                       |                         | *                      |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | classify               |                             |
-|                     |                       |                         | - dewey                |                             |
-|                     |                       |                         | - keywords             |                             |
-|                     |                       |                         | - loc                  |                             |
-|                     |                       |                         | - subject              |                             |
-|                     |                       |                         | - topic_register       |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | creator                |                             |
-|                     |                       |                         | - author               |                             |
-|                     |                       |                         | - author_email         |                             |
-|                     |                       |                         | - illustrator          |                             |
-|                     |                       |                         | - translator           |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | date                   |                             |
-|                     |                       |                         | - added_to_site        |                             |
-|                     |                       |                         | - available            |                             |
-|                     |                       |                         | - created              |                             |
-|                     |                       |                         | - issued               |                             |
-|                     |                       |                         | - modified             |                             |
-|                     |                       |                         | - published            |                             |
-|                     |                       |                         | - valid                |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | identifier             |                             |
-|                     |                       |                         | - isbn                 |                             |
-|                     |                       |                         | - oclc                 |                             |
-|                     |                       |                         | - pg                   |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | links                  |                             |
-|                     |                       |                         | - link                 |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | notes                  |                             |
-|                     |                       |                         | - abstract             |                             |
-|                     |                       |                         | - description          |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | original               |                             |
-|                     |                       |                         | - language             |                             |
-|                     |                       |                         | - source               |                             |
-|                     |                       |                         | - title                |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | publisher              |                             |
-|                     |                       |                         | - name                 |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | rights                 |                             |
-|                     |                       |                         | - copyright            |                             |
-|                     |                       |                         | - cover                |                             |
-|                     |                       |                         | - illustrations        |                             |
-|                     |                       |                         | - license              |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
-|                     |                       |                         | title                  |                             |
-|                     |                       |                         | - edition              |                             |
-|                     |                       |                         | - full                 |                             |
-|                     |                       |                         | - language             |                             |
-|                     |                       |                         | - main                 |                             |
-|                     |                       |                         | - note                 |                             |
-|                     |                       |                         | - sub                  |                             |
-|                     |                       |                         | - subtitle             |                             |
-|---------------------+-----------------------+-------------------------+------------------------+-----------------------------|
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     | 1. document make file    | 2. config file             | 3. document header     | 4. command line instruction |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+| comment, fixed:     | per dir (sisupod)        | per dir                    | per document (sisupod) | per command instruction     |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     | sdl_root_config_document | sdl_root_config_local_site |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+| local site specific |                          | *                          |                        | *?                          |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | webserv                    |                        |                             |
+|                     |                          | - url_root                 |                        |                             |
+|                     |                          | - path                     |                        |                             |
+|                     |                          | - images                   |                        |                             |
+|                     |                          | - cgi                      |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | webserv_cgi                |                        |                             |
+|                     |                          | - host                     |                        |                             |
+|                     |                          | - base_path                |                        |                             |
+|                     |                          | - port                     |                        |                             |
+|                     |                          | - user                     |                        |                             |
+|                     |                          | - file_links               |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | processing                 |                        |                             |
+|                     |                          | - path                     |                        |                             |
+|                     |                          | - dir                      |                        |                             |
+|                     |                          | - concord_max              |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | flag (configure)           |                        | (call)                      |
+|                     |                          | - act0                     |                        | act0                        |
+|                     |                          | - act1                     |                        | act1                        |
+|                     |                          | - act2                     |                        | act2                        |
+|                     |                          | - act3                     |                        | act3                        |
+|                     |                          | - act4                     |                        | act4                        |
+|                     |                          | - act5                     |                        | act5                        |
+|                     |                          | - act6                     |                        | act6                        |
+|                     |                          | - act7                     |                        | act7                        |
+|                     |                          | - act8                     |                        | act8                        |
+|                     |                          | - act9                     |                        | act9                        |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | default                    |                        |                             |
+|                     |                          | - papersize                |                        |                             |
+|                     |                          | - text_wrap                |                        |                             |
+|                     |                          | - emphasis                 |                        |                             |
+|                     |                          | - language                 |                        |                             |
+|                     |                          | - digest                   |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | permission                 |                        |                             |
+|                     |                          | - share_source             |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | program_select             |                        |                             |
+|                     |                          | - editor                   |                        |                             |
+|                     |                          | - epub_viewer              |                        |                             |
+|                     |                          | - html_viewer              |                        |                             |
+|                     |                          | - odf_viewer               |                        |                             |
+|                     |                          | - pdf_viewer               |                        |                             |
+|                     |                          | - xml_viewer               |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          | search                     |                        |                             |
+|                     |                          | - flag                     |                        |                             |
+|                     |                          | - action                   |                        |                             |
+|                     |                          | - db                       |                        |                             |
+|                     |                          | - title                    |                        |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+| make instruction    | **                       | omit or override share?    | **                     | *?                          |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     | make                     | make                       | make                   |                             |
+|                     | - bold                   | - bold                     | - bold                 |                             |
+|                     | - breaks                 | - breaks                   | - breaks               |                             |
+|                     | - cover_image            | - cover_image              | - cover_image          |                             |
+|                     | - css                    | - css                      | - css                  |                             |
+|                     | - emphasis               | - emphasis                 | - emphasis             |                             |
+|                     | - footer                 | - footer                   | - footer               |                             |
+|                     | - headings               | - headings                 | - headings             |                             |
+|                     | - home_button_image      | - home_button_image        | - home_button_image    |                             |
+|                     | - home_button_text       | - home_button_text         | - home_button_text     |                             |
+|                     | - italics                | - italics                  | - italics              |                             |
+|                     | - num_top                | - num_top                  | - num_top              |                             |
+|                     | - num_depth              | - num_depth                | - num_depth            |                             |
+|                     | - substitute             | - substitute               | - substitute           |                             |
+|                     | - texpdf_font            | - texpdf_font              | - texpdf_font          |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+| actions             |                          |                            |                        | *                           |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            |                        | assertions                  |
+|                     |                          |                            |                        | concordance                 |
+|                     |                          |                            |                        | debug                       |
+|                     |                          |                            |                        | digest                      |
+|                     |                          |                            |                        | docbook                     |
+|                     |                          |                            |                        | epub                        |
+|                     |                          |                            |                        | html                        |
+|                     |                          |                            |                        | html-seg                    |
+|                     |                          |                            |                        | html-scroll                 |
+|                     |                          |                            |                        | manifest                    |
+|                     |                          |                            |                        | ocn                         |
+|                     |                          |                            |                        | odt                         |
+|                     |                          |                            |                        | pdf                         |
+|                     |                          |                            |                        | postgresql                  |
+|                     |                          |                            |                        | qrcode                      |
+|                     |                          |                            |                        | sisupod                     |
+|                     |                          |                            |                        | source                      |
+|                     |                          |                            |                        | sqlite                      |
+|                     |                          |                            |                        | sqlite-create               |
+|                     |                          |                            |                        | sqlite-drop                 |
+|                     |                          |                            |                        | text                        |
+|                     |                          |                            |                        | verbose                     |
+|                     |                          |                            |                        | xhtml                       |
+|                     |                          |                            |                        | xml-dom                     |
+|                     |                          |                            |                        | xml-sax                     |
+|                     |                          |                            |                        | section_toc                 |
+|                     |                          |                            |                        | section_body                |
+|                     |                          |                            |                        | section_endnotes            |
+|                     |                          |                            |                        | section_glossary            |
+|                     |                          |                            |                        | section_biblio              |
+|                     |                          |                            |                        | section_bookindex           |
+|                     |                          |                            |                        | section_blurb               |
+|                     |                          |                            |                        | backmatter                  |
+|                     |                          |                            |                        | skip-output                 |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+| metadata            |                          |                            | *                      |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | classify               |                             |
+|                     |                          |                            | - dewey                |                             |
+|                     |                          |                            | - keywords             |                             |
+|                     |                          |                            | - loc                  |                             |
+|                     |                          |                            | - subject              |                             |
+|                     |                          |                            | - topic_register       |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | creator                |                             |
+|                     |                          |                            | - author               |                             |
+|                     |                          |                            | - author_email         |                             |
+|                     |                          |                            | - illustrator          |                             |
+|                     |                          |                            | - translator           |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | date                   |                             |
+|                     |                          |                            | - added_to_site        |                             |
+|                     |                          |                            | - available            |                             |
+|                     |                          |                            | - created              |                             |
+|                     |                          |                            | - issued               |                             |
+|                     |                          |                            | - modified             |                             |
+|                     |                          |                            | - published            |                             |
+|                     |                          |                            | - valid                |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | identifier             |                             |
+|                     |                          |                            | - isbn                 |                             |
+|                     |                          |                            | - oclc                 |                             |
+|                     |                          |                            | - pg                   |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | links                  |                             |
+|                     |                          |                            | - link                 |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | notes                  |                             |
+|                     |                          |                            | - abstract             |                             |
+|                     |                          |                            | - description          |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | original               |                             |
+|                     |                          |                            | - language             |                             |
+|                     |                          |                            | - source               |                             |
+|                     |                          |                            | - title                |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | publisher              |                             |
+|                     |                          |                            | - name                 |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | rights                 |                             |
+|                     |                          |                            | - copyright            |                             |
+|                     |                          |                            | - cover                |                             |
+|                     |                          |                            | - illustrations        |                             |
+|                     |                          |                            | - license              |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|
+|                     |                          |                            | title                  |                             |
+|                     |                          |                            | - edition              |                             |
+|                     |                          |                            | - full                 |                             |
+|                     |                          |                            | - language             |                             |
+|                     |                          |                            | - main                 |                             |
+|                     |                          |                            | - note                 |                             |
+|                     |                          |                            | - sub                  |                             |
+|                     |                          |                            | - subtitle             |                             |
+|---------------------+--------------------------+----------------------------+------------------------+-----------------------------|