0.7.0 meta_abstruction, doc "has" struct replaces several tuples

1 files changed, 5 insertions, 6 deletions

diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d
index a49bb5d..cdfd2a6 100644
--- a/src/doc_reform/output/epub3.d
+++ b/src/doc_reform/output/epub3.d
@@ -103,7 +103,7 @@ template outputEPub3() {
     content ~= "  " ~ "</guide>"            ~ "\n  ";
     content ~= ""   ~ "</package>";
     debug(epubmanifest) {
-      foreach (part; doc_matters.xml.keys_seq.seg) { // TODO
+      foreach (part; doc_matters.has.keys_seq.seg) { // TODO
         foreach (obj; doc_abstraction[part]) {
           if (obj.metainfo.is_a == "heading") {
             if (obj.metainfo.heading_lev_markup == 4) {
@@ -145,7 +145,7 @@ template outputEPub3() {
       <nav epub:type=\"toc\" id=\"toc\">\n",
       doc_matters.conf_make_meta.meta.title_full,
     );
-    foreach (sect; doc_matters.xml.keys_seq.seg) {
+    foreach (sect; doc_matters.has.keys_seq.seg) {
       foreach (obj; doc_abstraction[sect]) {
         if (obj.metainfo.is_a == "heading") {
           string _txt = obj.text.replaceAll(rgx.inline_notes_al_gen, "").strip;
@@ -242,7 +242,7 @@ template outputEPub3() {
       (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
         : doc_matters.conf_make_meta.meta.creator_author,                  // author
     );
-    foreach (sect; doc_matters.xml.keys_seq.seg) {
+    foreach (sect; doc_matters.has.keys_seq.seg) {
       foreach (obj; doc_abstraction[sect]) {
         if (obj.metainfo.is_a == "heading") {
           string _txt = obj.text.replaceAll(rgx.inline_notes_al_gen, "").strip;
@@ -322,8 +322,7 @@ template outputEPub3() {
       string[] doc_parts;
     }
     auto epubWrite = writeOut();
-    // writeln(doc_matters.xml.keys_seq.seg);
-    foreach (part; doc_matters.xml.keys_seq.seg) {
+    foreach (part; doc_matters.has.keys_seq.seg) {
       foreach (obj; doc_abstraction[part]) {
         string _txt = xhtml_format.special_characters(obj);
         if (obj.metainfo.is_a == "heading") {
@@ -659,7 +658,7 @@ template outputEPub3() {
         }
       }
       { /+ OEBPS/[segments].xhtml (the document contents) +/
-        foreach (seg_filename; doc_matters.xml.segnames_lv_0_to_4) {
+        foreach (seg_filename; doc_matters.has.segnames_lv_0_to_4) {
           string fn = pth_epub3.fn_oebps_content_xhtml(doc_matters.src.filename, seg_filename);
           auto zip_arc_member_file = new ArchiveMember();
           zip_arc_member_file.name = fn;