trust more, else minor

3 files changed, 106 insertions, 92 deletions

diff --git a/org/out_sqlite.org b/org/out_sqlite.org
index b5c2532..77172e2 100644
--- a/org/out_sqlite.org
+++ b/org/out_sqlite.org
@@ -147,10 +147,6 @@ template SQLiteDbRun() {
         db_statement ~
         "\nCOMMIT;\n"
       );
-      if (!(opt_action.sqlite_discrete)
-        && !(opt_action.sqlite_db_create)
-      ) {
-      }
     } catch (ErrnoException ex) {
       writeln("ERROR SQLite : ", ex);
     } catch (Exception ex) {
@@ -363,8 +359,8 @@ template SQLiteDbDrop() {
 #+NAME: sqlite_db_statement_composite_collection
 #+BEGIN_SRC d
 {
-  string _db_statement;
   {
+    string _db_statement;
     if ((doc_matters.opt.action.sqlite_db_create)) {
       auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
       pth_sqlite.base.mkdirRecurse;
@@ -394,8 +390,8 @@ template SQLiteDbDrop() {
 #+NAME: sqlite_db_statement_composite_discrete
 #+BEGIN_SRC d
 {
-  string _db_statement;
   {
+    string _db_statement;
     _db_statement ~= SQLiteTablesReCreate!()();
     _db_statement ~= SQLiteInsertMetadata!()(doc_matters);
     _db_statement ~= doc_abstraction.SQLiteInsertDocObjectsLoop!()(doc_matters);
@@ -1059,7 +1055,7 @@ string html_table(M,O)(
   _txt = t[0];
   string _note = t[1];
   string o = format(q"┃<p class="%s">
-    <table summary="normal text css" width="95%%" border="0" bgcolor="white" cellpadding="2" align="center">
+    <table summary="normal text css" width="95%%" border="0" cellpadding="2" align="center">
       %s
     </table>
     %s
@@ -1105,7 +1101,7 @@ string sqlite_statement(O)(
         string     _html,
 ) {
   void _sql_exe(O)(
-    string                   _sql,
+    string _sql,
   ) {
     writeln(_html);
     writeln(_sql);
@@ -1716,16 +1712,16 @@ CREATE TABLE doc_objects (
 
 #+NAME: sqlite_statement_create_index
 #+BEGIN_SRC sql
-CREATE INDEX idx_ocn ON doc_objects(ocn);
+CREATE INDEX idx_ocn          ON doc_objects(ocn);
 CREATE INDEX idx_digest_clean ON doc_objects(digest_clean);
-CREATE INDEX idx_digest_all ON doc_objects(digest_all);
-CREATE INDEX idx_clean ON doc_objects(clean);
-CREATE INDEX idx_title ON metadata_and_text(title);
-CREATE INDEX idx_author ON metadata_and_text(creator_author_last_first);
-CREATE INDEX idx_uid ON metadata_and_text(uid);
-CREATE INDEX idx_filename ON metadata_and_text(src_filename_base);
-CREATE INDEX idx_language ON metadata_and_text(language_document_char);
-CREATE INDEX idx_topics ON metadata_and_text(classify_topic_register);
+CREATE INDEX idx_digest_all   ON doc_objects(digest_all);
+CREATE INDEX idx_clean        ON doc_objects(clean);
+CREATE INDEX idx_title        ON metadata_and_text(title);
+CREATE INDEX idx_author       ON metadata_and_text(creator_author_last_first);
+CREATE INDEX idx_uid          ON metadata_and_text(uid);
+CREATE INDEX idx_filename     ON metadata_and_text(src_filename_base);
+CREATE INDEX idx_language     ON metadata_and_text(language_document_char);
+CREATE INDEX idx_topics       ON metadata_and_text(classify_topic_register);
 #+END_SRC
 
 *** TODO local site link & info
diff --git a/org/out_xmls.org b/org/out_xmls.org
index acd2b79..0211cd5 100644
--- a/org/out_xmls.org
+++ b/org/out_xmls.org
@@ -1154,7 +1154,9 @@ import
   </p>
 </div>┃",
       obj.metainfo.identifier,
-      (doc_matters.opt.action.ocn_off) ? "" : ((obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier),
+      (doc_matters.opt.action.ocn_off) ? ""
+      : ((obj.metainfo.object_number.empty) ? ""
+        : obj.metainfo.identifier),
       obj.metainfo.is_a,
       obj.metainfo.identifier,
       _txt
@@ -1235,7 +1237,9 @@ import
   <p class="%s" id="%s">%s</p>
 </div>┃",
       obj.metainfo.identifier,
-      (doc_matters.opt.action.ocn_off) ? "" : ((obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier),
+      (doc_matters.opt.action.ocn_off) ? ""
+      : ((obj.metainfo.object_number.empty) ? ""
+        : obj.metainfo.identifier),
       obj.metainfo.is_a,
       obj.metainfo.identifier,
       _txt.stripRight
@@ -1504,7 +1508,7 @@ align="left|right|center"
   o = format(q"┃  <div class="substance">
   <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
   <p class="%s" id="%s">%s
-    <table summary="normal text css" width="95%%" border="0" bgcolor="white" cellpadding="2" align="center">
+    <table summary="normal text css" width="95%%" border="0" cellpadding="2" align="center">
       %s
     </table>
     %s
diff --git a/org/spine.org b/org/spine.org
index 8341b67..f6dd0b2 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -115,7 +115,9 @@ string program_name = "spine";
       }
     } else {                                           // note cannot parallelise sqlite shared db
       foreach(manifest; _manifests[1..$]) {
-        writeln("parallelisation off: actions include sqlite shared db");
+        if (_opt_action.very_verbose) {
+          writeln("parallelisation off: actions include sqlite shared db");
+        }
         if (!empty(manifest.src.filename)) {
           <<spine_each_file_do_scope>>
           <<spine_each_file_do_abstraction>>
@@ -347,77 +349,84 @@ scope(failure) {
 *** getopt args for loop                                        :args:getopt:
 **** set getopt options
 - set getopt options
+***** initialize
 
 #+NAME: spine_args
 #+BEGIN_SRC d
 bool[string] opts = [
-  "abstraction"             : false,
-  "assertions"              : false,
-  "cgi-search-form-codegen" : false,
-  "concordance"             : false,
-  "dark"                    : false,
-  "debug"                   : false,
-  "digest"                  : false,
-  "epub"                    : false,
-  "harvest"                 : false,
-  "harvest-authors"         : false,
-  "harvest-topics"          : false,
-  "html"                    : false,
-  "html-link-harvest"       : false,
-  "html-link-search"        : false,
-  "html-seg"                : false,
-  "html-scroll"             : false,
-  "latex"                   : false,
-  "latex-color-links"       : false,
-  "light"                   : false,
-  "manifest"                : false,
-  "hide-ocn"                : false,
-  "ocn-off"                 : false,
-  "odf"                     : false,
-  "odt"                     : false,
-  "parallel"                : false,
-  "parallel-subprocesses"   : false,
-  "pdf"                     : false,
-  "pdf-color-links"         : false,
-  "quiet"                   : false,
-  "pod"                     : false,
-  "serial"                  : false,
-  "show-summary"            : false,
-  "show-metadata"           : false,
-  "show-make"               : false,
-  "show-config"             : false,
-  "source"                  : false,
-  "sqlite-discrete"         : false,
-  "sqlite-db-create"        : false,
-  "sqlite-db-drop"          : false,
-  "sqlite-db-recreate"      : false,
-  "sqlite-delete"           : false,
-  "sqlite-insert"           : false,
-  "sqlite-update"           : false,
-  "text"                    : false,
-  "verbose"                 : false,
-  "very-verbose"            : false,
-  "xhtml"                   : false,
-  "section_toc"             : true,
-  "section_body"            : true,
-  "section_endnotes"        : true,
-  "section_glossary"        : true,
-  "section_biblio"          : true,
-  "section_bookindex"       : true,
-  "section_blurb"           : true,
-  "backmatter"              : true,
-  "skip-output"             : false,
-  "theme-dark"              : false,
-  "theme-light"             : false,
-  "workon"                  : false,
+  "abstraction"                 : false,
+  "assertions"                  : false,
+  "cgi-search-form-codegen"     : false,
+  "concordance"                 : false,
+  "dark"                        : false,
+  "debug"                       : false,
+  "digest"                      : false,
+  "epub"                        : false,
+  "harvest"                     : false,
+  "harvest-authors"             : false,
+  "harvest-topics"              : false,
+  "html"                        : false,
+  "html-link-harvest"           : false,
+  "html-link-search"            : false,
+  "html-seg"                    : false,
+  "html-scroll"                 : false,
+  "latex"                       : false,
+  "latex-color-links"           : false,
+  "light"                       : false,
+  "manifest"                    : false,
+  "hide-ocn"                    : false,
+  "ocn-off"                     : false,
+  "odf"                         : false,
+  "odt"                         : false,
+  "parallel"                    : false,
+  "parallel-subprocesses"       : false,
+  "pdf"                         : false,
+  "pdf-color-links"             : false,
+  "quiet"                       : false,
+  "pod"                         : false,
+  "serial"                      : false,
+  "show-summary"                : false,
+  "show-metadata"               : false,
+  "show-make"                   : false,
+  "show-config"                 : false,
+  "source"                      : false,
+  "sqlite-discrete"             : false,
+  "sqlite-db-create"            : false,
+  "sqlite-db-drop"              : false,
+  "sqlite-db-recreate"          : false,
+  "sqlite-delete"               : false,
+  "sqlite-insert"               : false,
+  "sqlite-update"               : false,
+  "text"                        : false,
+  "verbose"                     : false,
+  "very-verbose"                : false,
+  "xhtml"                       : false,
+  "section_toc"                 : true,
+  "section_body"                : true,
+  "section_endnotes"            : true,
+  "section_glossary"            : true,
+  "section_biblio"              : true,
+  "section_bookindex"           : true,
+  "section_blurb"               : true,
+  "backmatter"                  : true,
+  "skip-output"                 : false,
+  "theme-dark"                  : false,
+  "theme-light"                 : false,
+  "workon"                      : false,
 ];
 string[string] settings = [
   "cgi-sqlite-search-filename"  : "", // "spine-search"
-  "config"             : "",
-  "output"             : "",
-  "lang"               : "all",
-  "sqlite-db-filename"    : "",          // "spine-search.db"
+  "config"                      : "",
+  "output"                      : "",
+  "lang"                        : "all",
+  "sqlite-db-filename"          : "",          // "spine-search.db"
 ];
+#+END_SRC
+
+***** set & describe
+
+#+NAME: spine_args
+#+BEGIN_SRC d
 auto helpInfo = getopt(args,
   std.getopt.config.passThrough,
   "abstraction",                "document abstraction ",                                          &opts["abstraction"],
@@ -507,7 +516,7 @@ struct OptActions {
   @trusted bool concordance() {
     return opts["concordance"];
   }
-  auto config_path_set() {
+  @trusted string config_path_set() {
     return settings["config"];
   }
   @trusted bool css_theme_default() {
@@ -665,23 +674,29 @@ struct OptActions {
   @trusted bool workon() {
     return opts["workon"];
   }
-  auto languages_set() {
+  @trusted string[] languages_set() {
     return settings["lang"].split(",");
   }
-  auto output_dir_set() {
+  @trusted string output_dir_set() {
     return settings["output"];
   }
-  auto sqlite_filename() {
+  @trusted string sqlite_filename() {
     return settings["sqlite-db-filename"];
   }
-  auto cgi_sqlite_search_filename() {
+  @trusted string cgi_sqlite_search_filename() {
     return settings["cgi-sqlite-search-filename"];
   }
-  auto cgi_sqlite_search_filename_d() {
+  @trusted string cgi_sqlite_search_filename_d() {
     return (settings["cgi-sqlite-search-filename"].length > 0)
     ? (settings["cgi-sqlite-search-filename"].translate(['-' : "_"]) ~ ".d")
     : "";
   }
+  @trusted string latex_papersize() {
+    return settings["set-papersize"];
+  }
+  @trusted string  webserver_domain_name() {
+    return settings["webserv-domain"];
+  }
   @trusted bool parallelise() {
     bool _is;
     if (opts["parallel"] == true) {
@@ -797,7 +812,7 @@ struct OptActions {
     ) ? true : false;
   }
 }
-auto _opt_action = OptActions();
+OptActions _opt_action = OptActions();
 #+END_SRC
 
 **** env
@@ -1270,7 +1285,6 @@ template spineAbstraction() {
     <<spine_each_file_do_document_abstraction>>
     <<spine_each_file_do_document_matters>>
     auto t = tuple(doc_abstraction, doc_matters);
-    static assert(t.length==2);
     return t;
   }
 }