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

---
 org/output_xmls.org | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'org/output_xmls.org')

diff --git a/org/output_xmls.org b/org/output_xmls.org
index 12b37a1..060a75c 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -683,7 +683,7 @@ auto nav_pre_next_svg(M,O)(
   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 {
@@ -1654,7 +1654,7 @@ void seg(D,M)(
           }
           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;
@@ -2077,14 +2077,14 @@ string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
             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
             );
@@ -2136,7 +2136,7 @@ string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
             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 {
@@ -2145,7 +2145,7 @@ string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
               : ("#" ~ 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";
             }
@@ -2155,7 +2155,7 @@ string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
             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 {
@@ -2164,7 +2164,7 @@ string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
               : ("#" ~ 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";
             }
@@ -2247,7 +2247,7 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
     <content src="%s.xhtml%s" />¶",
               counter,
               _txt,
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
               hashtag,
             );
             break;
@@ -2261,7 +2261,7 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
     <content src="%s.xhtml%s" />¶",
               counter,
               _txt,
-              obj.tags.segment_anchor_tag_is,
+              obj.tags.segment_anchor_tag_epub,
               hashtag,
             );
             break;
@@ -2326,16 +2326,16 @@ void outputEPub3(D,I)(
             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];
@@ -2503,41 +2503,41 @@ void outputEPub3(D,I)(
           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,
           );
         }
-- 
cgit v1.2.3