Menu
▾
▴
[Docutils-checkins] SF.net SVN: docutils:[8402] trunk/docutils
|
From: <mi...@us...> - 2019-10-10 13:19:57
|
Revision: 8402
http://sourceforge.net/p/docutils/code/8402
Author: milde
Date: 2019-10-10 13:19:55 +0000 (Thu, 10 Oct 2019)
Log Message:
-----------
html5 writer: prepare support of <ins> and <del> tags.
Modified Paths:
--------------
trunk/docutils/RELEASE-NOTES.txt
trunk/docutils/docs/ref/rst/directives.txt
trunk/docutils/test/functional/expected/standalone_rst_html5.html
trunk/docutils/test/functional/input/html5-text-level-tags.txt
trunk/docutils/test/functional/input/standalone_rst_html5.txt
Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt 2019-09-30 21:01:03 UTC (rev 8401)
+++ trunk/docutils/RELEASE-NOTES.txt 2019-10-10 13:19:55 UTC (rev 8402)
@@ -28,9 +28,13 @@
See ``minimal.css`` and ``plain.css`` for styling rule examples.
Use HTML text-level tags <small>, <s>, <q>, <dfn>, <var>, <samp>, <kbd>,
- <i>, <b>, <u>, <mark>, and <bdi> if matching class value is found in
- `inline` and `literal` elements.
+ <i>, <b>, <u>, <mark>, and <bdi> if a matching class value
+ is found in `inline` and `literal` elements.
+ Use HTML tags <ins> and <del> if a matching class value
+ is found in `inline`, `literal`, or `container` elements.
+
+
* LaTeX writer:
Wrap admonitions in a "DUclass" environment. Stylesheets modifying
"\DUadmonition" will need to adapt.
Modified: trunk/docutils/docs/ref/rst/directives.txt
===================================================================
--- trunk/docutils/docs/ref/rst/directives.txt 2019-09-30 21:01:03 UTC (rev 8401)
+++ trunk/docutils/docs/ref/rst/directives.txt 2019-10-10 13:19:55 UTC (rev 8402)
@@ -1730,6 +1730,8 @@
may be followed by any number of letters, digits ([0-9]),
hyphens ("-"), underscores ("_"), colons (":"), and periods
(".").
+
+ -- http://www.w3.org/TR/html401/types.html#type-name
- The `CSS1 spec`_ defines identifiers based on the "name" token
("flex" tokenizer notation below; "latin1" and "escape" 8-bit
Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html 2019-09-30 21:01:03 UTC (rev 8401)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html 2019-10-10 13:19:55 UTC (rev 8402)
@@ -86,83 +86,88 @@
<div class="contents topic" id="table-of-contents">
<p class="topic-title">Table of Contents</p>
<ul class="auto-toc simple">
-<li><p><a class="reference internal" href="#structural-elements" id="id50"><span class="sectnum">1</span> Structural Elements</a></p>
+<li><p><a class="reference internal" href="#structural-elements" id="id55"><span class="sectnum">1</span> Structural Elements</a></p>
<ul class="auto-toc">
-<li><p><a class="reference internal" href="#section-title" id="id51"><span class="sectnum">1.1</span> Section Title</a></p></li>
-<li><p><a class="reference internal" href="#empty-section" id="id52"><span class="sectnum">1.2</span> Empty Section</a></p></li>
-<li><p><a class="reference internal" href="#transitions" id="id53"><span class="sectnum">1.3</span> Transitions</a></p></li>
+<li><p><a class="reference internal" href="#section-title" id="id56"><span class="sectnum">1.1</span> Section Title</a></p></li>
+<li><p><a class="reference internal" href="#empty-section" id="id57"><span class="sectnum">1.2</span> Empty Section</a></p></li>
+<li><p><a class="reference internal" href="#transitions" id="id58"><span class="sectnum">1.3</span> Transitions</a></p></li>
</ul>
</li>
-<li><p><a class="reference internal" href="#body-elements" id="id54"><span class="sectnum">2</span> Body Elements</a></p>
+<li><p><a class="reference internal" href="#body-elements" id="id59"><span class="sectnum">2</span> Body Elements</a></p>
<ul class="auto-toc">
-<li><p><a class="reference internal" href="#paragraphs" id="id55"><span class="sectnum">2.1</span> Paragraphs</a></p>
+<li><p><a class="reference internal" href="#paragraphs" id="id60"><span class="sectnum">2.1</span> Paragraphs</a></p>
<ul class="auto-toc">
-<li><p><a class="reference internal" href="#inline-markup" id="id56"><span class="sectnum">2.1.1</span> Inline Markup</a></p></li>
+<li><p><a class="reference internal" href="#inline-markup" id="id61"><span class="sectnum">2.1.1</span> Inline Markup</a></p></li>
</ul>
</li>
-<li><p><a class="reference internal" href="#bullet-lists" id="id57"><span class="sectnum">2.2</span> Bullet Lists</a></p></li>
-<li><p><a class="reference internal" href="#enumerated-lists" id="id58"><span class="sectnum">2.3</span> Enumerated Lists</a></p></li>
-<li><p><a class="reference internal" href="#definition-lists" id="id59"><span class="sectnum">2.4</span> Definition Lists</a></p></li>
-<li><p><a class="reference internal" href="#field-lists" id="id60"><span class="sectnum">2.5</span> Field Lists</a></p></li>
-<li><p><a class="reference internal" href="#option-lists" id="id61"><span class="sectnum">2.6</span> Option Lists</a></p></li>
-<li><p><a class="reference internal" href="#literal-blocks" id="id62"><span class="sectnum">2.7</span> Literal Blocks</a></p></li>
-<li><p><a class="reference internal" href="#line-blocks" id="id63"><span class="sectnum">2.8</span> Line Blocks</a></p></li>
-<li><p><a class="reference internal" href="#block-quotes" id="id64"><span class="sectnum">2.9</span> Block Quotes</a></p></li>
-<li><p><a class="reference internal" href="#doctest-blocks" id="id65"><span class="sectnum">2.10</span> Doctest Blocks</a></p></li>
-<li><p><a class="reference internal" href="#footnotes" id="id66"><span class="sectnum">2.11</span> Footnotes</a></p></li>
-<li><p><a class="reference internal" href="#citations" id="id67"><span class="sectnum">2.12</span> Citations</a></p></li>
-<li><p><a class="reference internal" href="#targets" id="id68"><span class="sectnum">2.13</span> Targets</a></p>
+<li><p><a class="reference internal" href="#bullet-lists" id="id62"><span class="sectnum">2.2</span> Bullet Lists</a></p></li>
+<li><p><a class="reference internal" href="#enumerated-lists" id="id63"><span class="sectnum">2.3</span> Enumerated Lists</a></p></li>
+<li><p><a class="reference internal" href="#definition-lists" id="id64"><span class="sectnum">2.4</span> Definition Lists</a></p></li>
+<li><p><a class="reference internal" href="#field-lists" id="id65"><span class="sectnum">2.5</span> Field Lists</a></p></li>
+<li><p><a class="reference internal" href="#option-lists" id="id66"><span class="sectnum">2.6</span> Option Lists</a></p></li>
+<li><p><a class="reference internal" href="#literal-blocks" id="id67"><span class="sectnum">2.7</span> Literal Blocks</a></p></li>
+<li><p><a class="reference internal" href="#line-blocks" id="id68"><span class="sectnum">2.8</span> Line Blocks</a></p></li>
+<li><p><a class="reference internal" href="#block-quotes" id="id69"><span class="sectnum">2.9</span> Block Quotes</a></p></li>
+<li><p><a class="reference internal" href="#doctest-blocks" id="id70"><span class="sectnum">2.10</span> Doctest Blocks</a></p></li>
+<li><p><a class="reference internal" href="#footnotes" id="id71"><span class="sectnum">2.11</span> Footnotes</a></p></li>
+<li><p><a class="reference internal" href="#citations" id="id72"><span class="sectnum">2.12</span> Citations</a></p></li>
+<li><p><a class="reference internal" href="#targets" id="id73"><span class="sectnum">2.13</span> Targets</a></p>
<ul class="auto-toc">
-<li><p><a class="reference internal" href="#duplicate-target-names" id="id69"><span class="sectnum">2.13.1</span> Duplicate Target Names</a></p></li>
-<li><p><a class="reference internal" href="#id21" id="id70"><span class="sectnum">2.13.2</span> Duplicate Target Names</a></p></li>
+<li><p><a class="reference internal" href="#duplicate-target-names" id="id74"><span class="sectnum">2.13.1</span> Duplicate Target Names</a></p></li>
+<li><p><a class="reference internal" href="#id21" id="id75"><span class="sectnum">2.13.2</span> Duplicate Target Names</a></p></li>
</ul>
</li>
-<li><p><a class="reference internal" href="#directives" id="id71"><span class="sectnum">2.14</span> Directives</a></p>
+<li><p><a class="reference internal" href="#directives" id="id76"><span class="sectnum">2.14</span> Directives</a></p>
<ul class="auto-toc">
-<li><p><a class="reference internal" href="#document-parts" id="id72"><span class="sectnum">2.14.1</span> Document Parts</a></p></li>
-<li><p><a class="reference internal" href="#images-and-figures" id="id73"><span class="sectnum">2.14.2</span> Images and Figures</a></p></li>
-<li><p><a class="reference internal" href="#admonitions" id="id74"><span class="sectnum">2.14.3</span> Admonitions</a></p></li>
-<li><p><a class="reference internal" href="#topics-sidebars-and-rubrics" id="id75"><span class="sectnum">2.14.4</span> Topics, Sidebars, and Rubrics</a></p></li>
-<li><p><a class="reference internal" href="#target-footnotes" id="id76"><span class="sectnum">2.14.5</span> Target Footnotes</a></p></li>
-<li><p><a class="reference internal" href="#replacement-text" id="id77"><span class="sectnum">2.14.6</span> Replacement Text</a></p></li>
-<li><p><a class="reference internal" href="#compound-paragraph" id="id78"><span class="sectnum">2.14.7</span> Compound Paragraph</a></p></li>
-<li><p><a class="reference internal" href="#parsed-literal-blocks" id="id79"><span class="sectnum">2.14.8</span> Parsed Literal Blocks</a></p></li>
-<li><p><a class="reference internal" href="#code" id="id80"><span class="sectnum">2.14.9</span> Code</a></p></li>
+<li><p><a class="reference internal" href="#document-parts" id="id77"><span class="sectnum">2.14.1</span> Document Parts</a></p></li>
+<li><p><a class="reference internal" href="#images-and-figures" id="id78"><span class="sectnum">2.14.2</span> Images and Figures</a></p></li>
+<li><p><a class="reference internal" href="#admonitions" id="id79"><span class="sectnum">2.14.3</span> Admonitions</a></p></li>
+<li><p><a class="reference internal" href="#topics-sidebars-and-rubrics" id="id80"><span class="sectnum">2.14.4</span> Topics, Sidebars, and Rubrics</a></p></li>
+<li><p><a class="reference internal" href="#target-footnotes" id="id81"><span class="sectnum">2.14.5</span> Target Footnotes</a></p></li>
+<li><p><a class="reference internal" href="#replacement-text" id="id82"><span class="sectnum">2.14.6</span> Replacement Text</a></p></li>
+<li><p><a class="reference internal" href="#compound-paragraph" id="id83"><span class="sectnum">2.14.7</span> Compound Paragraph</a></p></li>
+<li><p><a class="reference internal" href="#parsed-literal-blocks" id="id84"><span class="sectnum">2.14.8</span> Parsed Literal Blocks</a></p></li>
+<li><p><a class="reference internal" href="#code" id="id85"><span class="sectnum">2.14.9</span> Code</a></p></li>
</ul>
</li>
-<li><p><a class="reference internal" href="#substitution-definitions" id="id81"><span class="sectnum">2.15</span> Substitution Definitions</a></p></li>
-<li><p><a class="reference internal" href="#comments" id="id82"><span class="sectnum">2.16</span> Comments</a></p></li>
-<li><p><a class="reference internal" href="#raw-text" id="id83"><span class="sectnum">2.17</span> Raw text</a></p></li>
-<li><p><a class="reference internal" href="#container" id="id84"><span class="sectnum">2.18</span> Container</a></p></li>
-<li><p><a class="reference internal" href="#colspanning-tables" id="id85"><span class="sectnum">2.19</span> Colspanning tables</a></p></li>
-<li><p><a class="reference internal" href="#rowspanning-tables" id="id86"><span class="sectnum">2.20</span> Rowspanning tables</a></p></li>
-<li><p><a class="reference internal" href="#complex-tables" id="id87"><span class="sectnum">2.21</span> Complex tables</a></p></li>
-<li><p><a class="reference internal" href="#list-tables" id="id88"><span class="sectnum">2.22</span> List Tables</a></p></li>
-<li><p><a class="reference internal" href="#custom-roles" id="id89"><span class="sectnum">2.23</span> Custom Roles</a></p></li>
-<li><p><a class="reference internal" href="#svg-images" id="id90"><span class="sectnum">2.24</span> SVG Images</a></p></li>
-<li><p><a class="reference internal" href="#swf-images" id="id91"><span class="sectnum">2.25</span> SWF Images</a></p></li>
+<li><p><a class="reference internal" href="#substitution-definitions" id="id86"><span class="sectnum">2.15</span> Substitution Definitions</a></p></li>
+<li><p><a class="reference internal" href="#comments" id="id87"><span class="sectnum">2.16</span> Comments</a></p></li>
+<li><p><a class="reference internal" href="#raw-text" id="id88"><span class="sectnum">2.17</span> Raw text</a></p></li>
+<li><p><a class="reference internal" href="#container" id="id89"><span class="sectnum">2.18</span> Container</a></p></li>
+<li><p><a class="reference internal" href="#colspanning-tables" id="id90"><span class="sectnum">2.19</span> Colspanning tables</a></p></li>
+<li><p><a class="reference internal" href="#rowspanning-tables" id="id91"><span class="sectnum">2.20</span> Rowspanning tables</a></p></li>
+<li><p><a class="reference internal" href="#complex-tables" id="id92"><span class="sectnum">2.21</span> Complex tables</a></p></li>
+<li><p><a class="reference internal" href="#list-tables" id="id93"><span class="sectnum">2.22</span> List Tables</a></p></li>
+<li><p><a class="reference internal" href="#custom-roles" id="id94"><span class="sectnum">2.23</span> Custom Roles</a></p></li>
</ul>
</li>
-<li><p><a class="reference internal" href="#text-level-semantics" id="id92"><span class="sectnum">3</span> Text-level semantics</a></p></li>
-<li><p><a class="reference internal" href="#changes-to-the-html4css1-writer" id="id93"><span class="sectnum">4</span> Changes to the html4css1 writer</a></p>
+<li><p><a class="reference internal" href="#html-specific" id="id95"><span class="sectnum">3</span> HTML specific</a></p>
<ul class="auto-toc">
-<li><p><a class="reference internal" href="#field-list-handling" id="id94"><span class="sectnum">4.1</span> Field list handling</a></p></li>
-<li><p><a class="reference internal" href="#styling-with-class-arguments" id="id95"><span class="sectnum">4.2</span> Styling with class arguments</a></p>
+<li><p><a class="reference internal" href="#svg-images" id="id96"><span class="sectnum">3.1</span> SVG Images</a></p></li>
+<li><p><a class="reference internal" href="#swf-images" id="id97"><span class="sectnum">3.2</span> SWF Images</a></p></li>
+<li><p><a class="reference internal" href="#text-level-semantics" id="id98"><span class="sectnum">3.3</span> Text-level semantics</a></p></li>
+<li><p><a class="reference internal" href="#indicating-edits" id="id99"><span class="sectnum">3.4</span> Indicating Edits</a></p></li>
+</ul>
+</li>
+<li><p><a class="reference internal" href="#changes-to-the-html4css1-writer" id="id100"><span class="sectnum">4</span> Changes to the html4css1 writer</a></p>
<ul class="auto-toc">
-<li><p><a class="reference internal" href="#description-lists" id="id96"><span class="sectnum">4.2.1</span> Description lists</a></p></li>
-<li><p><a class="reference internal" href="#field-list-variants" id="id97"><span class="sectnum">4.2.2</span> Field list variants</a></p></li>
-<li><p><a class="reference internal" href="#table-variants" id="id98"><span class="sectnum">4.2.3</span> Table variants</a></p></li>
+<li><p><a class="reference internal" href="#field-list-handling" id="id101"><span class="sectnum">4.1</span> Field list handling</a></p></li>
+<li><p><a class="reference internal" href="#styling-with-class-arguments" id="id102"><span class="sectnum">4.2</span> Styling with class arguments</a></p>
+<ul class="auto-toc">
+<li><p><a class="reference internal" href="#description-lists" id="id103"><span class="sectnum">4.2.1</span> Description lists</a></p></li>
+<li><p><a class="reference internal" href="#field-list-variants" id="id104"><span class="sectnum">4.2.2</span> Field list variants</a></p></li>
+<li><p><a class="reference internal" href="#table-variants" id="id105"><span class="sectnum">4.2.3</span> Table variants</a></p></li>
</ul>
</li>
</ul>
</li>
-<li><p><a class="reference internal" href="#error-handling" id="id99"><span class="sectnum">5</span> Error Handling</a></p></li>
+<li><p><a class="reference internal" href="#error-handling" id="id106"><span class="sectnum">5</span> Error Handling</a></p></li>
</ul>
</div>
<div class="section" id="structural-elements">
-<h1><a class="toc-backref" href="#id50"><span class="sectnum">1</span> Structural Elements</a></h1>
+<h1><a class="toc-backref" href="#id55"><span class="sectnum">1</span> Structural Elements</a></h1>
<div class="section" id="section-title">
-<h2 class="with-subtitle"><a class="toc-backref" href="#id51"><span class="sectnum">1.1</span> Section Title</a></h2>
+<h2 class="with-subtitle"><a class="toc-backref" href="#id56"><span class="sectnum">1.1</span> Section Title</a></h2>
<p class="section-subtitle" id="section-subtitle">Section Subtitle</p>
<p>Lone subsections are converted to a section subtitle by a transform
activated with the <span class="docutils literal"><span class="pre">--section-subtitles</span></span> command line option or the
@@ -169,10 +174,10 @@
<span class="docutils literal"><span class="pre">sectsubtitle-xform</span></span> configuration value.</p>
</div>
<div class="section" id="empty-section">
-<h2><a class="toc-backref" href="#id52"><span class="sectnum">1.2</span> Empty Section</a></h2>
+<h2><a class="toc-backref" href="#id57"><span class="sectnum">1.2</span> Empty Section</a></h2>
</div>
<div class="section" id="transitions">
-<h2><a class="toc-backref" href="#id53"><span class="sectnum">1.3</span> Transitions</a></h2>
+<h2><a class="toc-backref" href="#id58"><span class="sectnum">1.3</span> Transitions</a></h2>
<p>Here's a transition:</p>
<hr class="docutils" />
<p>It divides the section. Transitions may also occur between sections:</p>
@@ -180,24 +185,24 @@
</div>
<hr class="docutils" />
<div class="section" id="body-elements">
-<h1><a class="toc-backref" href="#id54"><span class="sectnum">2</span> Body Elements</a></h1>
+<h1><a class="toc-backref" href="#id59"><span class="sectnum">2</span> Body Elements</a></h1>
<div class="section" id="paragraphs">
-<h2><a class="toc-backref" href="#id55"><span class="sectnum">2.1</span> Paragraphs</a></h2>
+<h2><a class="toc-backref" href="#id60"><span class="sectnum">2.1</span> Paragraphs</a></h2>
<p>A paragraph.</p>
<div class="section" id="inline-markup">
-<h3><a class="toc-backref" href="#id56"><span class="sectnum">2.1.1</span> Inline Markup</a></h3>
+<h3><a class="toc-backref" href="#id61"><span class="sectnum">2.1.1</span> Inline Markup</a></h3>
<p>Paragraphs contain text and may contain inline markup: <em>emphasis</em>,
<strong>strong emphasis</strong>, <span class="docutils literal">inline literals</span>, standalone hyperlinks
-(<a class="reference external" href="http://www.python.org">http://www.python.org</a>), external hyperlinks (<a class="reference external" href="http://www.python.org/">Python</a> <a class="footnote-reference brackets" href="#id33" id="id34">7</a>), internal
+(<a class="reference external" href="http://www.python.org">http://www.python.org</a>), external hyperlinks (<a class="reference external" href="http://www.python.org/">Python</a> <a class="footnote-reference brackets" href="#id36" id="id37">7</a>), internal
cross-references (<a class="reference internal" href="#example">example</a>), external hyperlinks with embedded URIs
(<a class="reference external" href="http://www.python.org">Python web site</a>), <a class="reference external" href="http://www.python.org/">anonymous hyperlink
-references</a> <a class="footnote-reference brackets" href="#id33" id="id45">7</a> (<a class="reference external" href="http://docutils.sourceforge.net/">a second reference</a> <a class="footnote-reference brackets" href="#id46" id="id47">12</a>), footnote references (manually
+references</a> <a class="footnote-reference brackets" href="#id36" id="id48">7</a> (<a class="reference external" href="http://docutils.sourceforge.net/">a second reference</a> <a class="footnote-reference brackets" href="#id49" id="id50">12</a>), footnote references (manually
numbered <a class="footnote-reference brackets" href="#id8" id="id1">1</a>, anonymous auto-numbered <a class="footnote-reference brackets" href="#id12" id="id2">3</a>, labeled auto-numbered
<a class="footnote-reference brackets" href="#label" id="id3">2</a>, or symbolic <a class="footnote-reference brackets" href="#id13" id="id4">*</a>), citation references (<a class="citation-reference" href="#cit2002" id="id5">[CIT2002]</a>),
substitution references (<img alt="EXAMPLE" src="../../../docs/user/rst/images/biohazard.png" /> &
a <em>trimmed heart</em> <span class="docutils literal">(U+2665):</span>♥), and <span class="target" id="inline-hyperlink-targets">inline hyperlink targets</span>
(see <a class="reference internal" href="#targets">Targets</a> below for a reference back to here). Character-level
-inline markup is also possible (although exceedingly ugly!) in <em>re</em><span class="docutils literal">Structured</span><em>Text</em>. Problems are indicated by <a href="#id31"><span class="problematic" id="id32">|problematic|</span></a> text
+inline markup is also possible (although exceedingly ugly!) in <em>re</em><span class="docutils literal">Structured</span><em>Text</em>. Problems are indicated by <a href="#id34"><span class="problematic" id="id35">|problematic|</span></a> text
(generated by processing errors; this one is intentional). Here is a
reference to the <a class="reference internal" href="#doctitle">doctitle</a> and the <a class="reference internal" href="#subtitle">subtitle</a>.</p>
<p>The default role for interpreted text is <cite>Title Reference</cite>. Here are
@@ -214,7 +219,7 @@
</div>
</div>
<div class="section" id="bullet-lists">
-<h2><a class="toc-backref" href="#id57"><span class="sectnum">2.2</span> Bullet Lists</a></h2>
+<h2><a class="toc-backref" href="#id62"><span class="sectnum">2.2</span> Bullet Lists</a></h2>
<ul>
<li><p>A bullet list</p>
<ul class="simple">
@@ -241,7 +246,7 @@
</ul>
</div>
<div class="section" id="enumerated-lists">
-<h2><a class="toc-backref" href="#id58"><span class="sectnum">2.3</span> Enumerated Lists</a></h2>
+<h2><a class="toc-backref" href="#id63"><span class="sectnum">2.3</span> Enumerated Lists</a></h2>
<ol class="arabic">
<li><p>Arabic numerals.</p>
<ol class="loweralpha simple">
@@ -277,7 +282,7 @@
</ol>
</div>
<div class="section" id="definition-lists">
-<h2><a class="toc-backref" href="#id59"><span class="sectnum">2.4</span> Definition Lists</a></h2>
+<h2><a class="toc-backref" href="#id64"><span class="sectnum">2.4</span> Definition Lists</a></h2>
<dl>
<dt>Term</dt>
<dd><p>Definition</p>
@@ -295,7 +300,7 @@
</dl>
</div>
<div class="section" id="field-lists">
-<h2><a class="toc-backref" href="#id60"><span class="sectnum">2.5</span> Field Lists</a></h2>
+<h2><a class="toc-backref" href="#id65"><span class="sectnum">2.5</span> Field Lists</a></h2>
<dl class="field-list">
<dt>what</dt>
<dd><p>Field lists map field names to field bodies, like database
@@ -315,7 +320,7 @@
</dl>
</div>
<div class="section" id="option-lists">
-<h2><a class="toc-backref" href="#id61"><span class="sectnum">2.6</span> Option Lists</a></h2>
+<h2><a class="toc-backref" href="#id66"><span class="sectnum">2.6</span> Option Lists</a></h2>
<p>For listing command-line options:</p>
<dl class="option-list">
<dt><kbd><span class="option">-a</span></kbd></dt>
@@ -354,7 +359,7 @@
description.</p>
</div>
<div class="section" id="literal-blocks">
-<h2><a class="toc-backref" href="#id62"><span class="sectnum">2.7</span> Literal Blocks</a></h2>
+<h2><a class="toc-backref" href="#id67"><span class="sectnum">2.7</span> Literal Blocks</a></h2>
<p>Literal blocks are indicated with a double-colon ("::") at the end of
the preceding paragraph (over there <span class="docutils literal"><span class="pre">--></span></span>). They can be indented:</p>
<pre class="literal-block">if literal_block:
@@ -367,7 +372,7 @@
> Why didn't I think of that?</pre>
</div>
<div class="section" id="line-blocks">
-<h2><a class="toc-backref" href="#id63"><span class="sectnum">2.8</span> Line Blocks</a></h2>
+<h2><a class="toc-backref" href="#id68"><span class="sectnum">2.8</span> Line Blocks</a></h2>
<p>This section tests line blocks. Line blocks are body elements which
consist of lines and other line blocks. Nested line blocks cause
indentation.</p>
@@ -441,7 +446,7 @@
</div>
</div>
<div class="section" id="block-quotes">
-<h2><a class="toc-backref" href="#id64"><span class="sectnum">2.9</span> Block Quotes</a></h2>
+<h2><a class="toc-backref" href="#id69"><span class="sectnum">2.9</span> Block Quotes</a></h2>
<p>Block quotes consist of indented body elements:</p>
<blockquote>
<p>My theory by A. Elk. Brackets Miss, brackets. This theory goes
@@ -460,7 +465,7 @@
</blockquote>
</div>
<div class="section" id="doctest-blocks">
-<h2><a class="toc-backref" href="#id65"><span class="sectnum">2.10</span> Doctest Blocks</a></h2>
+<h2><a class="toc-backref" href="#id70"><span class="sectnum">2.10</span> Doctest Blocks</a></h2>
<pre class="code python doctest">>>> print 'Python-specific usage examples; begun with ">>>"'
Python-specific usage examples; begun with ">>>"
>>> print '(cut and pasted from interactive Python sessions)'
@@ -468,7 +473,7 @@
</pre>
</div>
<div class="section" id="footnotes">
-<h2><a class="toc-backref" href="#id66"><span class="sectnum">2.11</span> Footnotes</a></h2>
+<h2><a class="toc-backref" href="#id71"><span class="sectnum">2.11</span> Footnotes</a></h2>
<dl class="footnote brackets">
<dt class="label" id="id8"><span class="brackets">1</span><span class="fn-backref">(<a href="#id1">1</a>,<a href="#id9">2</a>,<a href="#id22">3</a>)</span></dt>
<dd><p>A footnote contains body elements, consistently indented by at
@@ -496,12 +501,12 @@
</dd>
<dt class="label" id="id16"><span class="brackets">4</span></dt>
<dd><p>Here's an unreferenced footnote, with a reference to a
-nonexistent footnote: <a href="#id109"><span class="problematic" id="id17">[5]_</span></a>.</p>
+nonexistent footnote: <a href="#id116"><span class="problematic" id="id17">[5]_</span></a>.</p>
</dd>
</dl>
</div>
<div class="section" id="citations">
-<h2><a class="toc-backref" href="#id67"><span class="sectnum">2.12</span> Citations</a></h2>
+<h2><a class="toc-backref" href="#id72"><span class="sectnum">2.12</span> Citations</a></h2>
<dl class="citation">
<dt class="label" id="cit2002"><span class="brackets">CIT2002</span><span class="fn-backref">(<a href="#id5">1</a>,<a href="#id18">2</a>)</span></dt>
<dd><p>Citations are text-labeled footnotes. They may be
@@ -508,11 +513,11 @@
rendered separately and differently from footnotes.</p>
</dd>
</dl>
-<p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="id18">[CIT2002]</a>, and a <a href="#id110"><span class="problematic" id="id19">[nonexistent]_</span></a>
+<p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="id18">[CIT2002]</a>, and a <a href="#id117"><span class="problematic" id="id19">[nonexistent]_</span></a>
citation.</p>
</div>
<div class="section" id="targets">
-<span id="another-target"></span><h2><a class="toc-backref" href="#id68"><span class="sectnum">2.13</span> Targets</a></h2>
+<span id="another-target"></span><h2><a class="toc-backref" href="#id73"><span class="sectnum">2.13</span> Targets</a></h2>
<p id="example">This paragraph is pointed to by the explicit "example" target. A
reference can be found under <a class="reference internal" href="#inline-markup">Inline Markup</a>, above. <a class="reference internal" href="#inline-hyperlink-targets">Inline
hyperlink targets</a> are also possible.</p>
@@ -519,37 +524,37 @@
<p>Section headers are implicit targets, referred to by name. See
<a class="reference internal" href="#targets">Targets</a>, which is a subsection of <a class="reference internal" href="#body-elements">Body Elements</a>.</p>
<p>Explicit external targets are interpolated into references such as
-"<a class="reference external" href="http://www.python.org/">Python</a> <a class="footnote-reference brackets" href="#id33" id="id35">7</a>".</p>
+"<a class="reference external" href="http://www.python.org/">Python</a> <a class="footnote-reference brackets" href="#id36" id="id38">7</a>".</p>
<p>Targets may be indirect and anonymous. Thus <a class="reference internal" href="#targets">this phrase</a> may also
refer to the <a class="reference internal" href="#targets">Targets</a> section.</p>
-<p>Here's a <a href="#id111"><span class="problematic" id="id112">`hyperlink reference without a target`_</span></a>, which generates an
+<p>Here's a <a href="#id118"><span class="problematic" id="id119">`hyperlink reference without a target`_</span></a>, which generates an
error.</p>
<div class="section" id="duplicate-target-names">
-<h3><a class="toc-backref" href="#id69"><span class="sectnum">2.13.1</span> Duplicate Target Names</a></h3>
+<h3><a class="toc-backref" href="#id74"><span class="sectnum">2.13.1</span> Duplicate Target Names</a></h3>
<p>Duplicate names in section headers or other implicit targets will
generate "info" (level-1) system messages. Duplicate names in
explicit targets will generate "warning" (level-2) system messages.</p>
</div>
<div class="section" id="id21">
-<h3><a class="toc-backref" href="#id70"><span class="sectnum">2.13.2</span> Duplicate Target Names</a></h3>
+<h3><a class="toc-backref" href="#id75"><span class="sectnum">2.13.2</span> Duplicate Target Names</a></h3>
<p>Since there are two "Duplicate Target Names" section headers, we
cannot uniquely refer to either of them by name. If we try to (like
-this: <a href="#id113"><span class="problematic" id="id114">`Duplicate Target Names`_</span></a>), an error is generated.</p>
+this: <a href="#id120"><span class="problematic" id="id121">`Duplicate Target Names`_</span></a>), an error is generated.</p>
</div>
</div>
<div class="section" id="directives">
-<h2><a class="toc-backref" href="#id71"><span class="sectnum">2.14</span> Directives</a></h2>
+<h2><a class="toc-backref" href="#id76"><span class="sectnum">2.14</span> Directives</a></h2>
<div class="contents local topic" id="contents">
<ul class="auto-toc simple">
-<li><p><a class="reference internal" href="#document-parts" id="id100"><span class="sectnum">2.14.1</span> Document Parts</a></p></li>
-<li><p><a class="reference internal" href="#images-and-figures" id="id101"><span class="sectnum">2.14.2</span> Images and Figures</a></p></li>
-<li><p><a class="reference internal" href="#admonitions" id="id102"><span class="sectnum">2.14.3</span> Admonitions</a></p></li>
-<li><p><a class="reference internal" href="#topics-sidebars-and-rubrics" id="id103"><span class="sectnum">2.14.4</span> Topics, Sidebars, and Rubrics</a></p></li>
-<li><p><a class="reference internal" href="#target-footnotes" id="id104"><span class="sectnum">2.14.5</span> Target Footnotes</a></p></li>
-<li><p><a class="reference internal" href="#replacement-text" id="id105"><span class="sectnum">2.14.6</span> Replacement Text</a></p></li>
-<li><p><a class="reference internal" href="#compound-paragraph" id="id106"><span class="sectnum">2.14.7</span> Compound Paragraph</a></p></li>
-<li><p><a class="reference internal" href="#parsed-literal-blocks" id="id107"><span class="sectnum">2.14.8</span> Parsed Literal Blocks</a></p></li>
-<li><p><a class="reference internal" href="#code" id="id108"><span class="sectnum">2.14.9</span> Code</a></p></li>
+<li><p><a class="reference internal" href="#document-parts" id="id107"><span class="sectnum">2.14.1</span> Document Parts</a></p></li>
+<li><p><a class="reference internal" href="#images-and-figures" id="id108"><span class="sectnum">2.14.2</span> Images and Figures</a></p></li>
+<li><p><a class="reference internal" href="#admonitions" id="id109"><span class="sectnum">2.14.3</span> Admonitions</a></p></li>
+<li><p><a class="reference internal" href="#topics-sidebars-and-rubrics" id="id110"><span class="sectnum">2.14.4</span> Topics, Sidebars, and Rubrics</a></p></li>
+<li><p><a class="reference internal" href="#target-footnotes" id="id111"><span class="sectnum">2.14.5</span> Target Footnotes</a></p></li>
+<li><p><a class="reference internal" href="#replacement-text" id="id112"><span class="sectnum">2.14.6</span> Replacement Text</a></p></li>
+<li><p><a class="reference internal" href="#compound-paragraph" id="id113"><span class="sectnum">2.14.7</span> Compound Paragraph</a></p></li>
+<li><p><a class="reference internal" href="#parsed-literal-blocks" id="id114"><span class="sectnum">2.14.8</span> Parsed Literal Blocks</a></p></li>
+<li><p><a class="reference internal" href="#code" id="id115"><span class="sectnum">2.14.9</span> Code</a></p></li>
</ul>
</div>
<p>These are just a sample of the many reStructuredText Directives. For
@@ -556,13 +561,13 @@
others, please see
<a class="reference external" href="http://docutils.sourceforge.net/docs/ref/rst/directives.html">http://docutils.sourceforge.net/docs/ref/rst/directives.html</a>.</p>
<div class="section" id="document-parts">
-<h3><a class="toc-backref" href="#id100"><span class="sectnum">2.14.1</span> Document Parts</a></h3>
+<h3><a class="toc-backref" href="#id107"><span class="sectnum">2.14.1</span> Document Parts</a></h3>
<p>An example of the "contents" directive can be seen above this section
(a local, untitled table of <a class="reference internal" href="#contents">contents</a>) and at the beginning of the
document (a document-wide <a class="reference internal" href="#table-of-contents">table of contents</a>).</p>
</div>
<div class="section" id="images-and-figures">
-<h3><a class="toc-backref" href="#id101"><span class="sectnum">2.14.2</span> Images and Figures</a></h3>
+<h3><a class="toc-backref" href="#id108"><span class="sectnum">2.14.2</span> Images and Figures</a></h3>
<p>An image directive (also clickable -- a hyperlink reference):</p>
<a class="reference internal image-reference" href="#directives"><img alt="../../../docs/user/rst/images/title.png" class="class1 class2" src="../../../docs/user/rst/images/title.png" /></a>
<p>Image with multiple IDs:</p>
@@ -744,7 +749,7 @@
</table>
</div>
<div class="section" id="admonitions">
-<h3><a class="toc-backref" href="#id102"><span class="sectnum">2.14.3</span> Admonitions</a></h3>
+<h3><a class="toc-backref" href="#id109"><span class="sectnum">2.14.3</span> Admonitions</a></h3>
<div class="admonition attention">
<p class="admonition-title">Attention!</p>
<p>Directives at large.</p>
@@ -793,7 +798,7 @@
</div>
</div>
<div class="section" id="topics-sidebars-and-rubrics">
-<h3><a class="toc-backref" href="#id103"><span class="sectnum">2.14.4</span> Topics, Sidebars, and Rubrics</a></h3>
+<h3><a class="toc-backref" href="#id110"><span class="sectnum">2.14.4</span> Topics, Sidebars, and Rubrics</a></h3>
<p><em>Sidebars</em> are like miniature, parallel documents.</p>
<div class="sidebar">
<p class="sidebar-title">Sidebar Title</p>
@@ -817,37 +822,40 @@
allowed (e.g. inside a directive).</p>
</div>
<div class="section" id="target-footnotes">
-<h3><a class="toc-backref" href="#id104"><span class="sectnum">2.14.5</span> Target Footnotes</a></h3>
+<h3><a class="toc-backref" href="#id111"><span class="sectnum">2.14.5</span> Target Footnotes</a></h3>
<dl class="footnote brackets">
-<dt class="label" id="id33"><span class="brackets">7</span><span class="fn-backref">(<a href="#id34">1</a>,<a href="#id35">2</a>,<a href="#id36">3</a>,<a href="#id45">4</a>)</span></dt>
+<dt class="label" id="id36"><span class="brackets">7</span><span class="fn-backref">(<a href="#id37">1</a>,<a href="#id38">2</a>,<a href="#id39">3</a>,<a href="#id48">4</a>)</span></dt>
<dd><p><a class="reference external" href="http://www.python.org/">http://www.python.org/</a></p>
</dd>
-<dt class="label" id="id37"><span class="brackets"><a class="fn-backref" href="#id38">8</a></span></dt>
+<dt class="label" id="id40"><span class="brackets"><a class="fn-backref" href="#id41">8</a></span></dt>
<dd><p><a class="reference external" href="http://pygments.org/">http://pygments.org/</a></p>
</dd>
-<dt class="label" id="id39"><span class="brackets"><a class="fn-backref" href="#id40">9</a></span></dt>
+<dt class="label" id="id42"><span class="brackets"><a class="fn-backref" href="#id43">9</a></span></dt>
<dd><p><a class="reference external" href="http://docutils.sourceforge.net/docs/dev/todo.html#interpreted-text">http://docutils.sourceforge.net/docs/dev/todo.html#interpreted-text</a></p>
</dd>
-<dt class="label" id="id41"><span class="brackets"><a class="fn-backref" href="#id42">10</a></span></dt>
+<dt class="label" id="id44"><span class="brackets"><a class="fn-backref" href="#id45">10</a></span></dt>
<dd><p><a class="reference external" href="http://docutils.sourceforge.net/docs/user/config.html#table-style">http://docutils.sourceforge.net/docs/user/config.html#table-style</a></p>
</dd>
-<dt class="label" id="id43"><span class="brackets"><a class="fn-backref" href="#id44">11</a></span></dt>
+<dt class="label" id="id46"><span class="brackets"><a class="fn-backref" href="#id47">11</a></span></dt>
<dd><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>
</dd>
-<dt class="label" id="id46"><span class="brackets"><a class="fn-backref" href="#id47">12</a></span></dt>
+<dt class="label" id="id49"><span class="brackets"><a class="fn-backref" href="#id50">12</a></span></dt>
<dd><p><a class="reference external" href="http://docutils.sourceforge.net/">http://docutils.sourceforge.net/</a></p>
</dd>
-<dt class="label" id="id48"><span class="brackets"><a class="fn-backref" href="#id49">13</a></span></dt>
+<dt class="label" id="id51"><span class="brackets"><a class="fn-backref" href="#id52">13</a></span></dt>
<dd><p><a class="reference external" href="https://html.spec.whatwg.org/#text-level-semantics">https://html.spec.whatwg.org/#text-level-semantics</a></p>
</dd>
+<dt class="label" id="id53"><span class="brackets"><a class="fn-backref" href="#id54">14</a></span></dt>
+<dd><p><a class="reference external" href="https://html.spec.whatwg.org/multipage/edits.html">https://html.spec.whatwg.org/multipage/edits.html</a></p>
+</dd>
</dl>
</div>
<div class="section" id="replacement-text">
-<h3><a class="toc-backref" href="#id105"><span class="sectnum">2.14.6</span> Replacement Text</a></h3>
-<p>I recommend you try <a class="reference external" href="http://www.python.org/">Python, <em>the</em> best language around</a> <a class="footnote-reference brackets" href="#id33" id="id36">7</a>.</p>
+<h3><a class="toc-backref" href="#id112"><span class="sectnum">2.14.6</span> Replacement Text</a></h3>
+<p>I recommend you try <a class="reference external" href="http://www.python.org/">Python, <em>the</em> best language around</a> <a class="footnote-reference brackets" href="#id36" id="id39">7</a>.</p>
</div>
<div class="section" id="compound-paragraph">
-<h3><a class="toc-backref" href="#id106"><span class="sectnum">2.14.7</span> Compound Paragraph</a></h3>
+<h3><a class="toc-backref" href="#id113"><span class="sectnum">2.14.7</span> Compound Paragraph</a></h3>
<p>The <em>compound</em> directive is used to create a "compound paragraph", which
is a single logical paragraph containing multiple physical body
elements. For example:</p>
@@ -958,7 +966,7 @@
</div>
</div>
<div class="section" id="parsed-literal-blocks">
-<h3><a class="toc-backref" href="#id107"><span class="sectnum">2.14.8</span> Parsed Literal Blocks</a></h3>
+<h3><a class="toc-backref" href="#id114"><span class="sectnum">2.14.8</span> Parsed Literal Blocks</a></h3>
<pre class="literal-block">This is a parsed literal block.
This line is indented. The next line is blank.
@@ -968,9 +976,9 @@
footnotes <a class="footnote-reference brackets" href="#id8" id="id22">1</a>, <span class="target" id="hyperlink-targets">hyperlink targets</span>, and <a class="reference external" href="http://www.python.org/">references</a>.</pre>
</div>
<div class="section" id="code">
-<h3><a class="toc-backref" href="#id108"><span class="sectnum">2.14.9</span> Code</a></h3>
+<h3><a class="toc-backref" href="#id115"><span class="sectnum">2.14.9</span> Code</a></h3>
<p>Blocks of source code can be set with the <cite>code</cite> directive. If the code
-language is specified, the content is parsed and tagged by the <a class="reference external" href="http://pygments.org/">Pygments</a> <a class="footnote-reference brackets" href="#id37" id="id38">8</a>
+language is specified, the content is parsed and tagged by the <a class="reference external" href="http://pygments.org/">Pygments</a> <a class="footnote-reference brackets" href="#id40" id="id41">8</a>
syntax highlighter and can be formatted with a style sheet. (Code parsing
is turned off using the <span class="docutils literal"><span class="pre">syntax-highlight</span></span> config setting in the test
conversions in order to get identical results with/without installed
@@ -994,13 +1002,13 @@
</div>
</div>
<div class="section" id="substitution-definitions">
-<h2><a class="toc-backref" href="#id81"><span class="sectnum">2.15</span> Substitution Definitions</a></h2>
+<h2><a class="toc-backref" href="#id86"><span class="sectnum">2.15</span> Substitution Definitions</a></h2>
<p>An inline image (<img alt="EXAMPLE" src="../../../docs/user/rst/images/biohazard.png" />) example:</p>
<p>A Unicode example:</p>
<p>(Substitution definitions are not visible in the HTML source.)</p>
</div>
<div class="section" id="comments">
-<h2><a class="toc-backref" href="#id82"><span class="sectnum">2.16</span> Comments</a></h2>
+<h2><a class="toc-backref" href="#id87"><span class="sectnum">2.16</span> Comments</a></h2>
<p>Here's one:</p>
<!-- Comments begin with two dots and a space. Anything may
follow, except for the syntax of footnotes, hyperlink
@@ -1012,13 +1020,13 @@
<p>(View the HTML source to see the comment.)</p>
</div>
<div class="section" id="raw-text">
-<h2><a class="toc-backref" href="#id83"><span class="sectnum">2.17</span> Raw text</a></h2>
+<h2><a class="toc-backref" href="#id88"><span class="sectnum">2.17</span> Raw text</a></h2>
<p>This does not necessarily look nice, because there may be missing white space.</p>
<p>It's just there to freeze the behavior.</p>
A test.Second test.<div class="myclass">Another test with myclass set.</div><p>This is the <span class="myrawroleclass">fourth test</span> with myrawroleclass set.</p>
Fifth test in HTML.<br />Line two.</div>
<div class="section" id="container">
-<h2><a class="toc-backref" href="#id84"><span class="sectnum">2.18</span> Container</a></h2>
+<h2><a class="toc-backref" href="#id89"><span class="sectnum">2.18</span> Container</a></h2>
<div class="custom docutils container">
<p>paragraph 1</p>
<p>paragraph 2</p>
@@ -1025,7 +1033,7 @@
</div>
</div>
<div class="section" id="colspanning-tables">
-<h2><a class="toc-backref" href="#id85"><span class="sectnum">2.19</span> Colspanning tables</a></h2>
+<h2><a class="toc-backref" href="#id90"><span class="sectnum">2.19</span> Colspanning tables</a></h2>
<p>This table has a cell spanning two columns:</p>
<table>
<colgroup>
@@ -1063,7 +1071,7 @@
</table>
</div>
<div class="section" id="rowspanning-tables">
-<h2><a class="toc-backref" href="#id86"><span class="sectnum">2.20</span> Rowspanning tables</a></h2>
+<h2><a class="toc-backref" href="#id91"><span class="sectnum">2.20</span> Rowspanning tables</a></h2>
<p>Here's a table with cells spanning several rows:</p>
<table>
<colgroup>
@@ -1096,7 +1104,7 @@
</table>
</div>
<div class="section" id="complex-tables">
-<h2><a class="toc-backref" href="#id87"><span class="sectnum">2.21</span> Complex tables</a></h2>
+<h2><a class="toc-backref" href="#id92"><span class="sectnum">2.21</span> Complex tables</a></h2>
<p>Here's a complex table, which should test all features.</p>
<table>
<colgroup>
@@ -1145,7 +1153,7 @@
</table>
</div>
<div class="section" id="list-tables">
-<h2><a class="toc-backref" href="#id88"><span class="sectnum">2.22</span> List Tables</a></h2>
+<h2><a class="toc-backref" href="#id93"><span class="sectnum">2.22</span> List Tables</a></h2>
<p>Here's a list table exercising all features:</p>
<table class="colwidths-given test" style="width: 40em">
<caption>list table with integral header</caption>
@@ -1192,7 +1200,7 @@
</table>
</div>
<div class="section" id="custom-roles">
-<h2><a class="toc-backref" href="#id89"><span class="sectnum">2.23</span> Custom Roles</a></h2>
+<h2><a class="toc-backref" href="#id94"><span class="sectnum">2.23</span> Custom Roles</a></h2>
<ul>
<li><p>A role based on an existing role.</p>
<p><span class="custom docutils literal">one</span> <span class="custom docutils literal">two</span> <span class="custom docutils literal">three</span></p>
@@ -1219,8 +1227,11 @@
</li>
</ul>
</div>
+</div>
+<div class="section" id="html-specific">
+<h1><a class="toc-backref" href="#id95"><span class="sectnum">3</span> HTML specific</a></h1>
<div class="section" id="svg-images">
-<h2><a class="toc-backref" href="#id90"><span class="sectnum">2.24</span> SVG Images</a></h2>
+<h2><a class="toc-backref" href="#id96"><span class="sectnum">3.1</span> SVG Images</a></h2>
<img alt="../../../docs/user/rst/images/biohazard.svg" class="align-left" src="../../../docs/user/rst/images/biohazard.svg" style="width: 48px; height: 48px;" />
<p>Scalable vector graphics (SVG) images are the only standards-compliable way
to include vector graphics in HTML documents. However, they are not
@@ -1305,7 +1316,7 @@
</blockquote>
</div>
<div class="section" id="swf-images">
-<h2><a class="toc-backref" href="#id91"><span class="sectnum">2.25</span> SWF Images</a></h2>
+<h2><a class="toc-backref" href="#id97"><span class="sectnum">3.2</span> SWF Images</a></h2>
<p>Shockwave Flash is an image/movie format that most modern web browsers
support via a plugin. It is sometimes blocked due to privacy/security
concerns.</p>
@@ -1316,10 +1327,9 @@
<p>An SWF image in a 4 cm x 2 em box, left aligned.</p>
<p>An inline SWF image <object data="../../../docs/user/rst/images/biohazard.swf" style="width: 0.8em; height: 0.8em;" type="application/x-shockwave-flash">inline-swf</object> scaled to 0.8 em x 0.8 em.</p>
</div>
-</div>
<div class="section" id="text-level-semantics">
-<h1><a class="toc-backref" href="#id92"><span class="sectnum">3</span> Text-level semantics</a></h1>
-<p><a class="reference external" href="https://html.spec.whatwg.org/#text-level-semantics">HTML 5 tags for representation of text-level semantics</a> <a class="footnote-reference brackets" href="#id48" id="id49">13</a> and their
+<h2><a class="toc-backref" href="#id98"><span class="sectnum">3.3</span> Text-level semantics</a></h2>
+<p><a class="reference external" href="https://html.spec.whatwg.org/#text-level-semantics">HTML 5 tags for representation of text-level semantics</a> <a class="footnote-reference brackets" href="#id51" id="id52">13</a> and their
reStructuredText equivalents.</p>
<dl class="narrow field-list">
<dt>a</dt>
@@ -1521,10 +1531,35 @@
</blockquote>
</dd>
</dl>
+</div>
+<div class="section" id="indicating-edits">
+<h2><a class="toc-backref" href="#id99"><span class="sectnum">3.4</span> Indicating Edits</a></h2>
+<p><a class="reference external" href="https://html.spec.whatwg.org/multipage/edits.html">HTML tags for representation of edits to the document</a> <a class="footnote-reference brackets" href="#id53" id="id54">14</a> and their
+reStructuredText equivalents.</p>
+<dl class="field-list">
+<dt>ins</dt>
+<dd><p>Additions <a class="footnote-reference brackets" href="#attribute-optional" id="id32">5</a></p>
+<blockquote>
+<p>This text has "always" been here. <span class="ins">This text has been inserted.</span></p>
+<div class="ins docutils container">
+<p>This paragraph has been inserted.</p>
+</div>
+</blockquote>
+</dd>
+<dt>del</dt>
+<dd><p>Removed content <a class="footnote-reference brackets" href="#attribute-optional" id="id33">5</a></p>
+<blockquote>
+<p><span class="del">This text has been deleted</span>, here is the rest of the paragraph.</p>
+<div class="del docutils container">
+<p>This paragraph has been deleted.</p>
+</div>
+</blockquote>
+</dd>
+</dl>
<dl class="footnote brackets">
-<dt class="label" id="attribute-optional"><span class="brackets">5</span><span class="fn-backref">(<a href="#id24">1</a>,<a href="#id29">2</a>)</span></dt>
-<dd><p>Would gain from support for attributes to inline
-roles (title argument). See <a class="reference external" href="http://docutils.sourceforge.net/docs/dev/todo.html#interpreted-text">TODO</a> <a class="footnote-reference brackets" href="#id39" id="id40">9</a></p>
+<dt class="label" id="attribute-optional"><span class="brackets">5</span><span class="fn-backref">(<a href="#id24">1</a>,<a href="#id29">2</a>,<a href="#id32">3</a>,<a href="#id33">4</a>)</span></dt>
+<dd><p>Would gain from support for attributes/arguments
+to inline roles. See <a class="reference external" href="http://docutils.sourceforge.net/docs/dev/todo.html#interpreted-text">TODO</a> <a class="footnote-reference brackets" href="#id42" id="id43">9</a></p>
</dd>
<dt class="label" id="attribute-required"><span class="brackets">6</span><span class="fn-backref">(<a href="#id27">1</a>,<a href="#id28">2</a>,<a href="#id30">3</a>)</span></dt>
<dd><p>Requires support for attributes to inline
@@ -1532,8 +1567,9 @@
</dd>
</dl>
</div>
+</div>
<div class="section" id="changes-to-the-html4css1-writer">
-<h1><a class="toc-backref" href="#id93"><span class="sectnum">4</span> Changes to the html4css1 writer</a></h1>
+<h1><a class="toc-backref" href="#id100"><span class="sectnum">4</span> Changes to the html4css1 writer</a></h1>
<ul class="simple">
<li><p>Use only meta keywords recognized by HTML 5.</p></li>
<li><p>Set table column widths with <style="width: ...">, not "width" argument.</p></li>
@@ -1544,7 +1580,7 @@
<li><p>Put subtitles in <p> elements.</p></li>
</ul>
<div class="section" id="field-list-handling">
-<h2><a class="toc-backref" href="#id94"><span class="sectnum">4.1</span> Field list handling</a></h2>
+<h2><a class="toc-backref" href="#id101"><span class="sectnum">4.1</span> Field list handling</a></h2>
<p>The following list demonstrates the problems with the html4css1
approach: the <cite>field-name-limit</cite> setting is given in "number of
characters" but the field name uses a proportional font.</p>
@@ -1588,11 +1624,11 @@
</dl>
</div>
<div class="section" id="styling-with-class-arguments">
-<h2><a class="toc-backref" href="#id95"><span class="sectnum">4.2</span> Styling with class arguments</a></h2>
+<h2><a class="toc-backref" href="#id102"><span class="sectnum">4.2</span> Styling with class arguments</a></h2>
<p>The <span class="docutils literal">plain.css</span> style sheet comes with some pre-defined style variants
that can be choosen via a class argument.</p>
<div class="section" id="description-lists">
-<h3><a class="toc-backref" href="#id96"><span class="sectnum">4.2.1</span> Description lists</a></h3>
+<h3><a class="toc-backref" href="#id103"><span class="sectnum">4.2.1</span> Description lists</a></h3>
<p>Definition lists with the "description" class argument:</p>
<dl class="description simple">
<dt>description lists</dt>
@@ -1608,7 +1644,7 @@
</dl>
</div>
<div class="section" id="field-list-variants">
-<h3><a class="toc-backref" href="#id97"><span class="sectnum">4.2.2</span> Field list variants</a></h3>
+<h3><a class="toc-backref" href="#id104"><span class="sectnum">4.2.2</span> Field list variants</a></h3>
<p>For field lists, the "compact/open", "narrow" and "run-in" styles are defined
in the style sheet <span class="docutils literal">plain.css</span>.</p>
<dl class="simple">
@@ -1675,9 +1711,9 @@
</dl>
</div>
<div class="section" id="table-variants">
-<h3><a class="toc-backref" href="#id98"><span class="sectnum">4.2.3</span> Table variants</a></h3>
+<h3><a class="toc-backref" href="#id105"><span class="sectnum">4.2.3</span> Table variants</a></h3>
<p>The following styles can be applied to individual tables via a class
-argument or as document wide setting with the <a class="reference external" href="http://docutils.sourceforge.net/docs/user/config.html#table-style">table-style</a> <a class="footnote-reference brackets" href="#id41" id="id42">10</a> configuration
+argument or as document wide setting with the <a class="reference external" href="http://docutils.sourceforge.net/docs/user/config.html#table-style">table-style</a> <a class="footnote-reference brackets" href="#id44" id="id45">10</a> configuration
setting (or command line argument).</p>
<ul>
<li><p>Numbered tables can be achieved with the "numbered" class option:</p>
@@ -1717,7 +1753,7 @@
common request and already on the <cite>TODO list</cite>.</p>
</li>
<li><p>A table with "booktabs" class value, is rendered similar to the style
-from the <a class="reference external" href="http://tug.ctan.org/tex-archive/macros/latex/contrib/booktabs/booktabs.pdf">booktabs</a> <a class="footnote-reference brackets" href="#id43" id="id44">11</a> LaTeX package.</p>
+from the <a class="reference external" href="http://tug.ctan.org/tex-archive/macros/latex/contrib/booktabs/booktabs.pdf">booktabs</a> <a class="footnote-reference brackets" href="#id46" id="id47">11</a> LaTeX package.</p>
</li>
</ul>
<p>"Booktabs" style table, numbered, centre-aligned, with auto-sized columns:</p>
@@ -1757,7 +1793,7 @@
</div>
</div>
<div class="section" id="error-handling">
-<h1><a class="toc-backref" href="#id99"><span class="sectnum">5</span> Error Handling</a></h1>
+<h1><a class="toc-backref" href="#id106"><span class="sectnum">5</span> Error Handling</a></h1>
<p>Any errors caught during processing will generate system messages.</p>
<p>There should be five messages in the following, auto-generated
section, "Docutils System Messages":</p>
@@ -1765,24 +1801,24 @@
</div>
<div class="system-messages section">
<h1>Docutils System Messages</h1>
-<div class="system-message" id="id31">
-<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 104); <em><a href="#id32">backlink</a></em></p>
+<div class="system-message" id="id34">
+<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 104); <em><a href="#id35">backlink</a></em></p>
<p>Undefined substitution referenced: "problematic".</p>
</div>
-<div class="system-message" id="id109">
+<div class="system-message" id="id116">
<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 392); <em><a href="#id17">backlink</a></em></p>
<p>Unknown target name: "5".</p>
</div>
-<div class="system-message" id="id110">
+<div class="system-message" id="id117">
<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 401); <em><a href="#id19">backlink</a></em></p>
<p>Unknown target name: "nonexistent".</p>
</div>
-<div class="system-message" id="id111">
-<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 428); <em><a href="#id112">backlink</a></em></p>
+<div class="system-message" id="id118">
+<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 428); <em><a href="#id119">backlink</a></em></p>
<p>Unknown target name: "hyperlink reference without a target".</p>
</div>
-<div class="system-message" id="id113">
-<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 441); <em><a href="#id114">backlink</a></em></p>
+<div class="system-message" id="id120">
+<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/standard.txt</span>, line 441); <em><a href="#id121">backlink</a></em></p>
<p>Duplicate target name, cannot be used as a unique reference: "duplicate target names".</p>
</div>
</div>
Modified: trunk/docutils/test/functional/input/html5-text-level-tags.txt
===================================================================
--- trunk/docutils/test/functional/input/html5-text-level-tags.txt 2019-09-30 21:01:03 UTC (rev 8401)
+++ trunk/docutils/test/functional/input/html5-text-level-tags.txt 2019-10-10 13:19:55 UTC (rev 8402)
@@ -1,5 +1,5 @@
Text-level semantics
-====================
+--------------------
`HTML 5 tags for representation of text-level semantics`__ and their
reStructuredText equivalents.
@@ -216,10 +216,41 @@
www.simply\ |wbr|\orange\ |wbr|\juice.com
+Indicating Edits
+----------------
-.. [#attribute-optional] Would gain from support for attributes to inline
- roles (title argument). See TODO_
+`HTML tags for representation of edits to the document`__ and their
+reStructuredText equivalents.
+__ https://html.spec.whatwg.org/multipage/edits.html
+
+:ins:
+ Additions [#attribute-optional]_
+
+ .. role:: ins
+
+ This text has "always" been here. :ins:`This text has been inserted.`
+
+ .. container:: ins
+
+ This paragraph has been inserted.
+
+
+:del:
+ Removed content [#attribute-optional]_
+
+ .. role:: del
+
+ :del:`This text has been deleted`, here is the rest of the paragraph.
+
+ .. container:: del
+
+ This paragraph has been deleted.
+
+
+.. [#attribute-optional] Would gain from support for attributes/arguments
+ to inline roles. See TODO_
+
.. [#attribute-required] Requires support for attributes to inline
roles to make sense.
Modified: trunk/docutils/test/functional/input/standalone_rst_html5.txt
===================================================================
--- trunk/docutils/test/functional/input/standalone_rst_html5.txt 2019-09-30 21:01:03 UTC (rev 8401)
+++ trunk/docutils/test/functional/input/standalone_rst_html5.txt 2019-10-10 13:19:55 UTC (rev 8402)
@@ -5,6 +5,10 @@
.. include:: data/table_complex.txt
.. include:: data/list_table.txt
.. include:: data/custom_roles.txt
+
+HTML specific
+=============
+
.. include:: data/svg_images.txt
.. include:: data/swf_images.txt
.. include:: html5-text-level-tags.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
