diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2026-09-12 23:21:04 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2026-09-14 12:18:51 -0400 |
| commit | 4041423feda883d6c26ed41d093c5ce5ae9e37c4 (patch) | |
| tree | e0b50b0b4e9e4f858dd18758cf36f2632f547fa6 | |
| parent | epub, html: reference issues fixes (diff) | |
epub, html: correctly identify code block as block
- wrapper set to <div>, with class unchanged, and the six stylesheets
select div.code where they selected p.code.
- invented element <codeline> removed
(assisted by Claude-Code)
| -rw-r--r-- | org/out_xmls.org | 9 | ||||
| -rw-r--r-- | org/out_xmls_css.org | 4 | ||||
| -rw-r--r-- | src/sisudoc/outputs/io_out/xmls.d | 9 | ||||
| -rw-r--r-- | src/sisudoc/outputs/io_out/xmls_css.d | 12 |
4 files changed, 18 insertions, 16 deletions
diff --git a/org/out_xmls.org b/org/out_xmls.org index 786d164..f40a8fe 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -1651,12 +1651,12 @@ string code(O,M)( _codelines = " <pre class=\"codeline\">\n"; foreach (k, _line; _block_lines) { if (k == 1) { - _codelines ~= format(q"┃ <span class="tr first-row"><span class="th"></span><codeline>%s</codeline></span> + _codelines ~= format(q"┃ <span class="tr first-row"><span class="th"></span><code>%s</code></span> ┃", _line, ); } else { - _codelines ~= format(q"┃ <span class="tr"><span class="th"></span><codeline>%s</codeline></span> + _codelines ~= format(q"┃ <span class="tr"><span class="th"></span><code>%s</code></span> ┃", _line, ); @@ -1670,10 +1670,11 @@ string code(O,M)( } return _codelines; } + /+ ↓ a code block is wrapped in a <div>, not a <p> +/ if (!(obj.metainfo.identifier.empty)) { o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" id="%s">%s</p> + <div class="%s" id="%s">%s</div> </div>┃", obj.metainfo.identifier, (doc_matters.opt.action.ocn_off) ? "" : ((obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier), @@ -1683,7 +1684,7 @@ string code(O,M)( ); } else { o = format(q"┃ <div class="substance"> - <p class="%s">%s</p> + <div class="%s">%s</div> </div>┃", obj.metainfo.is_a, codelines(_txt) diff --git a/org/out_xmls_css.org b/org/out_xmls_css.org index 095926a..3ae8e86 100644 --- a/org/out_xmls_css.org +++ b/org/out_xmls_css.org @@ -471,7 +471,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } #+END_SRC @@ -1411,7 +1411,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } #+END_SRC diff --git a/src/sisudoc/outputs/io_out/xmls.d b/src/sisudoc/outputs/io_out/xmls.d index f1bcd95..66f2b1e 100644 --- a/src/sisudoc/outputs/io_out/xmls.d +++ b/src/sisudoc/outputs/io_out/xmls.d @@ -1401,12 +1401,12 @@ string tail(M)(M doc_matters) { _codelines = " <pre class=\"codeline\">\n"; foreach (k, _line; _block_lines) { if (k == 1) { - _codelines ~= format(q"┃ <span class="tr first-row"><span class="th"></span><codeline>%s</codeline></span> + _codelines ~= format(q"┃ <span class="tr first-row"><span class="th"></span><code>%s</code></span> ┃", _line, ); } else { - _codelines ~= format(q"┃ <span class="tr"><span class="th"></span><codeline>%s</codeline></span> + _codelines ~= format(q"┃ <span class="tr"><span class="th"></span><code>%s</code></span> ┃", _line, ); @@ -1420,10 +1420,11 @@ string tail(M)(M doc_matters) { } return _codelines; } + /+ ↓ a code block is wrapped in a <div>, not a <p> +/ if (!(obj.metainfo.identifier.empty)) { o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" id="%s">%s</p> + <div class="%s" id="%s">%s</div> </div>┃", obj.metainfo.identifier, (doc_matters.opt.action.ocn_off) ? "" : ((obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier), @@ -1433,7 +1434,7 @@ string tail(M)(M doc_matters) { ); } else { o = format(q"┃ <div class="substance"> - <p class="%s">%s</p> + <div class="%s">%s</div> </div>┃", obj.metainfo.is_a, codelines(_txt) diff --git a/src/sisudoc/outputs/io_out/xmls_css.d b/src/sisudoc/outputs/io_out/xmls_css.d index 7a13885..ed9f994 100644 --- a/src/sisudoc/outputs/io_out/xmls_css.d +++ b/src/sisudoc/outputs/io_out/xmls_css.d @@ -726,7 +726,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } p.spaced { white-space : pre; } @@ -1523,7 +1523,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } p.spaced { white-space : pre; } @@ -2313,7 +2313,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } p.spaced { white-space : pre; } @@ -3036,7 +3036,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } p.spaced { white-space : pre; } @@ -3752,7 +3752,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } p.spaced { white-space : pre; } @@ -4315,7 +4315,7 @@ pre.codeline span.th { pre.codeline code { display : table-cell; } -p.code { +div.code { border-style : none; } p.spaced { white-space : pre; } |
