epub, html: a named anchor, and subtitle fixes

fixes related to:
- named anchor id
- subtitles, emit only where they exist

(assisted by Claude-Code)

2 files changed, 15 insertions, 16 deletions

diff --git a/src/sisudoc/outputs/io_out/epub3.d b/src/sisudoc/outputs/io_out/epub3.d
index b606e7a..b00165d 100644
--- a/src/sisudoc/outputs/io_out/epub3.d
+++ b/src/sisudoc/outputs/io_out/epub3.d
@@ -115,9 +115,7 @@ template outputEPub3() {
       <dc:identifier id="bookid">urn:uuid:%s</dc:identifier>
       <dc:title id="title">%s</dc:title>
       <meta refines="#title" property="title-type">main</meta>
-      <dc:title id="subtitle">%s</dc:title>
-      <meta refines="#subtitle" property="title-type">subtitle</meta>
-      <dc:creator id="aut">%s</dc:creator>
+  %s      <dc:creator id="aut">%s</dc:creator>
       <meta refines="#aut" property="file-as">%s</meta>
       <dc:language>%s</dc:language>
       <dc:date id="published">%s</dc:date>
@@ -130,8 +128,10 @@ template outputEPub3() {
   ┃",
       _uuid,
       xhtml_format.special_characters_plain(doc.matters.conf_make_meta.meta.title_main),
-      (doc.matters.conf_make_meta.meta.title_sub.empty)
-        ? "" : xhtml_format.special_characters_plain(doc.matters.conf_make_meta.meta.title_sub),
+      (doc.matters.conf_make_meta.meta.title_sub.empty) ? "" : format(
+        "      <dc:title id=\"subtitle\">%s</dc:title>\n"
+        ~ "      <meta refines=\"#subtitle\" property=\"title-type\">subtitle</meta>\n",
+        xhtml_format.special_characters_plain(doc.matters.conf_make_meta.meta.title_sub)),
       (doc.matters.conf_make_meta.meta.creator_author.empty)
         ? "" : xhtml_format.special_characters_plain(doc.matters.conf_make_meta.meta.creator_author),
       (doc.matters.conf_make_meta.meta.creator_author_surname_fn.empty)
diff --git a/src/sisudoc/outputs/io_out/xmls.d b/src/sisudoc/outputs/io_out/xmls.d
index 66f2b1e..097ce44 100644
--- a/src/sisudoc/outputs/io_out/xmls.d
+++ b/src/sisudoc/outputs/io_out/xmls.d
@@ -210,7 +210,7 @@ template outputXHTMLs() {
       if (obj.tags.anchor_tags.length > 0) {
         foreach (tag; obj.tags.anchor_tags) {
           if (!(tag.empty)) {
-            tags ~= "<a name=\"" ~ special_characters_text(tag) ~ "\"></a>";
+            tags ~= "<a name=\"" ~ special_characters_text(tag) ~ "\"></a>";   /+ repeated markers, not unique targets: see below +/
           }
         }
       }
@@ -394,7 +394,7 @@ template outputXHTMLs() {
       <link href="%s" rel="stylesheet" />
     </head>
     <body lang="%s">
-    <a name="top" id="top"></a>
+    <a id="top"></a>
     <div class='delimit headband'>
       <div class="flex-menu-bar">
         %s
@@ -464,7 +464,7 @@ template outputXHTMLs() {
       <link rel="stylesheet" href="Styles/epub.css" type="text/css" id="main-css" />
     </head>
     <body lang="%s">
-    <a name="top" id="top"></a>┃",
+    <a id="top"></a>┃",
         html_simple,
         special_characters_plain(doc_matters.conf_make_meta.meta.title_full),
         (doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
@@ -501,7 +501,7 @@ string tail(M)(M doc_matters) {
   </div>
   %s
   <div class="rights">
-    <p class="small" id="rights"><a name="rights"></a>
+    <p class="small" id="rights">
       %s
     </p>
   </div>
@@ -514,8 +514,8 @@ string tail(M)(M doc_matters) {
       (web 1993, object numbering 1997, object search 2002 ...) 2026
     </p>
   </div>
-  <a name="bottom" id="bottom"></a>
-  <a name="end" id="end"></a>
+  <a id="bottom"></a>
+  <a id="end"></a>
 </body>
 </html>
 ┃",
@@ -892,7 +892,7 @@ string tail(M)(M doc_matters) {
       string o;
       heading_lev_anchor_tag = (obj.tags.heading_lev_anchor_tag.empty)
         ? ""
-        : "<a name=\"" ~ obj.tags.heading_lev_anchor_tag ~ "\"></a>";
+        : "<a id=\"" ~ obj.tags.heading_lev_anchor_tag ~ "\"></a>";
       if (_txt.empty) {
         o = format(q"┃%s
       ┃",
@@ -906,7 +906,7 @@ string tail(M)(M doc_matters) {
         <p class="small" id="copyright_toc">
           Copyright: %s
         </p>
-        <!-- <p class="small" id="rights"><a name="rights"></a>
+        <!-- <p class="small" id="rights">
           %s
         </p> -->
       </div>┃",
@@ -919,7 +919,7 @@ string tail(M)(M doc_matters) {
           o ~= format(q"┃%s
       <div class="substance">
         <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
-        <h%s class="%s" id="%s"><a name="%s"></a>%s%s
+        <h%s class="%s" id="%s">%s%s
           %s
         </h%s>
       </div>┃",
@@ -932,7 +932,6 @@ string tail(M)(M doc_matters) {
             : obj.metainfo.heading_lev_markup),
             obj.metainfo.is_a,
             obj.metainfo.identifier,
-            obj.metainfo.identifier,
             tags,
             heading_lev_anchor_tag,
             _txt,
@@ -1000,7 +999,7 @@ string tail(M)(M doc_matters) {
       string o;
       _txt = (obj.attrib.bullet) ? ("●&#160;&#160;" ~ _txt) : _txt;
       _txt = _txt.replaceFirst(rgx.inline_link_anchor,
-         "<a name=\"$1\"></a>");
+         "<a id=\"$1\"></a>");
       if (!(obj.metainfo.identifier.empty)) {
         o = format(q"┃  <div class="substance">
       <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>