aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sisudoc/outputs/io_out/xmls.d
diff options
context:
space:
mode:
Diffstat (limited to 'src/sisudoc/outputs/io_out/xmls.d')
-rw-r--r--src/sisudoc/outputs/io_out/xmls.d91
1 files changed, 63 insertions, 28 deletions
diff --git a/src/sisudoc/outputs/io_out/xmls.d b/src/sisudoc/outputs/io_out/xmls.d
index 097ce44..c1e733e 100644
--- a/src/sisudoc/outputs/io_out/xmls.d
+++ b/src/sisudoc/outputs/io_out/xmls.d
@@ -205,6 +205,17 @@ template outputXHTMLs() {
.replaceAll(rgx.inline_cite, ("<cite>$1</cite>"));
return _txt;
}
+ /+ ↓ the heading element for a markup level.
+ Markup goes to level 7; HTML stops at h6, and an <h7> is simply
+ not an element, so the deepest three markup levels share h6 and
+ are told apart by the "heading" class and their ocn. Level 0 is
+ the document title, which is h1 in a segment of its own.
+ +/
+ int _heading_element_level(O)(O obj, string _xml_type) {
+ int _lev = obj.metainfo.heading_lev_markup.to!int;
+ if (_xml_type == "epub" && _lev == 0) { return 1; }
+ return (_lev > 6) ? 6 : _lev;
+ }
string _xhtml_anchor_tags(O)(O obj) {
string tags="";
if (obj.tags.anchor_tags.length > 0) {
@@ -495,13 +506,13 @@ string tail(M)(M doc_matters) {
string o;
o = format(q"┃<hr />
<div class="rights">
- <p class="small" id="copyright">
+ <p class="small" id="doc_footer_copyright">
<b>Copyright:</b> %s
</p>
</div>
%s
<div class="rights">
- <p class="small" id="rights">
+ <p class="small" id="doc_footer_rights">
%s
</p>
</div>
@@ -579,7 +590,9 @@ string tail(M)(M doc_matters) {
if (_xml_type == "seg" || _xml_type == "epub") {
seg_lvs = (_xml_type == "epub") ? "seg_lv1to4" : "seg_lv4";
foreach (m; _txt.match(rgx.inline_link_hash)) {
- if (m.captures["hash"] in doc_matters.has.tag_associations) {
+ if ((m.captures["hash"] in doc_matters.has.tag_associations)
+ && (seg_lvs in doc_matters.has.tag_associations[(m.captures["hash"])])
+ ) {
if (
m.captures["hash"]
== doc_matters.has.tag_associations[(m.captures["hash"])][seg_lvs]
@@ -928,15 +941,13 @@ string tail(M)(M doc_matters) {
(doc_matters.opt.action.ocn_off)
? "" : ((obj.metainfo.object_number.empty)
? "" : obj.metainfo.identifier),
- ((_xml_type == "epub" && obj.metainfo.heading_lev_markup == 0) ? 1
- : obj.metainfo.heading_lev_markup),
+ _heading_element_level(obj, _xml_type),
obj.metainfo.is_a,
obj.metainfo.identifier,
tags,
heading_lev_anchor_tag,
_txt,
- ((_xml_type == "epub" && obj.metainfo.heading_lev_markup == 0) ? 1
- : obj.metainfo.heading_lev_markup),
+ _heading_element_level(obj, _xml_type),
);
} else {
o ~= format(q"┃%s
@@ -946,14 +957,12 @@ string tail(M)(M doc_matters) {
</h%s>
</div>┃",
_horizontal_rule,
- ((_xml_type == "epub" && obj.metainfo.heading_lev_markup == 0) ? 1
- : obj.metainfo.heading_lev_markup),
+ _heading_element_level(obj, _xml_type),
obj.metainfo.is_a,
tags,
heading_lev_anchor_tag,
_txt,
- ((_xml_type == "epub" && obj.metainfo.heading_lev_markup == 0) ? 1
- : obj.metainfo.heading_lev_markup),
+ _heading_element_level(obj, _xml_type),
);
}
return o;
@@ -1316,6 +1325,17 @@ string tail(M)(M doc_matters) {
);
return u;
}
+ /+ ↓ column widths as a <colgroup>, not a width attribute on every cell +/
+ string _table_colgroup(O)(const O obj) {
+ if (obj.table.column_widths.length == 0) { return ""; }
+ string _cols;
+ foreach(w; obj.table.column_widths) {
+ _cols ~= (w > 0)
+ ? "<col style=\"width:" ~ w.to!string ~ "%\" />"
+ : "<col />";
+ }
+ return "<colgroup>" ~ _cols ~ "</colgroup>";
+ }
Tuple!(string, string) tablarize(O)(
string _txt,
const O obj,
@@ -1324,27 +1344,42 @@ string tail(M)(M doc_matters) {
string[] _table_cols;
string _table;
string _tablenote;
+ bool _in_head = false;
+ bool _in_body = false;
foreach(row_idx, row; _table_rows) {
_table_cols = row.split(rgx.table_delimiter_col);
+ if ((_table_cols.length == 1)
+ && (_table_rows.length <= row_idx+2)) {
+ _tablenote ~= _table_cols[0];
+ continue;
+ }
+ /+ ↓ a heading row goes in <thead>, the rest in <tbody> +/
+ if (row_idx == 0 && obj.table.heading) {
+ _table ~= "<thead>";
+ _in_head = true;
+ } else if (!_in_body) {
+ if (_in_head) { _table ~= "</thead>"; _in_head = false; }
+ _table ~= "<tbody>";
+ _in_body = true;
+ }
_table ~= "<tr>";
foreach(col_idx, cell; _table_cols) {
- if ((_table_cols.length == 1)
- && (_table_rows.length <= row_idx+2)) {
- _tablenote ~= cell;
- } else {
- string _col_is = (row_idx == 0 && obj.table.heading) ? "th" : "td";
- string _align = ("style=\"text-align:"
- ~ ((obj.table.column_aligns[col_idx] == "l")
- ? "left\"" : "right\""));
- _table ~= "<" ~ _col_is ~ " width=\"" ~ obj.table.column_widths[col_idx].to!string ~ "%\" " ~ _align ~ ">";
- _table ~= cell;
- _table ~= "</" ~ _col_is ~ ">";
- }
+ bool _is_th = (row_idx == 0 && obj.table.heading);
+ string _col_is = _is_th ? "th" : "td";
+ string _class = (col_idx < obj.table.column_aligns.length
+ && obj.table.column_aligns[col_idx] == "l") ? "left" : "right";
+ _table ~= "<" ~ _col_is
+ ~ (_is_th ? " scope=\"col\"" : "")
+ ~ " class=\"" ~ _class ~ "\">";
+ _table ~= cell;
+ _table ~= "</" ~ _col_is ~ ">";
}
_table ~= "</tr>";
}
+ if (_in_head) { _table ~= "</thead>"; }
+ else if (_in_body) { _table ~= "</tbody>"; }
Tuple!(string, string) t = tuple(
- _table,
+ (_table_colgroup(obj) ~ _table),
_tablenote,
);
return t;
@@ -1366,12 +1401,12 @@ string tail(M)(M doc_matters) {
string o;
o = format(q"┃ <div class="substance">
<label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
- <p class="%s" id="%s">%s
- <table summary="normal text css" width="95%%" border="0" cellpadding="2" align="center">
+ <div class="%s" id="%s">%s
+ <table class="table">
%s
</table>
%s
- </p>
+ </div>
</div>┃",
obj.metainfo.object_number,
(doc_matters.opt.action.ocn_off) ? "" : ((obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier),
@@ -1379,7 +1414,7 @@ string tail(M)(M doc_matters) {
obj.metainfo.object_number,
tags,
_txt,
- _note
+ (_note.strip.empty) ? "" : ("<p class=\"tablenote\">" ~ _note.strip ~ "</p>")
);
return o;
}