From 4c50f7ab56eddd9d85a5a76eba3fbc971d338038 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 22 Oct 2018 17:04:58 -0400
Subject: 0.2.1 segnames, anchor tags

---
 src/doc_reform/output/epub3.d | 46 +++++++++++++++++++++----------------------
 src/doc_reform/output/html.d  |  2 +-
 src/doc_reform/output/xmls.d  |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'src/doc_reform/output')

diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d
index 18d9e03..1bcf13d 100644
--- a/src/doc_reform/output/epub3.d
+++ b/src/doc_reform/output/epub3.d
@@ -109,14 +109,14 @@ template outputEPub3() {
               writefln(
                 "%s~ [%s.xhtml] %s",
                 obj.marked_up_level,
-                obj.tags.segment_anchor_tag,
+                obj.tags.segment_anchor_tag_epub,
                 obj.text
               );
             } else if (obj.metainfo.heading_lev_markup > 4) {
               writefln(
                 "%s~ [%s.xhtml#%s] %s",
                 obj.marked_up_level,
-                obj.tags.segment_anchor_tag,
+                obj.tags.segment_anchor_tag_epub,
                 obj.metainfo.object_number,
                 obj.text
               );
@@ -160,7 +160,7 @@ template outputEPub3() {
               if  (obj.metainfo.heading_lev_markup < 4) {
                 toc ~= markup.indent_by_spaces_provided((n + 1), "  ") ~ "<li>" ~ "\n"
                 ~ markup.indent_by_spaces_provided((n + 2), "  ")
-                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_is ~ ".xhtml" ~ "\">"
+                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_epub ~ ".xhtml" ~ "\">"
                 ~ _txt
                 ~ "</a>" ~ "\n";
               } else {
@@ -169,7 +169,7 @@ template outputEPub3() {
                 : ("#" ~ obj.metainfo.ocn.to!string);
                 toc ~= markup.indent_by_spaces_provided((n + 1), "  ") ~ "<li>" ~ "\n"
                 ~ markup.indent_by_spaces_provided((n + 2), "  ")
-                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_is ~ ".xhtml" ~ hashtag ~ "\">"
+                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_epub ~ ".xhtml" ~ hashtag ~ "\">"
                 ~ _txt
                 ~ "</a>" ~ "\n";
               }
@@ -179,7 +179,7 @@ template outputEPub3() {
               if  (obj.metainfo.heading_lev_markup < 4) {
                 toc ~= markup.indent_by_spaces_provided((n + 1), "  ") ~ "<li>" ~ "\n"
                 ~ markup.indent_by_spaces_provided((n + 2), "  ")
-                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_is ~ ".xhtml" ~ "\">"
+                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_epub ~ ".xhtml" ~ "\">"
                 ~ _txt
                 ~ "</a>" ~ "\n";
               } else {
@@ -188,7 +188,7 @@ template outputEPub3() {
                 : ("#" ~ obj.metainfo.ocn.to!string);
                 toc ~= markup.indent_by_spaces_provided((n + 1), "  ") ~ "<li>" ~ "\n"
                 ~ markup.indent_by_spaces_provided((n + 2), "  ")
-                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_is ~ ".xhtml" ~ hashtag ~ "\">"
+                ~ "<a href=\"" ~ obj.tags.segment_anchor_tag_epub ~ ".xhtml" ~ hashtag ~ "\">"
                 ~ _txt
                 ~ "</a>" ~ "\n";
               }
@@ -262,7 +262,7 @@ template outputEPub3() {
       <content src="%s.xhtml%s" />¶",
                 counter,
                 _txt,
-                obj.tags.segment_anchor_tag_is,
+                obj.tags.segment_anchor_tag_epub,
                 hashtag,
               );
               break;
@@ -276,7 +276,7 @@ template outputEPub3() {
       <content src="%s.xhtml%s" />¶",
                 counter,
                 _txt,
-                obj.tags.segment_anchor_tag_is,
+                obj.tags.segment_anchor_tag_epub,
                 hashtag,
               );
               break;
@@ -335,16 +335,16 @@ template outputEPub3() {
               top_level_headings[3] = "";
               goto default;
             default:
-              doc_parts_ ~= obj.tags.segment_anchor_tag;
-              doc_epub3[obj.tags.segment_anchor_tag] ~= xhtml_format.epub3_seg_head(doc_matters);
+              doc_parts_ ~= obj.tags.segment_anchor_tag_epub;
+              doc_epub3[obj.tags.segment_anchor_tag_epub] ~= xhtml_format.epub3_seg_head(doc_matters);
               auto t = xhtml_format.heading_seg(doc_matters, obj, _txt, suffix, "epub");
-              doc_epub3[obj.tags.segment_anchor_tag] ~= t[0];
-              doc_epub3_endnotes[obj.tags.segment_anchor_tag] ~= t[1];
+              doc_epub3[obj.tags.segment_anchor_tag_epub] ~= t[0];
+              doc_epub3_endnotes[obj.tags.segment_anchor_tag_epub] ~= t[1];
               break;
             }
             break;
           case 4:
-            segment_filename = obj.tags.segment_anchor_tag;
+            segment_filename = obj.tags.segment_anchor_tag_epub;
             doc_epub3[segment_filename] ~= xhtml_format.epub3_seg_head(doc_matters);
             auto t = xhtml_format.heading_seg(doc_matters, obj, _txt, suffix, "epub");
             doc_epub3[segment_filename] ~= t[0];
@@ -512,41 +512,41 @@ template outputEPub3() {
             oepbs_content_parts["manifest_documents"] ~=
               format(q"¶      <item id="%s.xhtml" href="%s.xhtml" media-type="application/xhtml+xml" />
   ¶",
-              obj.tags.segment_anchor_tag_is,
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
+              obj.tags.segment_anchor_tag_epub,
             );
             oepbs_content_parts["spine"] ~=
               format(q"¶    <itemref idref="%s.xhtml" linear="yes" />
   ¶",
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
             );
             oepbs_content_parts["guide"] ~=
               format(q"¶      <reference type="%s" href="%s" />
   ¶",
-              obj.tags.segment_anchor_tag_is,
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
+              obj.tags.segment_anchor_tag_epub,
             );
           } else if (obj.metainfo.heading_lev_markup > 4) {
             oepbs_content_parts["manifest_documents"] ~=
               format(q"¶      <item id="%s.xhtml#%s" href="%s.xhtml#%s" media-type="application/xhtml+xml" />
   ¶",
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
               obj.metainfo.object_number,
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
               obj.metainfo.object_number,
             );
             oepbs_content_parts["spine"] ~=
               format(q"¶    <itemref idref="%s.xhtml#%s" linear="yes" />
   ¶",
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
               obj.metainfo.object_number,
             );
             oepbs_content_parts["guide"] ~=
               format(q"¶      <reference type="%s#%s" href="%s#%s" />
   ¶",
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
               obj.metainfo.object_number,
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
               obj.metainfo.object_number,
             );
           }
diff --git a/src/doc_reform/output/html.d b/src/doc_reform/output/html.d
index bad29db..3424dc9 100644
--- a/src/doc_reform/output/html.d
+++ b/src/doc_reform/output/html.d
@@ -232,7 +232,7 @@ template outputHTML() {
             }
             break;
           case 4:
-            segment_filename = obj.tags.segment_anchor_tag;
+            segment_filename = obj.tags.segment_anchor_tag_epub;
             doc_html[segment_filename] ~= xhtml_format.html_head(doc_matters, "seg");
             auto navigation_bar = xhtml_format.nav_pre_next_svg(doc_matters, obj);
             doc_html[segment_filename] ~= navigation_bar.toc_pre_next;
diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d
index 571c1af..bc93271 100644
--- a/src/doc_reform/output/xmls.d
+++ b/src/doc_reform/output/xmls.d
@@ -529,7 +529,7 @@ template outputXHTMLs() {
       const        O    obj,
     ) {
       string prev, next, toc;
-      if (obj.tags.segment_anchor_tag == "toc") {
+      if (obj.tags.segment_anchor_tag_epub == "toc") {
         toc = "";
         prev = "";
       } else {
-- 
cgit v1.2.3