From 0cdf764398b74a47744763e345b6a5a31e7bee69 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 5 Aug 2017 04:13:53 -0400 Subject: m_a, composite object, attributes, rename part & an addition - of_part renamed from use (frontmatter, body, backmatter) - of_section added (toc, body, glossary, bibliography, bookindex, blurb) --- src/sdp/output/epub3.d | 4 ++-- src/sdp/output/html.d | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/sdp/output') diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d index 25f25d5..abe8503 100644 --- a/src/sdp/output/epub3.d +++ b/src/sdp/output/epub3.d @@ -369,7 +369,7 @@ template outputEPub3() { } } else { assert(part == "head" || "toc_seg" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail"); - switch (obj.use) { + switch (obj.of_part) { case "frontmatter": assert(part == "head" || "toc_seg"); switch (obj.is_of) { case "para": @@ -502,7 +502,7 @@ template outputEPub3() { break; default: if ((doc_matters.opt_action["debug"])) { - writeln(__FILE__, ":", __LINE__, ": ", obj.use); + writeln(__FILE__, ":", __LINE__, ": ", obj.of_part); } break; } diff --git a/src/sdp/output/html.d b/src/sdp/output/html.d index 8903e51..b961d4c 100644 --- a/src/sdp/output/html.d +++ b/src/sdp/output/html.d @@ -25,7 +25,7 @@ template outputHTML() { foreach (part; doc_matters.keys_seq.scroll) { foreach (obj; doc_abstraction[part]) { string _txt = xhtml_format.special_characters(obj, obj.text); - switch (obj.use) { + switch (obj.of_part) { case "frontmatter": assert(part == "head" || "toc_scroll"); switch (obj.is_of) { case "para": @@ -144,7 +144,7 @@ template outputHTML() { break; default: if ((doc_matters.opt_action["debug"])) { - writeln(__FILE__, ":", __LINE__, ": ", obj.use); + writeln(__FILE__, ":", __LINE__, ": ", obj.of_part); writeln(__FILE__, ":", __LINE__, ": ", obj.is_a); writeln(__FILE__, ":", __LINE__, ": ", obj.text); } @@ -264,7 +264,7 @@ template outputHTML() { } } else { assert(part == "head" || "toc_seg" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail"); - switch (obj.use) { + switch (obj.of_part) { case "frontmatter": assert(part == "head" || "toc_seg"); switch (obj.is_of) { case "para": @@ -395,7 +395,7 @@ template outputHTML() { break; default: if ((doc_matters.opt_action["debug"])) { - writeln(__FILE__, ":", __LINE__, ": ", obj.use); + writeln(__FILE__, ":", __LINE__, ": ", obj.of_part); } break; } -- cgit v1.2.3