trust more, else minor

1 files changed, 79 insertions, 71 deletions

diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d
index d6a2f07..53a4a5a 100755
--- a/src/doc_reform/spine.d
+++ b/src/doc_reform/spine.d
@@ -112,72 +112,72 @@ string program_name = "spine";
     }
   }
   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"
   ];
   auto helpInfo = getopt(args,
     std.getopt.config.passThrough,
@@ -261,7 +261,7 @@ string program_name = "spine";
     @trusted bool concordance() {
       return opts["concordance"];
     }
-    auto config_path_set() {
+    @trusted string config_path_set() {
       return settings["config"];
     }
     @trusted bool css_theme_default() {
@@ -419,23 +419,29 @@ string program_name = "spine";
     @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) {
@@ -551,7 +557,7 @@ string program_name = "spine";
       ) ? true : false;
     }
   }
-  auto _opt_action = OptActions();
+  OptActions _opt_action = OptActions();
   @safe auto program_info() {
     struct ProgramInfo {
       @safe string project() {
@@ -891,7 +897,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)) {
           scope(success) {
             if (!(_opt_action.quiet)) {