present per document metadata

6 files changed, 30 insertions, 14 deletions

diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index 91ecab7..7f220aa 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -206,6 +206,7 @@ struct MetaComposite {
   string   links;
   string   notes_abstract;
   string   notes_description;
+  string   notes_summary;
   string   original_language;
   string   original_language_char;
   string   original_publisher;
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 5576b1c..1467fea 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -679,6 +679,12 @@ static template contentYAMLtoSpineStruct() {
         ) {
           _struct_composite.meta.notes_description = _yaml["notes"]["description"].get!string;
         }
+        if ("summary" in _yaml["notes"]
+          && _yaml["notes"]["summary"].type.string
+          && _yaml["notes"]["summary"].tag.match(rgx.yaml_tag_is_str)
+        ) {
+          _struct_composite.meta.notes_summary = _yaml["notes"]["summary"].get!string;
+        }
       }
     }
     if ("original" in _yaml
diff --git a/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d
index 847dcb9..b3f6bba 100644
--- a/src/doc_reform/meta/defaults.d
+++ b/src/doc_reform/meta/defaults.d
@@ -101,8 +101,9 @@ template spineHarvest() {
         string   uid                  = "";
         string   date_published       = "";
         string[] topic_register_arr   = [];
-        string   path_html_segtoc     = "";
+        string   path_html_metadata   = "";
         string   path_html_scroll     = "";
+        string   path_html_segtoc     = "";
         string   path_epub            = "";
         string   path_abs_html_segtoc = "";
         string   path_abs_html_scroll = "";
diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_harvest.d
index 704e960..362ba34 100644
--- a/src/doc_reform/meta/metadoc_harvest.d
+++ b/src/doc_reform/meta/metadoc_harvest.d
@@ -33,6 +33,7 @@ template spineMetaDocHarvest() {
     hvst.harvest.uid                   = doc_matters.src.doc_uid;
     hvst.harvest.date_published        = doc_matters.conf_make_meta.meta.date_published;
     hvst.harvest.topic_register_arr    = doc_matters.conf_make_meta.meta.classify_topic_register_arr;
+    hvst.harvest.path_html_metadata    = pth_html_rel.fn_metadata(doc_matters.src.filename);
     hvst.harvest.path_html_scroll      = pth_html_rel.fn_scroll(doc_matters.src.filename);
     hvst.harvest.path_html_segtoc      = pth_html_rel.fn_seg(doc_matters.src.filename, "toc");
     hvst.harvest.path_abs_html_scroll  = pth_html_abs.fn_scroll(doc_matters.src.filename);
diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d
index f733a80..19ed583 100644
--- a/src/doc_reform/meta/metadoc_harvests_authors.d
+++ b/src/doc_reform/meta/metadoc_harvests_authors.d
@@ -270,11 +270,9 @@ string theme_light_1 = format(q"┃
 <a name="up" id="up"></a>
 <a name="start" id="start"></a>
 <h1>Metadata Harvest - Authors (output organised by language &amp; filetype)</h1>
-<p>[<a href="../../index.html">&nbsp;HOME&nbsp;</a>] also see <a href="topics.html">Metadata Harvest - Topics</a></p>
+<p>[<a href="../../index.html">&nbsp;HOME&nbsp;</a>] [<a href="topics.html">&nbsp;Metadata&nbsp;Harvest&nbsp;-&nbsp;Topics&nbsp;</a>]</p>
 <p></p>
 <hr />
-<p class="tiny"><a href="../../en/manifest/authors.html">English</a>&nbsp;&nbsp;&nbsp;</p>
-<hr />
 <p><a href="#A">A</a>,&nbsp;<a href="#B">B</a>,&nbsp;<a href="#C">C</a>,&nbsp;<a href="#D">D</a>,&nbsp;<a href="#E">E</a>,&nbsp;<a href="#F">F</a>,&nbsp;<a href="#G">G</a>,&nbsp;<a href="#H">H</a>,&nbsp;<a href="#I">I</a>,&nbsp;<a href="#J">J</a>,&nbsp;<a href="#K">K</a>,&nbsp;<a href="#L">L</a>,&nbsp;<a href="#M">M</a>,&nbsp;<a href="#N">N</a>,&nbsp;<a href="#O">O</a>,&nbsp;<a href="#P">P</a>,&nbsp;<a href="#Q">Q</a>,&nbsp;<a href="#R">R</a>,&nbsp;<a href="#S">S</a>,&nbsp;<a href="#T">T</a>,&nbsp;<a href="#U">U</a>,&nbsp;<a href="#V">V</a>,&nbsp;<a href="#W">W</a>,&nbsp;<a href="#X">X</a>,&nbsp;<a href="#Y">Y</a>,&nbsp;<a href="#Z">Z</a>,&nbsp;
 ┃",
   _opt_action.css_theme_default ? theme_light_0 : theme_dark_0,
@@ -296,31 +294,34 @@ string theme_light_1 = format(q"┃
       ) {
         if (doc_harvest.author_surname_fn != _prev_auth) {
           _au[doc_harvest.author_surname_fn]
-          = format(q"┃<p class="author"><a name="%s" class="lev0">%s</a></p> <p class="publication">%s "<a href="%s">%s</a>" [%s]</p>┃",
+          = format(q"┃<p class="author"><a name="%s" class="lev0">%s</a></p> <p class="publication">%s "<a href="%s">%s</a>" [<a href="%s">&nbsp;%s&nbsp;</a>]</p>┃",
             doc_harvest.author_surname.translate([' ' : "_"]),
             doc_harvest.author_surname_fn,
             (doc_harvest.date_published.length > 0)
               ? doc_harvest.date_published : "",
             doc_harvest.path_html_segtoc,
             doc_harvest.title,
+            doc_harvest.path_html_metadata,
             doc_harvest.language,
           );
           _prev_auth = doc_harvest.author_surname_fn;
         } else {
           _au[doc_harvest.author_surname_fn]
-          ~= format(q"┃<p class="publication">%s "<a href="%s">%s</a>" [%s]</p>┃",
+          ~= format(q"┃<p class="publication">%s "<a href="%s">%s</a>" [<a href="%s">&nbsp;%s&nbsp;</a>]</p>┃",
             (doc_harvest.date_published.length > 0)
               ? doc_harvest.date_published : "",
             doc_harvest.path_html_segtoc,
             doc_harvest.title,
+            doc_harvest.path_html_metadata,
             doc_harvest.language,
           );
         }
-        _author_date_title ~= format(q"┃%s %s "%s" [%s]%s┃",
+        _author_date_title ~= format(q"┃%s %s "%s" [<a href="%s">&nbsp;%s&nbsp;</a>]%s┃",
           doc_harvest.author_surname_fn,
           (doc_harvest.date_published.length > 0)
             ? "(" ~ doc_harvest.date_published ~ ")" : "",
           doc_harvest.title,
+          doc_harvest.path_html_metadata,
           doc_harvest.language,
           (_opt_action.very_verbose) ? "\n  " ~ doc_harvest.path_abs_html_scroll : "",
         );
diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_harvests_topics.d
index 82601fc..5e11b7e 100644
--- a/src/doc_reform/meta/metadoc_harvests_topics.d
+++ b/src/doc_reform/meta/metadoc_harvests_topics.d
@@ -311,12 +311,10 @@ string theme_light_1 = format(q"┃
 <a name="up" id="up"></a>
 <a name="start" id="start"></a>
 <h1>Metadata Harvest - Topics (output organised by language &amp; filetype)</h1>
-<p>[<a href="../../index.html">&nbsp;HOME&nbsp;</a>] also see <a href="authors.html">Metadata Harvest - Authors</a></p>
+<p>[<a href="../../index.html">&nbsp;HOME&nbsp;</a>] [<a href="authors.html">&nbsp;Metadata&nbsp;Harvest&nbsp;-&nbsp;Authors&nbsp;</a>]</p>
 <p><a href="#A">A</a>,&nbsp;<a href="#B">B</a>,&nbsp;<a href="#C">C</a>,&nbsp;<a href="#D">D</a>,&nbsp;<a href="#E">E</a>,&nbsp;<a href="#F">F</a>,&nbsp;<a href="#G">G</a>,&nbsp;<a href="#H">H</a>,&nbsp;<a href="#I">I</a>,&nbsp;<a href="#J">J</a>,&nbsp;<a href="#K">K</a>,&nbsp;<a href="#L">L</a>,&nbsp;<a href="#M">M</a>,&nbsp;<a href="#N">N</a>,&nbsp;<a href="#O">O</a>,&nbsp;<a href="#P">P</a>,&nbsp;<a href="#Q">Q</a>,&nbsp;<a href="#R">R</a>,&nbsp;<a href="#S">S</a>,&nbsp;<a href="#T">T</a>,&nbsp;<a href="#U">U</a>,&nbsp;<a href="#V">V</a>,&nbsp;<a href="#W">W</a>,&nbsp;<a href="#X">X</a>,&nbsp;<a href="#Y">Y</a>,&nbsp;<a href="#Z">Z</a>,&nbsp;
 <p></p>
 <hr />
-<p class="tiny"><a href="../../en/manifest/topics.html">English</a>&nbsp;&nbsp;&nbsp;</p>
-<hr />
 ┃",
   _opt_action.css_theme_default ? theme_light_0 : theme_dark_0,
   _opt_action.css_theme_default ? theme_light_1 : theme_dark_1,
@@ -359,10 +357,12 @@ string theme_light_1 = format(q"┃
                   );
                 }
               }
-              topics ~= format(q"┃<p class="work"><a href="%s">"%s"</a> -%s┃",
+              topics ~= format(q"┃<p class="work"><a href="%s">"%s"</a> - %s [<a href="%s">&nbsp;%s&nbsp;</a>]┃",
                 t_a_.path_html_segtoc,
                 t_a_.title,
                 _auth,
+                t_a_.path_html_metadata,
+                t_a_.language,
               ) ~ "\n";
               if (_opt_action.very_verbose) {
                 writeln("- ", t_a_.title, " - ", t_a_.author);
@@ -399,10 +399,12 @@ string theme_light_1 = format(q"┃
                       );
                     }
                   }
-                  topics ~= format(q"┃<p class="work"><a href="%s">%s</a> -%s┃",
+                  topics ~= format(q"┃<p class="work"><a href="%s">%s</a> - %s [<a href="%s">&nbsp;%s&nbsp;</a>]┃",
                     t_a_.path_html_segtoc,
                     t_a_.title,
                     _auth,
+                    t_a_.path_html_metadata,
+                    t_a_.language,
                   ) ~ "\n";
                   if (_opt_action.very_verbose) {
                     writeln("  - ", t_a_.title, " - ", t_a_.author);
@@ -440,10 +442,12 @@ string theme_light_1 = format(q"┃
                         );
                       }
                     }
-                    topics ~= format(q"┃<p class="work"><a href="%s">%s</a> -%s┃",
+                    topics ~= format(q"┃<p class="work"><a href="%s">%s</a> - %s [<a href="%s">&nbsp;%s&nbsp;</a>]┃",
                       t_a_.path_html_segtoc,
                       t_a_.title,
                       _auth,
+                      t_a_.path_html_metadata,
+                      t_a_.language,
                     ) ~ "\n";
                     if (_opt_action.very_verbose) {
                       writeln("    - ", t_a_.title, " - ", t_a_.author);
@@ -481,10 +485,12 @@ string theme_light_1 = format(q"┃
                           );
                         }
                       }
-                      topics ~= format(q"┃ <p class="work"><a href="%s">%s</a> -%s┃",
+                      topics ~= format(q"┃ <p class="work"><a href="%s">%s</a> - %s [<a href="%s">&nbsp;%s&nbsp;</a>]┃",
                         t_a_.path_html_segtoc,
                         t_a_.title,
                         _auth,
+                        t_a_.path_html_metadata,
+                        t_a_.language,
                       ) ~ "\n";
                       if (_opt_action.very_verbose) {
                         writeln("      - ", t_a_.title, " - ", t_a_.author);