0.19.0 conf make meta, composite struct, instead of associative array

* remove conf make meta associative arrays,
  including native doc header (which revisit)

3 files changed, 104 insertions, 105 deletions

diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d
index abe8503..7851c09 100644
--- a/src/sdp/output/epub3.d
+++ b/src/sdp/output/epub3.d
@@ -62,19 +62,19 @@ template outputEPub3() {
         <item id="nav" href="toc_nav.xhtml" media-type="application/xhtml+xml" properties="nav" />
   ¶",
       uuid,
-      xhtml_format.special_characters_text(doc_matters.dochead_meta["title"]["full"]),
-      xhtml_format.special_characters_text(doc_matters.dochead_meta["title"]["main"]),
-      (doc_matters.dochead_meta["title"]["sub"].empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.dochead_meta["title"]["sub"]),
-      (doc_matters.dochead_meta["creator"]["author"].empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.dochead_meta["creator"]["author"]),
-      (doc_matters.dochead_meta["creator"]["author"].empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.dochead_meta["creator"]["author"]),
-      doc_matters.language,
-      (doc_matters.dochead_meta["date"]["published"].empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.dochead_meta["date"]["published"]),
-      (doc_matters.dochead_meta["rights"]["copyright"].empty)
-        ? "" : xhtml_format.special_characters_text(doc_matters.dochead_meta["rights"]["copyright"]),
+      xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.title_full),
+      xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.title_main),
+      (doc_matters.conf_make_meta.meta.title_sub.empty)
+        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.title_sub),
+      (doc_matters.conf_make_meta.meta.creator_author.empty)
+        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.creator_author),
+      (doc_matters.conf_make_meta.meta.creator_author.empty)
+        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.creator_author),
+      doc_matters.language,                                   // language, fix (needed in dochead metadata)
+      (doc_matters.conf_make_meta.meta.date_published.empty)
+        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.date_published),
+      (doc_matters.conf_make_meta.meta.rights_copyright.empty)
+        ? "" : xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.rights_copyright),
       uuid,
       uuid,
       uuid,
@@ -142,7 +142,7 @@ template outputEPub3() {
         <h1>Contents</h1>
       </header>
       <nav epub:type=\"toc\" id=\"toc\">\n",
-      doc_matters.dochead_meta["title"]["full"],
+      doc_matters.conf_make_meta.meta.title_full,
     );
     foreach (sect; doc_matters.keys_seq.seg) {
       foreach (obj; doc_abstraction[sect]) {
@@ -232,14 +232,14 @@ template outputEPub3() {
     <text>%s</text>
   </docAuthor>
   <navMap>¶",
-      doc_matters.dochead_meta["title"]["full"],                          // title
-      (doc_matters.dochead_meta["creator"]["author"].empty) ? ""
-        : " by " ~ doc_matters.dochead_meta["creator"]["author"],         // author
+      doc_matters.conf_make_meta.meta.title_full,                          // title
+      (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
+        : " by " ~ doc_matters.conf_make_meta.meta.creator_author,         // author
       uuid,                                                               // uuid
       "3",                                                                // content depth
-      doc_matters.dochead_meta["title"]["full"],                          // title
-      (doc_matters.dochead_meta["creator"]["author"].empty) ? ""
-        : doc_matters.dochead_meta["creator"]["author"],                  // author
+      doc_matters.conf_make_meta.meta.title_full,                          // title
+      (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
+        : doc_matters.conf_make_meta.meta.creator_author,                  // author
     );
     foreach (sect; doc_matters.keys_seq.seg) {
       foreach (obj; doc_abstraction[sect]) {
diff --git a/src/sdp/output/sqlite.d b/src/sdp/output/sqlite.d
index 55d2573..e7ef6bf 100644
--- a/src/sdp/output/sqlite.d
+++ b/src/sdp/output/sqlite.d
@@ -743,82 +743,81 @@ template SQLiteBuildTablesAndPopulate() {
             :links
           )
         ");
-        insert_metadata.bind(":title",                             doc_matters.dochead_meta["title"]["full"]);
-        // insert_metadata.bind(":title_main",                     doc_matters.dochead_meta["title"]["full"]);
-        // insert_metadata.bind(":title_sub",                      doc_matters.dochead_meta["title"][""]);
-        // insert_metadata.bind(":title_short",                    doc_matters.dochead_meta["title"][""]);
-        // insert_metadata.bind(":title_edition",                  doc_matters.dochead_meta["title"][""]);
-        // insert_metadata.bind(":title_note",                     doc_matters.dochead_meta["title"][""]);
-        // insert_metadata.bind(":title_language",                 doc_matters.dochead_meta["title"][""]);
-        // insert_metadata.bind(":title_language_char",            doc_matters.dochead_meta["title"][""]);
-        insert_metadata.bind(":creator_author",                    doc_matters.dochead_meta["creator"]["author"]);
-        // insert_metadata.bind(":creator_author_hon",             doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_author_nationality",     doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_editor",                 doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_contributor",            doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_illustrator",            doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_photographer",           doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_translator",             doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_prepared_by",            doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_digitized_by",           doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_audio",                  doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":creator_video",                  doc_matters.dochead_meta["creator"][""]);
-        // insert_metadata.bind(":language_document",              doc_matters.dochead_meta["language"][""]);
-        // insert_metadata.bind(":language_document_char",         doc_matters.dochead_meta["language"][""]);
-        // insert_metadata.bind(":language_original",              doc_matters.dochead_meta["language"][""]);
-        // insert_metadata.bind(":language_original_char",         doc_matters.dochead_meta["language"][""]);
-        // insert_metadata.bind(":date_added_to_site",             doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_available",                 doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_created",                   doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_issued",                    doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_modified",                  doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_published",                 doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_valid",                     doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_translated",                doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_original_publication",      doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":date_generated",                 doc_matters.dochead_meta["date"][""]);
-        // insert_metadata.bind(":publisher",                      doc_matters.dochead_meta["publisher"][""]);
-        // insert_metadata.bind(":original_publisher",             doc_matters.dochead_meta["original"][""]);
-        // insert_metadata.bind(":original_language",              doc_matters.dochead_meta["original"][""]);
-        // insert_metadata.bind(":original_language_char",         doc_matters.dochead_meta["original"][""]);
-        // insert_metadata.bind(":original_source",                doc_matters.dochead_meta["original"][""]);
-        // insert_metadata.bind(":original_institution",           doc_matters.dochead_meta["original"][""]);
-        // insert_metadata.bind(":original_nationality",           doc_matters.dochead_meta["original"][""]);
-        // insert_metadata.bind(":rights",                         doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_text",          doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_translation",   doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_illustrations", doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_photographs",   doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_preparation",   doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_digitization",  doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_audio",         doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_copyright_video",         doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":rights_license",                 doc_matters.dochead_meta["rights"][""]);
-        // insert_metadata.bind(":identifier_oclc",                doc_matters.dochead_meta["identifier"][""]);
-        // insert_metadata.bind(":identifier_isbn",                doc_matters.dochead_meta["identifier"][""]);
-        // insert_metadata.bind(":classify_topic_register",        doc_matters.dochead_meta["classify"][""]);
-        // insert_metadata.bind(":classify_subject",               doc_matters.dochead_meta["classify"][""]);
-        // insert_metadata.bind(":classify_loc",                   doc_matters.dochead_meta["classify"][""]);
-        // insert_metadata.bind(":classify_loc",                   doc_matters.dochead_meta["classify"][""]);
-        // insert_metadata.bind(":notes_abstract",                 doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_description",              doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_comment",                  doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_coverage",                 doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_relation",                 doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_history",                  doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_type",                     doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_format",                   doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_prefix",                   doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_prefix_a",                 doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_prefix_b",                 doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":notes_suffix",                   doc_matters.dochead_meta["notes"][""]);
-        // insert_metadata.bind(":src_filename",                   doc_matters.dochead_meta["src"][""]);
-        // insert_metadata.bind(":src_fingerprint",                doc_matters.dochead_meta["src"][""]);
-        // insert_metadata.bind(":src_filesize",                   doc_matters.dochead_meta["src"][""]);
-        // insert_metadata.bind(":src_wordcount",                  doc_matters.dochead_meta["src"][""]);
-        // insert_metadata.bind(":src_text",                       doc_matters.dochead_meta["src"][""]);
-        // insert_metadata.bind(":fulltext",                       doc_matters.dochead_meta["fulltext"][""]);
-        // insert_metadata.bind(":links",                          doc_matters.dochead_meta["links"][""]);
+        insert_metadata.bind(":title",                             doc_matters.conf_make_meta.meta.title_full);
+        // insert_metadata.bind(":title_main",                     doc_matters.conf_make_meta.meta.title_main);
+        // insert_metadata.bind(":title_sub",                      doc_matters.conf_make_meta.meta.title_subtitle);
+        // insert_metadata.bind(":title_short",                    doc_matters.conf_make_meta.meta.title_short); //
+        // insert_metadata.bind(":title_edition",                  doc_matters.conf_make_meta.meta.title_edition);
+        // insert_metadata.bind(":title_note",                     doc_matters.conf_make_meta.meta.title_note);
+        // insert_metadata.bind(":title_language",                 doc_matters.conf_make_meta.meta.title_language);
+        // insert_metadata.bind(":title_language_char",            doc_matters.conf_make_meta.meta.title_language_char);
+        insert_metadata.bind(":creator_author",                    doc_matters.conf_make_meta.meta.creator_author);
+        // insert_metadata.bind(":creator_author_hon",             doc_matters.conf_make_meta.meta.creator_author_hon);
+        // insert_metadata.bind(":creator_author_nationality",     doc_matters.conf_make_meta.meta.creator_author_nationality);
+        // insert_metadata.bind(":creator_editor",                 doc_matters.conf_make_meta.meta.creator_editor);
+        // insert_metadata.bind(":creator_contributor",            doc_matters.conf_make_meta.meta.creator_contributor);
+        // insert_metadata.bind(":creator_illustrator",            doc_matters.conf_make_meta.meta.creator_illustrator);
+        // insert_metadata.bind(":creator_photographer",           doc_matters.conf_make_meta.meta.creator_photographer);
+        // insert_metadata.bind(":creator_translator",             doc_matters.conf_make_meta.meta.creator_translator);
+        // insert_metadata.bind(":creator_prepared_by",            doc_matters.conf_make_meta.meta.creator_prepared_by);
+        // insert_metadata.bind(":creator_digitized_by",           doc_matters.conf_make_meta.meta.creator_digitized_by);
+        // insert_metadata.bind(":creator_audio",                  doc_matters.conf_make_meta.meta.creator_audio);
+        // insert_metadata.bind(":creator_video",                  doc_matters.conf_make_meta.meta.creator_video);
+        // insert_metadata.bind(":language_document",              doc_matters.conf_make_meta.meta.language_document);
+        // insert_metadata.bind(":language_document_char",         doc_matters.conf_make_meta.meta.language_document_char);
+        // insert_metadata.bind(":language_original",              doc_matters.conf_make_meta.meta.language_original);
+        // insert_metadata.bind(":language_original_char",         doc_matters.conf_make_meta.meta.language_original_char);
+        // insert_metadata.bind(":date_added_to_site",             doc_matters.conf_make_meta.meta.date_added_to_site);
+        // insert_metadata.bind(":date_available",                 doc_matters.conf_make_meta.meta.date_available);
+        // insert_metadata.bind(":date_created",                   doc_matters.conf_make_meta.meta.date_created);
+        // insert_metadata.bind(":date_issued",                    doc_matters.conf_make_meta.meta.date_issued);
+        // insert_metadata.bind(":date_modified",                  doc_matters.conf_make_meta.meta.date_modified);
+        // insert_metadata.bind(":date_published",                 doc_matters.conf_make_meta.meta.date_published);
+        // insert_metadata.bind(":date_valid",                     doc_matters.conf_make_meta.meta.date_valid);
+        // insert_metadata.bind(":date_translated",                doc_matters.conf_make_meta.meta.date_translated);
+        // insert_metadata.bind(":date_original_publication",      doc_matters.conf_make_meta.meta.date_original_publication);
+        // insert_metadata.bind(":date_generated",                 doc_matters.conf_make_meta.meta.date_generated);
+        // insert_metadata.bind(":publisher",                      doc_matters.conf_make_meta.meta.publisher));
+        // insert_metadata.bind(":original_publisher",             doc_matters.conf_make_meta.meta.original_publisher);
+        // insert_metadata.bind(":original_language",              doc_matters.conf_make_meta.meta.original_language);
+        // insert_metadata.bind(":original_language_char",         doc_matters.conf_make_meta.meta.original_language_char);
+        // insert_metadata.bind(":original_source",                doc_matters.conf_make_meta.meta.original_source);
+        // insert_metadata.bind(":original_institution",           doc_matters.conf_make_meta.meta.original_institution);
+        // insert_metadata.bind(":original_nationality",           doc_matters.conf_make_meta.meta.original_nationality);
+        // insert_metadata.bind(":rights",                         doc_matters.conf_make_meta.meta.rights);
+        // insert_metadata.bind(":rights_copyright_text",          doc_matters.conf_make_meta.meta.rights_copyright_text);
+        // insert_metadata.bind(":rights_copyright_translation",   doc_matters.conf_make_meta.meta.rights_copyright_translation);
+        // insert_metadata.bind(":rights_copyright_illustrations", doc_matters.conf_make_meta.meta.rights_illustrations);
+        // insert_metadata.bind(":rights_copyright_photographs",   doc_matters.conf_make_meta.meta.rights_photographs);
+        // insert_metadata.bind(":rights_copyright_preparation",   doc_matters.conf_make_meta.meta.rights_preparation);
+        // insert_metadata.bind(":rights_copyright_digitization",  doc_matters.conf_make_meta.meta.rights_digitization);
+        // insert_metadata.bind(":rights_copyright_audio",         doc_matters.conf_make_meta.meta.rights_audio);
+        // insert_metadata.bind(":rights_copyright_video",         doc_matters.conf_make_meta.meta.rights_video);
+        // insert_metadata.bind(":rights_license",                 doc_matters.conf_make_meta.meta.rights_license);
+        // insert_metadata.bind(":identifier_oclc",                doc_matters.conf_make_meta.meta.identifier_oclc);
+        // insert_metadata.bind(":identifier_isbn",                doc_matters.conf_make_meta.meta.identifier_isbn);
+        // insert_metadata.bind(":classify_topic_register",        doc_matters.conf_make_meta.meta.classify_topic_register);
+        // insert_metadata.bind(":classify_subject",               doc_matters.conf_make_meta.meta.classify_subject);
+        // insert_metadata.bind(":classify_loc",                   doc_matters.conf_make_meta.meta.classify_loc);
+        // insert_metadata.bind(":notes_abstract",                 doc_matters.conf_make_meta.meta.notes_abstract);
+        // insert_metadata.bind(":notes_description",              doc_matters.conf_make_meta.meta.notes_description);
+        // insert_metadata.bind(":notes_comment",                  doc_matters.conf_make_meta.meta.notes_comment);
+        // insert_metadata.bind(":notes_coverage",                 doc_matters.conf_make_meta.meta.notes_coverage);
+        // insert_metadata.bind(":notes_relation",                 doc_matters.conf_make_meta.meta.notes_relation);
+        // insert_metadata.bind(":notes_history",                  doc_matters.conf_make_meta.meta.notes_history);
+        // insert_metadata.bind(":notes_type",                     doc_matters.conf_make_meta.meta.notes_type);
+        // insert_metadata.bind(":notes_format",                   doc_matters.conf_make_meta.meta.notes_format);
+        // insert_metadata.bind(":notes_prefix",                   doc_matters.conf_make_meta.meta.notes_prefix);
+        // insert_metadata.bind(":notes_prefix_a",                 doc_matters.conf_make_meta.meta.notes_prefix_a);
+        // insert_metadata.bind(":notes_prefix_b",                 doc_matters.conf_make_meta.meta.notes_prefix_b);
+        // insert_metadata.bind(":notes_suffix",                   doc_matters.conf_make_meta.meta.notes_suffix);
+        // insert_metadata.bind(":src_filename",                   doc_matters.conf_make_meta.meta.src_filename);
+        // insert_metadata.bind(":src_fingerprint",                doc_matters.conf_make_meta.meta.src_fingerprint);
+        // insert_metadata.bind(":src_filesize",                   doc_matters.conf_make_meta.meta.src_filesize);
+        // insert_metadata.bind(":src_wordcount",                  doc_matters.conf_make_meta.meta.src_wordcount);
+        // insert_metadata.bind(":src_text",                       doc_matters.conf_make_meta.meta.src_text);
+        // insert_metadata.bind(":fulltext",                       doc_matters.conf_make_meta.meta.fulltext);
+        // insert_metadata.bind(":links",                          doc_matters.conf_make_meta.meta.links);
         insert_metadata.execute(); insert_metadata.reset();
         /+ watch +/
         writeln("sql statement executed");
diff --git a/src/sdp/output/xmls.d b/src/sdp/output/xmls.d
index 6aa80c2..622e599 100644
--- a/src/sdp/output/xmls.d
+++ b/src/sdp/output/xmls.d
@@ -235,9 +235,9 @@ template outputXHTMLs() {
           </a>
         </div>
         %s%s¶",
-        doc_matters.dochead_meta["title"]["full"],
-        (doc_matters.dochead_meta["creator"]["author"].empty) ? ""
-          : ", " ~ doc_matters.dochead_meta["creator"]["author"],
+        doc_matters.conf_make_meta.meta.title_full,
+        (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
+          : ", " ~ doc_matters.conf_make_meta.meta.creator_author,
         header_metadata(doc_matters),
         ((type == "seg") ? "../../../" : "../../") ~ "image/rb7.ico",
         ((type == "seg")
@@ -298,12 +298,12 @@ template outputXHTMLs() {
     <body lang="%s">
     <a name="top" id="top"></a>¶",
         html_simple,
-        doc_matters.dochead_meta["title"]["full"],
-        (doc_matters.dochead_meta["creator"]["author"].empty) ? ""
-          : ", " ~ doc_matters.dochead_meta["creator"]["author"],
-        doc_matters.dochead_meta["title"]["full"],
-        (doc_matters.dochead_meta["creator"]["author"].empty) ? ""
-          : ", " ~ doc_matters.dochead_meta["creator"]["author"],
+        doc_matters.conf_make_meta.meta.title_full,
+        (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
+          : ", " ~ doc_matters.conf_make_meta.meta.creator_author,
+        doc_matters.conf_make_meta.meta.title_full,
+        (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
+          : ", " ~ doc_matters.conf_make_meta.meta.creator_author,
         doc_matters.language,
       );
       return o;