From 4ff01a81f048c0b496cc03627324b69b7aebd368 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 7 Sep 2017 16:54:23 -0400
Subject: 0.19.0 conf make meta, composite struct, instead of associative array

* remove conf make meta associative arrays,
  including native doc header (which revisit)
---
 src/sdp/output/epub3.d | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/sdp/output/epub3.d')

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]) {
-- 
cgit v1.2.3