aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org/default_misc.org3
-rw-r--r--org/doc_reform.org2
-rw-r--r--org/output_harvest_metadata.org33
-rwxr-xr-xsrc/doc_reform/doc_reform.d2
-rw-r--r--src/doc_reform/meta/defaults.d3
-rw-r--r--src/doc_reform/meta/metadoc.d2
-rw-r--r--src/doc_reform/meta/metadoc_harvest.d30
-rw-r--r--src/doc_reform/meta/metadoc_harvests_authors.d3
8 files changed, 45 insertions, 33 deletions
diff --git a/org/default_misc.org b/org/default_misc.org
index 8233191..1c68a8d 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -152,6 +152,9 @@ template DocReformHarvest() {
string path_html_segtoc = "";
string path_html_scroll = "";
string path_epub = "";
+ string path_abs_html_segtoc = "";
+ string path_abs_html_scroll = "";
+ string path_abs_epub = "";
string url_html_seg = "";
string url_html_scroll = "";
string url_epub = "";
diff --git a/org/doc_reform.org b/org/doc_reform.org
index 7a85e20..0db3aa1 100644
--- a/org/doc_reform.org
+++ b/org/doc_reform.org
@@ -211,10 +211,10 @@ import
std.process;
import
doc_reform.meta,
+ doc_reform.meta.metadoc_harvest,
doc_reform.meta.metadoc_harvests_authors,
doc_reform.meta.metadoc_harvests_topics,
doc_reform.meta.metadoc_summary,
- doc_reform.meta.metadoc_harvest,
doc_reform.meta.metadoc_from_src,
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_toml,
diff --git a/org/output_harvest_metadata.org b/org/output_harvest_metadata.org
index 1b57082..199a504 100644
--- a/org/output_harvest_metadata.org
+++ b/org/output_harvest_metadata.org
@@ -232,20 +232,22 @@ writefln(
#+name: meta_metadoc_harvest
#+BEGIN_SRC d
import doc_reform.output.paths_output;
-auto pth_html_abs = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
-auto pth_html_rel = DocReformDocRootTreeHTML!()(doc_matters.src.language);
-hvst.harvest.title = doc_matters.conf_make_meta.meta.title_full;
-hvst.harvest.author = doc_matters.conf_make_meta.meta.creator_author;
-hvst.harvest.author_surname = doc_matters.conf_make_meta.meta.creator_author_surname;
-hvst.harvest.author_surname_fn = doc_matters.conf_make_meta.meta.creator_author_surname_fn;
-hvst.harvest.author_arr = doc_matters.conf_make_meta.meta.creator_author_arr;
-hvst.harvest.language_original = doc_matters.conf_make_meta.meta.original_language;
-hvst.harvest.language = doc_matters.src.language;
-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_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");
+auto pth_html_abs = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+auto pth_html_rel = DocReformDocRootTreeHTML!()(doc_matters.src.language);
+hvst.harvest.title = doc_matters.conf_make_meta.meta.title_full;
+hvst.harvest.author = doc_matters.conf_make_meta.meta.creator_author;
+hvst.harvest.author_surname = doc_matters.conf_make_meta.meta.creator_author_surname;
+hvst.harvest.author_surname_fn = doc_matters.conf_make_meta.meta.creator_author_surname_fn;
+hvst.harvest.author_arr = doc_matters.conf_make_meta.meta.creator_author_arr;
+hvst.harvest.language_original = doc_matters.conf_make_meta.meta.original_language;
+hvst.harvest.language = doc_matters.src.language;
+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_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);
+hvst.harvest.path_abs_html_segtoc = pth_html_abs.fn_seg(doc_matters.src.filename, "toc");
return hvst.harvest;
#+END_SRC
@@ -683,12 +685,13 @@ template DocReformMetaDocHarvestsAuthors() {
doc_harvest.language,
);
}
- _author_date_title ~= format(q"┃%s %s "%s" [%s]┃",
+ _author_date_title ~= format(q"┃%s %s "%s" [%s]%s┃",
doc_harvest.author_surname_fn,
(doc_harvest.date_published.length > 0)
? "(" ~ doc_harvest.date_published ~ ")" : "",
doc_harvest.title,
doc_harvest.language,
+ (_opt_action.very_verbose) ? "\n " ~ doc_harvest.path_abs_html_scroll : "",
);
}
foreach (k; _au.keys.sort) {
diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/doc_reform.d
index 4c7f0bc..6ca50ea 100755
--- a/src/doc_reform/doc_reform.d
+++ b/src/doc_reform/doc_reform.d
@@ -62,10 +62,10 @@ import
std.process;
import
doc_reform.meta,
+ doc_reform.meta.metadoc_harvest,
doc_reform.meta.metadoc_harvests_authors,
doc_reform.meta.metadoc_harvests_topics,
doc_reform.meta.metadoc_summary,
- doc_reform.meta.metadoc_harvest,
doc_reform.meta.metadoc_from_src,
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_toml,
diff --git a/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d
index ace121b..6c01139 100644
--- a/src/doc_reform/meta/defaults.d
+++ b/src/doc_reform/meta/defaults.d
@@ -104,6 +104,9 @@ template DocReformHarvest() {
string path_html_segtoc = "";
string path_html_scroll = "";
string path_epub = "";
+ string path_abs_html_segtoc = "";
+ string path_abs_html_scroll = "";
+ string path_abs_epub = "";
string url_html_seg = "";
string url_html_scroll = "";
string url_epub = "";
diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d
index 88c4a2b..20dc7ec 100644
--- a/src/doc_reform/meta/metadoc.d
+++ b/src/doc_reform/meta/metadoc.d
@@ -8,10 +8,10 @@ template DocReformAbstraction() {
std.process;
import
doc_reform.meta,
+ doc_reform.meta.metadoc_harvest,
doc_reform.meta.metadoc_harvests_authors,
doc_reform.meta.metadoc_harvests_topics,
doc_reform.meta.metadoc_summary,
- doc_reform.meta.metadoc_harvest,
doc_reform.meta.metadoc_from_src,
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_toml,
diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_harvest.d
index 83c6d35..2e6c426 100644
--- a/src/doc_reform/meta/metadoc_harvest.d
+++ b/src/doc_reform/meta/metadoc_harvest.d
@@ -21,20 +21,22 @@ template DocReformMetaDocHarvest() {
mixin InternalMarkup;
auto markup = InlineMarkup();
import doc_reform.output.paths_output;
- auto pth_html_abs = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
- auto pth_html_rel = DocReformDocRootTreeHTML!()(doc_matters.src.language);
- hvst.harvest.title = doc_matters.conf_make_meta.meta.title_full;
- hvst.harvest.author = doc_matters.conf_make_meta.meta.creator_author;
- hvst.harvest.author_surname = doc_matters.conf_make_meta.meta.creator_author_surname;
- hvst.harvest.author_surname_fn = doc_matters.conf_make_meta.meta.creator_author_surname_fn;
- hvst.harvest.author_arr = doc_matters.conf_make_meta.meta.creator_author_arr;
- hvst.harvest.language_original = doc_matters.conf_make_meta.meta.original_language;
- hvst.harvest.language = doc_matters.src.language;
- 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_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");
+ auto pth_html_abs = DocReformPathsHTML!()(doc_matters.output_path, doc_matters.src.language);
+ auto pth_html_rel = DocReformDocRootTreeHTML!()(doc_matters.src.language);
+ hvst.harvest.title = doc_matters.conf_make_meta.meta.title_full;
+ hvst.harvest.author = doc_matters.conf_make_meta.meta.creator_author;
+ hvst.harvest.author_surname = doc_matters.conf_make_meta.meta.creator_author_surname;
+ hvst.harvest.author_surname_fn = doc_matters.conf_make_meta.meta.creator_author_surname_fn;
+ hvst.harvest.author_arr = doc_matters.conf_make_meta.meta.creator_author_arr;
+ hvst.harvest.language_original = doc_matters.conf_make_meta.meta.original_language;
+ hvst.harvest.language = doc_matters.src.language;
+ 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_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);
+ hvst.harvest.path_abs_html_segtoc = pth_html_abs.fn_seg(doc_matters.src.filename, "toc");
return hvst.harvest;
}
}
diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_harvests_authors.d
index 510d375..1645d9b 100644
--- a/src/doc_reform/meta/metadoc_harvests_authors.d
+++ b/src/doc_reform/meta/metadoc_harvests_authors.d
@@ -285,12 +285,13 @@ string theme_light_1 = format(q"┃
doc_harvest.language,
);
}
- _author_date_title ~= format(q"┃%s %s "%s" [%s]┃",
+ _author_date_title ~= format(q"┃%s %s "%s" [%s]%s┃",
doc_harvest.author_surname_fn,
(doc_harvest.date_published.length > 0)
? "(" ~ doc_harvest.date_published ~ ")" : "",
doc_harvest.title,
doc_harvest.language,
+ (_opt_action.very_verbose) ? "\n " ~ doc_harvest.path_abs_html_scroll : "",
);
}
foreach (k; _au.keys.sort) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 11:58:09 +0000