From 495dcb42fbd8429d1d7261b3efb418fd8978bf2e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Sun, 13 Jan 2019 14:00:06 -0500
Subject: 0.4.2 xmls output, internal

---
 src/doc_reform/output/epub3.d | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d
index 4d86036..026a2b5 100644
--- a/src/doc_reform/output/epub3.d
+++ b/src/doc_reform/output/epub3.d
@@ -32,7 +32,7 @@ template outputEPub3() {
   string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
     auto xhtml_format = outputXHTMLs();
     auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
-    string uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters!
+    string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters!
     string content = format(q"¶  <?xml version='1.0' encoding='utf-8'?>
   <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID">
     <metadata
@@ -61,7 +61,7 @@ template outputEPub3() {
       <!-- nav epub3 navigation -->
         <item id="nav" href="toc_nav.xhtml" media-type="application/xhtml+xml" properties="nav" />
   ¶",
-      uuid,
+      _uuid,
       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)
@@ -75,9 +75,9 @@ template outputEPub3() {
         ? "" : 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,
+      _uuid,
+      _uuid,
+      _uuid,
       (pth_epub3.fn_oebps_css(doc_matters.src.filename)).chompPrefix("OEBPS/"),
     );
     content ~= "    " ~ "<!-- Content Documents -->" ~ "\n  ";
@@ -208,7 +208,7 @@ template outputEPub3() {
   }
   string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
     int counter = 0;
-    string uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO shared elsewhere
+    string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO shared elsewhere
     auto markup = InlineMarkup();
     auto rgx = Rgx();
     enum DomTags { none, open, close, close_and_open, open_still, }
@@ -235,7 +235,7 @@ template outputEPub3() {
       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
+      _uuid,                                                                // uuid
       "3",                                                                 // content depth
       doc_matters.conf_make_meta.meta.title_full,                          // title
       (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
@@ -309,7 +309,7 @@ template outputEPub3() {
     string[] doc_parts_;
     foreach (part; doc_matters.xml.keys_seq.seg) {
       foreach (obj; doc_abstraction[part]) {
-        string _txt = xhtml_format.special_characters(obj, obj.text);
+        string _txt = xhtml_format.special_characters(obj);
         if (obj.metainfo.is_a == "heading") {
           assert(part == "head" || "toc" || "body" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb" || "tail");
           switch (obj.metainfo.heading_lev_markup) {
@@ -449,10 +449,10 @@ template outputEPub3() {
                 doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "code":
-                doc_epub3[segment_filename] ~= xhtml_format.code(doc_matters, obj, _txt);
+                doc_epub3[segment_filename] ~= xhtml_format.code(obj, _txt);
                 break;
               case "table":
-                doc_epub3[segment_filename] ~= xhtml_format.table(doc_matters, obj, _txt);
+                doc_epub3[segment_filename] ~= xhtml_format.table(obj, _txt);
                 doc_epub3_endnotes[segment_filename] ~= "";
                 break;
               default:
-- 
cgit v1.2.3