aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sdp/output_html.d
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-04-20 13:57:03 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commit9cf470e69b2d579701ee607f796de612dc600565 (patch)
treeff16c8b547767e4b441655df39511c1757f819c3 /src/sdp/output_html.d
parentsection keys sequence (diff)
0.14.0 reorganized files, and paths
Diffstat (limited to 'src/sdp/output_html.d')
-rw-r--r--src/sdp/output_html.d24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/sdp/output_html.d b/src/sdp/output_html.d
index 431b81c..d5b1a22 100644
--- a/src/sdp/output_html.d
+++ b/src/sdp/output_html.d
@@ -25,7 +25,8 @@ template outputHTML() {
create_zip_file,
defaults,
output_rgx,
- output_xhtmls;
+ output_xhtmls,
+ paths_output;
mixin outputXHTMLs;
void scroll(D,I)(
@@ -167,18 +168,20 @@ template outputHTML() {
}
}
doc = xhtml_format.scroll_head(doc_matters.dochead_meta) ~ doc_html ~ xhtml_format.tail;
- scroll_write_output(doc_matters.source_filename, doc);
+ scroll_write_output(doc_matters, doc);
}
- void scroll_write_output(Fn,C)(
- Fn fn_src,
+ void scroll_write_output(M,C)(
+ M doc_matters,
C doc,
) {
debug(asserts) {
- static assert(is(typeof(fn_src) == string));
static assert(is(typeof(doc) == string[]));
}
- mixin SiSUpaths;
- auto pth_html = HtmlPaths();
+ string fn_src = doc_matters.source_filename;
+ auto src_path_info = doc_matters.src_path_info;
+ string fn_rel_pth = doc_matters.source_filename;
+ string lng = doc_matters.language;
+ auto pth_html = SiSUpathsHTML!()(src_path_info, lng);
try {
if (!exists(pth_html.base)) {
pth_html.base.mkdirRecurse;
@@ -240,6 +243,7 @@ template outputHTML() {
segment_filename = obj.segment_anchor_tag;
doc_html[segment_filename] ~= xhtml_format.seg_head(doc_matters.dochead_meta);
foreach (top_level_heading; top_level_headings) {
+ // writeln(top_level_heading);
doc_html[segment_filename] ~= top_level_heading;
}
auto t = xhtml_format.heading_seg(obj, suffix);
@@ -413,8 +417,10 @@ template outputHTML() {
}
mixin SiSUoutputRgxInit;
auto rgx = Rgx();
- mixin SiSUpaths;
- auto pth_html = HtmlPaths();
+ auto src_path_info = doc_matters.src_path_info;
+ string fn_rel_pth = doc_matters.source_filename;
+ string lng = doc_matters.language;
+ auto pth_html = SiSUpathsHTML!()(src_path_info, lng);
auto xhtml_format = outputXHTMLs();
auto m = doc_matters.source_filename.matchFirst(rgx.src_fn);
try {