diff options
author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-12-01 21:13:38 +0000 |
---|---|---|
committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-12-01 21:13:38 +0000 |
commit | 348459d69f7c0b7cb08547e750431eb0855d29f6 (patch) | |
tree | b60da30821c2fc6c1f7b6ae8f392e65a8620f305 | |
parent | 2cc73e924e5f7dae6a01722851eef37f81cc0139 (diff) | |
download | docutils-348459d69f7c0b7cb08547e750431eb0855d29f6.tar.gz |
HTML5: Use dpub-ARIA role "doc-footnote" for footnotes
(instead of ARIA role "note").
No change with "html4css1".
git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9292 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r-- | docutils/HISTORY.txt | 3 | ||||
-rw-r--r-- | docutils/RELEASE-NOTES.txt | 22 | ||||
-rw-r--r-- | docutils/docutils/writers/_html_base.py | 2 | ||||
-rw-r--r-- | docutils/test/functional/expected/footnotes_html5.html | 24 | ||||
-rw-r--r-- | docutils/test/functional/expected/rst_html5_tuftig.html | 2 | ||||
-rw-r--r-- | docutils/test/functional/expected/standalone_rst_html5.html | 44 | ||||
-rw-r--r-- | docutils/test/test_writers/test_html5_polyglot_parts.py | 8 |
7 files changed, 58 insertions, 47 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index 2c9e0a693..8b9f6929a 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -71,6 +71,9 @@ Changes Since 0.19 - Wrap definition lists with "details" class argument in a <div> with the "id" and "class" values of the list node. + - Use dpub-ARIA role "doc-footnote" (instead of ARIA role "note") + for footnotes. + * docutils/writers/latex2e/__init__.py - Do not insert ``\usepackage[utf8]{inputenc}`` into UTF-8 encoded diff --git a/docutils/RELEASE-NOTES.txt b/docutils/RELEASE-NOTES.txt index 368178926..180395d81 100644 --- a/docutils/RELEASE-NOTES.txt +++ b/docutils/RELEASE-NOTES.txt @@ -24,9 +24,9 @@ Future changes - The ``rst2*.py`` `front end tools`_ will be renamed to ``rst2*`` (dropping the ``.py`` extension). [#]_ - You may use ``docutils`` [#]_ as a future-proof command name, + You may use ``docutils`` [#]_ as a future-proof command name, for example: - + .. code:: diff - rst2latex.py --use-latex-abstract FAQ.txt > FAQ.tex @@ -49,7 +49,7 @@ Future changes * The rst2html_ front end and ``get_writer_by_name('html')`` select "html4css1" now and will select "html5" in Docutils 2.0 and later. - * Use rst2html4_, ``docutils --writer=html4``, or + * Use rst2html4_, ``docutils --writer=html4``, or ``get_writer_by_name('html4')`` if you depend on stability of the generated HTML code, e.g. because you use a custom style sheet or post-processing that may break otherwise. @@ -74,13 +74,11 @@ Future changes * "html5" writer: - Stop setting the "footnote-reference" class value for footnote - references. Since 0.18, you can use the CSS selector + references in Docutils 0.21. + Since 0.18, you can use the CSS selector ``[role="doc-noteref"]`` instead of ``.footnote-reference`` (see minimal.css for examples). - - Use dpub-ARIA role "doc-footnote" (instead of ARIA role "note") - for footnotes in Docutils 0.20. - - Move attribution behind the blockquote to comply with the `"living standard"`__. (HTML5__ allows <cite> elements inside a blockquote.) @@ -149,6 +147,16 @@ Future changes .. _buildhtml.py: docs/user/tools.html#buildhtml-py +Release 0.20 (unpublished) +========================== + +* Output changes: + + HTML5: + Use dpub-ARIA role "doc-footnote" (instead of ARIA role "note") + for footnotes. + + Release 0.19 (2022-07-05) ========================= diff --git a/docutils/docutils/writers/_html_base.py b/docutils/docutils/writers/_html_base.py index ec1f60e77..37772896a 100644 --- a/docutils/docutils/writers/_html_base.py +++ b/docutils/docutils/writers/_html_base.py @@ -961,7 +961,7 @@ class HTMLTranslator(nodes.NodeVisitor): self.body.append(f'<aside class="footnote-list {label_style}">\n') self.body.append(self.starttag(node, 'aside', classes=[node.tagname, label_style], - role="note")) + role="doc-footnote")) def depart_footnote(self, node): self.body.append('</aside>\n') diff --git a/docutils/test/functional/expected/footnotes_html5.html b/docutils/test/functional/expected/footnotes_html5.html index 9165364b9..6729f9a4f 100644 --- a/docutils/test/functional/expected/footnotes_html5.html +++ b/docutils/test/functional/expected/footnotes_html5.html @@ -15,14 +15,14 @@ <p>Paragraphs may contain footnote references (manually numbered<a class="footnote-reference superscript" href="#footnote-1" id="footnote-reference-1" role="doc-noteref"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></a>, anonymous auto-numbered<a class="footnote-reference superscript" href="#footnote-2" id="footnote-reference-2" role="doc-noteref"><span class="fn-bracket">[</span>3<span class="fn-bracket">]</span></a>, labeled auto-numbered<a class="footnote-reference superscript" href="#label" id="footnote-reference-3" role="doc-noteref"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></a>, or symbolic<a class="footnote-reference superscript" href="#footnote-3" id="footnote-reference-4" role="doc-noteref"><span class="fn-bracket">[</span>*<span class="fn-bracket">]</span></a>) or citation references (<a class="citation-reference" href="#cit2002" id="citation-reference-1" role="doc-biblioref">[CIT2002]</a>, <a class="citation-reference" href="#du2015" id="citation-reference-2" role="doc-biblioref">[DU2015]</a>).</p> <aside class="footnote-list superscript"> -<aside class="footnote superscript" id="footnote-1" role="note"> +<aside class="footnote superscript" id="footnote-1" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-1">1</a>,<a role="doc-backlink" href="#footnote-reference-5">2</a>)</span> <p>A footnote contains body elements, consistently indented by at least 3 spaces.</p> <p>This is the footnote's second paragraph.</p> </aside> -<aside class="footnote superscript" id="label" role="note"> +<aside class="footnote superscript" id="label" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-3">1</a>,<a role="doc-backlink" href="#footnote-reference-6">2</a>)</span> <p>Footnotes may be numbered, either manually (as in<a class="footnote-reference superscript" href="#footnote-1" id="footnote-reference-5" role="doc-noteref"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></a>) or @@ -30,23 +30,23 @@ automatically using a "#"-prefixed label. This footnote has a label so it can be referred to from multiple places, both as a footnote reference (<a class="footnote-reference superscript" href="#label" id="footnote-reference-6" role="doc-noteref"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></a>) and as a <a class="reference internal" href="#label">hyperlink reference</a>.</p> </aside> -<aside class="footnote superscript" id="footnote-2" role="note"> +<aside class="footnote superscript" id="footnote-2" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-2">3</a><span class="fn-bracket">]</span></span> <p>This footnote is numbered automatically and anonymously using a label of "#" only.</p> <p>This is the second paragraph.</p> <p>And this is the third paragraph.</p> </aside> -<aside class="footnote superscript" id="footnote-3" role="note"> +<aside class="footnote superscript" id="footnote-3" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-4">*</a><span class="fn-bracket">]</span></span> <p>Footnotes may also use symbols, specified with a "*" label. Here's a reference to the next footnote:<a class="footnote-reference superscript" href="#footnote-4" id="footnote-reference-7" role="doc-noteref"><span class="fn-bracket">[</span>†<span class="fn-bracket">]</span></a>.</p> </aside> -<aside class="footnote superscript" id="footnote-4" role="note"> +<aside class="footnote superscript" id="footnote-4" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-7">†</a><span class="fn-bracket">]</span></span> <p>This footnote shows the next symbol in the sequence.</p> </aside> -<aside class="footnote superscript" id="footnote-5" role="note"> +<aside class="footnote superscript" id="footnote-5" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>4<span class="fn-bracket">]</span></span> <p>Here's an unreferenced footnote, with a reference to a nonexistent footnote:<a class="footnote-reference superscript" href="#footnote-6" id="footnote-reference-8" role="doc-noteref"><span class="fn-bracket">[</span>5<span class="fn-bracket">]</span></a>.</p> @@ -68,7 +68,7 @@ rendered separately and differently from footnotes.</p> </div> <p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="citation-reference-3" role="doc-biblioref">[CIT2002]</a>.</p> <aside class="footnote-list superscript"> -<aside class="footnote superscript" id="footnote-6" role="note"> +<aside class="footnote superscript" id="footnote-6" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-8">5</a><span class="fn-bracket">]</span></span> <p>this footnote is missing in the standard example document.</p> </aside> @@ -76,14 +76,14 @@ rendered separately and differently from footnotes.</p> <p>Footnotes may contain block elements like lists<a class="footnote-reference superscript" href="#footnote-7" id="footnote-reference-9" role="doc-noteref"><span class="fn-bracket">[</span>6<span class="fn-bracket">]</span></a><a class="footnote-reference superscript" href="#list-note" id="footnote-reference-10" role="doc-noteref"><span class="fn-bracket">[</span>7<span class="fn-bracket">]</span></a><a class="footnote-reference superscript" href="#footnote-8" id="footnote-reference-11" role="doc-noteref"><span class="fn-bracket">[</span>8<span class="fn-bracket">]</span></a>, admonitions<a class="footnote-reference superscript" href="#footnote-9" id="footnote-reference-12" role="doc-noteref"><span class="fn-bracket">[</span>9<span class="fn-bracket">]</span></a>, or tables<a class="footnote-reference superscript" href="#footnote-10" id="footnote-reference-13" role="doc-noteref"><span class="fn-bracket">[</span>10<span class="fn-bracket">]</span></a>.</p> <aside class="footnote-list superscript"> -<aside class="footnote superscript" id="footnote-7" role="note"> +<aside class="footnote superscript" id="footnote-7" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-9">6</a><span class="fn-bracket">]</span></span> <ol class="arabic simple"> <li><p>An ordered list</p></li> <li><p>in a footnote.</p></li> </ol> </aside> -<aside class="footnote superscript" id="list-note" role="note"> +<aside class="footnote superscript" id="list-note" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>7<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-10">1</a>,<a role="doc-backlink" href="#footnote-reference-14">2</a>)</span> <ul class="simple"> @@ -92,7 +92,7 @@ admonitions<a class="footnote-reference superscript" href="#footnote-9" id="foot </ul> <p>And a trailing paragraph.</p> </aside> -<aside class="footnote superscript" id="footnote-8" role="note"> +<aside class="footnote superscript" id="footnote-8" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-11">8</a><span class="fn-bracket">]</span></span> <dl class="field-list simple"> <dt>Field<span class="colon">:</span></dt> @@ -103,14 +103,14 @@ admonitions<a class="footnote-reference superscript" href="#footnote-9" id="foot </dd> </dl> </aside> -<aside class="footnote superscript" id="footnote-9" role="note"> +<aside class="footnote superscript" id="footnote-9" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-12">9</a><span class="fn-bracket">]</span></span> <aside class="admonition note"> <p class="admonition-title">Note</p> <p>This is a note in a note.</p> </aside> </aside> -<aside class="footnote superscript" id="footnote-10" role="note"> +<aside class="footnote superscript" id="footnote-10" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-13">10</a><span class="fn-bracket">]</span></span> <table> <tbody> diff --git a/docutils/test/functional/expected/rst_html5_tuftig.html b/docutils/test/functional/expected/rst_html5_tuftig.html index ff609da1b..6b30ce93e 100644 --- a/docutils/test/functional/expected/rst_html5_tuftig.html +++ b/docutils/test/functional/expected/rst_html5_tuftig.html @@ -128,7 +128,7 @@ Leipzig, 1998.</p> </tbody> </table> <aside class="footnote-list superscript"> -<aside class="footnote superscript align-left" id="not-in-margin" role="note"> +<aside class="footnote superscript align-left" id="not-in-margin" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></span> <p>The “align-left” class value ensures this footnote is set in the main text area.</p> diff --git a/docutils/test/functional/expected/standalone_rst_html5.html b/docutils/test/functional/expected/standalone_rst_html5.html index 7495303e5..1670af9fb 100644 --- a/docutils/test/functional/expected/standalone_rst_html5.html +++ b/docutils/test/functional/expected/standalone_rst_html5.html @@ -472,14 +472,14 @@ Python-specific usage examples; begun with ">>>" <section id="footnotes"> <h3><a class="toc-backref" href="#toc-entry-17" role="doc-backlink"><span class="sectnum">2.11 </span>Footnotes</a></h3> <aside class="footnote-list brackets"> -<aside class="footnote brackets" id="footnote-1" role="note"> +<aside class="footnote brackets" id="footnote-1" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-1">1</a>,<a role="doc-backlink" href="#footnote-reference-5">2</a>,<a role="doc-backlink" href="#footnote-reference-9">3</a>)</span> <p>A footnote contains body elements, consistently indented by at least 3 spaces.</p> <p>This is the footnote's second paragraph.</p> </aside> -<aside class="footnote brackets" id="label" role="note"> +<aside class="footnote brackets" id="label" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-3">1</a>,<a role="doc-backlink" href="#footnote-reference-6">2</a>)</span> <p>Footnotes may be numbered, either manually (as in <a class="footnote-reference brackets" href="#footnote-1" id="footnote-reference-5" role="doc-noteref"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></a>) or @@ -487,23 +487,23 @@ automatically using a "#"-prefixed label. This footnote has a label so it can be referred to from multiple places, both as a footnote reference (<a class="footnote-reference brackets" href="#label" id="footnote-reference-6" role="doc-noteref"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></a>) and as a <a class="reference internal" href="#label">hyperlink reference</a>.</p> </aside> -<aside class="footnote brackets" id="footnote-2" role="note"> +<aside class="footnote brackets" id="footnote-2" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-2">3</a><span class="fn-bracket">]</span></span> <p>This footnote is numbered automatically and anonymously using a label of "#" only.</p> <p>This is the second paragraph.</p> <p>And this is the third paragraph.</p> </aside> -<aside class="footnote brackets" id="footnote-3" role="note"> +<aside class="footnote brackets" id="footnote-3" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-4">*</a><span class="fn-bracket">]</span></span> <p>Footnotes may also use symbols, specified with a "*" label. Here's a reference to the next footnote: <a class="footnote-reference brackets" href="#footnote-4" id="footnote-reference-7" role="doc-noteref"><span class="fn-bracket">[</span>†<span class="fn-bracket">]</span></a>.</p> </aside> -<aside class="footnote brackets" id="footnote-4" role="note"> +<aside class="footnote brackets" id="footnote-4" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-7">†</a><span class="fn-bracket">]</span></span> <p>This footnote shows the next symbol in the sequence.</p> </aside> -<aside class="footnote brackets" id="footnote-5" role="note"> +<aside class="footnote brackets" id="footnote-5" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>4<span class="fn-bracket">]</span></span> <p>Here's an unreferenced footnote, with a reference to a nonexistent footnote: <a href="#system-message-2"><span class="problematic" id="footnote-reference-8">[5]_</span></a>.</p> @@ -826,56 +826,56 @@ allowed (e.g. inside a directive).</p> <section id="target-footnotes"> <h4><a class="toc-backref" href="#toc-entry-59" role="doc-backlink"><span class="sectnum">2.14.6 </span>Target Footnotes</a></h4> <aside class="footnote-list brackets"> -<aside class="footnote brackets" id="footnote-7" role="note"> +<aside class="footnote brackets" id="footnote-7" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>7<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-18">1</a>,<a role="doc-backlink" href="#footnote-reference-19">2</a>,<a role="doc-backlink" href="#footnote-reference-20">3</a>,<a role="doc-backlink" href="#footnote-reference-26">4</a>)</span> <p><a class="reference external" href="http://www.python.org/">http://www.python.org/</a></p> </aside> -<aside class="footnote brackets" id="footnote-8" role="note"> +<aside class="footnote brackets" id="footnote-8" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-21">8</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="http://pygments.org/">http://pygments.org/</a></p> </aside> -<aside class="footnote brackets" id="footnote-9" role="note"> +<aside class="footnote brackets" id="footnote-9" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-22">9</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://www.w3.org/TR/html52/interactive-elements.html#the-details-element">https://www.w3.org/TR/html52/interactive-elements.html#the-details-element</a></p> </aside> -<aside class="footnote brackets" id="footnote-10" role="note"> +<aside class="footnote brackets" id="footnote-10" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-23">10</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://docutils.sourceforge.io/docs/user/config.html#table-style">https://docutils.sourceforge.io/docs/user/config.html#table-style</a></p> </aside> -<aside class="footnote brackets" id="footnote-11" role="note"> +<aside class="footnote brackets" id="footnote-11" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-24">11</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="http://tug.ctan.org/tex-archive/macros/latex/contrib/booktabs/booktabs.pdf">http://tug.ctan.org/tex-archive/macros/latex/contrib/booktabs/booktabs.pdf</a></p> </aside> -<aside class="footnote brackets" id="footnote-12" role="note"> +<aside class="footnote brackets" id="footnote-12" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-25">12</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://docutils.sourceforge.io/docs/dev/todo.html#interpreted-text">https://docutils.sourceforge.io/docs/dev/todo.html#interpreted-text</a></p> </aside> -<aside class="footnote brackets" id="footnote-13" role="note"> +<aside class="footnote brackets" id="footnote-13" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-27">13</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://docutils.sourceforge.io/">https://docutils.sourceforge.io/</a></p> </aside> -<aside class="footnote brackets" id="footnote-14" role="note"> +<aside class="footnote brackets" id="footnote-14" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-28">14</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://docutils.sourceforge.io/docs/ref/rst/directives.html">https://docutils.sourceforge.io/docs/ref/rst/directives.html</a></p> </aside> -<aside class="footnote brackets" id="footnote-15" role="note"> +<aside class="footnote brackets" id="footnote-15" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-29">15</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://docutils.sourceforge.io/docs/ref/rst/directives.html#metadata">https://docutils.sourceforge.io/docs/ref/rst/directives.html#metadata</a></p> </aside> -<aside class="footnote brackets" id="footnote-16" role="note"> +<aside class="footnote brackets" id="footnote-16" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-30">16</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Viewport_meta_tag">https://developer.mozilla.org/en-US/docs/Web/HTML/Viewport_meta_tag</a></p> </aside> -<aside class="footnote brackets" id="footnote-17" role="note"> +<aside class="footnote brackets" id="footnote-17" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-31">17</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://stackoverflow.com/questions/39547412/same-font-size-for-h1-and-h2-in-article">https://stackoverflow.com/questions/39547412/same-font-size-for-h1-and-h2-in-article</a></p> </aside> -<aside class="footnote brackets" id="footnote-18" role="note"> +<aside class="footnote brackets" id="footnote-18" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-32">18</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://html.spec.whatwg.org/#text-level-semantics">https://html.spec.whatwg.org/#text-level-semantics</a></p> </aside> -<aside class="footnote brackets" id="footnote-19" role="note"> +<aside class="footnote brackets" id="footnote-19" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-33">19</a><span class="fn-bracket">]</span></span> <p><a class="reference external" href="https://html.spec.whatwg.org/multipage/edits.html">https://html.spec.whatwg.org/multipage/edits.html</a></p> </aside> @@ -1590,7 +1590,7 @@ chemicals.</p> advised to use <abbr> instead. The HTML5 writer uses <abbr> for Docutil's <abbreviation> element.</p> <aside class="footnote-list brackets"> -<aside class="footnote brackets" id="footnote-6" role="note"> +<aside class="footnote brackets" id="footnote-6" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span><a role="doc-backlink" href="#footnote-reference-11">‡</a><span class="fn-bracket">]</span></span> <p>Irish Organic Farmers and Growers Association</p> </aside> @@ -1721,13 +1721,13 @@ a substitution.</p> </dd> </dl> <aside class="footnote-list brackets"> -<aside class="footnote brackets" id="attribute-optional" role="note"> +<aside class="footnote brackets" id="attribute-optional" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>5<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-10">1</a>,<a role="doc-backlink" href="#footnote-reference-14">2</a>,<a role="doc-backlink" href="#footnote-reference-16">3</a>,<a role="doc-backlink" href="#footnote-reference-17">4</a>)</span> <p>Would gain from support for attributes/arguments to inline roles. See <a class="reference external" href="https://docutils.sourceforge.io/docs/dev/todo.html#interpreted-text">TODO</a> <a class="footnote-reference brackets" href="#footnote-12" id="footnote-reference-25" role="doc-noteref"><span class="fn-bracket">[</span>12<span class="fn-bracket">]</span></a></p> </aside> -<aside class="footnote brackets" id="attribute-required" role="note"> +<aside class="footnote brackets" id="attribute-required" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>6<span class="fn-bracket">]</span></span> <span class="backrefs">(<a role="doc-backlink" href="#footnote-reference-12">1</a>,<a role="doc-backlink" href="#footnote-reference-13">2</a>,<a role="doc-backlink" href="#footnote-reference-15">3</a>)</span> <p>Requires support for attributes to inline diff --git a/docutils/test/test_writers/test_html5_polyglot_parts.py b/docutils/test/test_writers/test_html5_polyglot_parts.py index 3f53ff04a..acd959dfb 100644 --- a/docutils/test/test_writers/test_html5_polyglot_parts.py +++ b/docutils/test/test_writers/test_html5_polyglot_parts.py @@ -699,11 +699,11 @@ The latter are referenced a second time [#f2]_ [twice]_. <p>Two footnotes <a class="footnote-reference brackets" href="#f1" id="footnote-reference-1" role="doc-noteref"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></a> <a class="footnote-reference brackets" href="#f2" id="footnote-reference-2" role="doc-noteref"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></a> and two citations <a class="citation-reference" href="#once" id="citation-reference-1" role="doc-biblioref">[once]</a> <a class="citation-reference" href="#twice" id="citation-reference-2" role="doc-biblioref">[twice]</a>.</p> <p>The latter are referenced a second time <a class="footnote-reference brackets" href="#f2" id="footnote-reference-3" role="doc-noteref"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></a> <a class="citation-reference" href="#twice" id="citation-reference-3" role="doc-biblioref">[twice]</a>.</p> <aside class="footnote-list brackets"> -<aside class="footnote brackets" id="f1" role="note"> +<aside class="footnote brackets" id="f1" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></span> <p>referenced once</p> </aside> -<aside class="footnote brackets" id="f2" role="note"> +<aside class="footnote brackets" id="f2" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></span> <p>referenced twice</p> </aside> @@ -723,11 +723,11 @@ The latter are referenced a second time [#f2]_ [twice]_. <p>Two footnotes <a class="footnote-reference brackets" href="#f1" id="footnote-reference-1" role="doc-noteref"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></a> <a class="footnote-reference brackets" href="#f2" id="footnote-reference-2" role="doc-noteref"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></a> and two citations <a class="citation-reference" href="#once" id="citation-reference-1" role="doc-biblioref">[once]</a> <a class="citation-reference" href="#twice" id="citation-reference-2" role="doc-biblioref">[twice]</a>.</p> <p>The latter are referenced a second time <a class="footnote-reference brackets" href="#f2" id="footnote-reference-3" role="doc-noteref"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></a> <a class="citation-reference" href="#twice" id="citation-reference-3" role="doc-biblioref">[twice]</a>.</p> <aside class="footnote-list brackets"> -<aside class="footnote brackets" id="f1" role="note"> +<aside class="footnote brackets" id="f1" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>1<span class="fn-bracket">]</span></span> <p>referenced once</p> </aside> -<aside class="footnote brackets" id="f2" role="note"> +<aside class="footnote brackets" id="f2" role="doc-footnote"> <span class="label"><span class="fn-bracket">[</span>2<span class="fn-bracket">]</span></span> <p>referenced twice</p> </aside> |