aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/output_xmls.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/output_xmls.org')
-rw-r--r--org/output_xmls.org58
1 files changed, 29 insertions, 29 deletions
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 1333969..62c838f 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -324,9 +324,9 @@ auto html_head(Dm)(
</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")
@@ -393,12 +393,12 @@ auto epub3_seg_head(Dm)(
<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;
@@ -1900,19 +1900,19 @@ string epub3_oebps_content(D,I,P)(D doc_abstraction, I doc_matters, P parts) {
<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,
@@ -1988,7 +1988,7 @@ string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
<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]) {
@@ -2087,14 +2087,14 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
<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]) {