Skip to content

Commit 058479b

Browse files
authored
fix(text): Render ol and ul inside blockquote correctly (#1150)
Fixes #1148
1 parent f743092 commit 058479b

21 files changed

+634
-362
lines changed

tests/input/elements.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,6 +1052,32 @@ from the Cherokee block look similar to the ASCII characters
10521052
<blockquote quotedFrom="Benjamin Franklin">
10531053
Tell me and I forget. Teach me and I remember. Involve me and I learn.
10541054
</blockquote>
1055+
<blockquote>
1056+
<ul>
1057+
<li>First item</li>
1058+
<li>Second item</li>
1059+
<li>
1060+
<t>Third item</t>
1061+
<ul>
1062+
<li>First of third</li>
1063+
<li>Second of third</li>
1064+
</ul>
1065+
</li>
1066+
</ul>
1067+
</blockquote>
1068+
<blockquote>
1069+
<ol>
1070+
<li>First item</li>
1071+
<li>Second item</li>
1072+
<li>
1073+
<t>Third item</t>
1074+
<ol>
1075+
<li>First of third</li>
1076+
<li>Second of third</li>
1077+
</ol>
1078+
</li>
1079+
</ol>
1080+
</blockquote>
10551081
</aside>
10561082
<aside>
10571083
<t>This sentence has no word joiner 'wj' in the double-word.</t>

tests/valid/docfile.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<meta charset="utf-8">
55
<meta content="Cherokee,Common,Greek,Latin" name="scripts">
66
<meta content="initial-scale=1.0" name="viewport">
7-
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.21.0</title>
7+
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.22.0</title>
88
<meta content="xml2rfc(1)" name="author">
99
<meta content="
1010
1111
This document provides information about the XML schema implemented in this release of xml2rfc, and the individual elements of that schema. The document is generated from the RNG schema file that is part of the xml2rfc distribution, so schema information in this document should always be in sync with the schema in actual use. The textual descriptions depend on manual updates in order to reflect the implementation.
1212
1313
" name="description">
14-
<meta content="xml2rfc 3.21.0" name="generator">
15-
<meta content="xml2rfc-docs-3.21.0" name="ietf.draft">
14+
<meta content="xml2rfc 3.22.0" name="generator">
15+
<meta content="xml2rfc-docs-3.22.0" name="ietf.draft">
1616
<link href="tests/out/docfile.xml" rel="alternate" type="application/rfc+xml">
1717
<link href="#copyright" rel="license">
1818
<link href="xml2rfc.css" rel="stylesheet">
@@ -24,7 +24,7 @@
2424
<thead><tr>
2525
<td class="left"></td>
2626
<td class="center">Xml2rfc Vocabulary V3 Schema</td>
27-
<td class="right">April 2024</td>
27+
<td class="right">August 2024</td>
2828
</tr></thead>
2929
<tfoot><tr>
3030
<td class="left">xml2rfc(1)</td>
@@ -39,7 +39,7 @@
3939
<dd class="workgroup">xml2rfc(1)</dd>
4040
<dt class="label-published">Published:</dt>
4141
<dd class="published">
42-
<time datetime="2024-04-23" class="published">23 April 2024</time>
42+
<time datetime="2024-08-19" class="published">19 August 2024</time>
4343
</dd>
4444
<dt class="label-authors">Author:</dt>
4545
<dd class="authors">
@@ -49,7 +49,7 @@
4949
</dd>
5050
</dl>
5151
</div>
52-
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.21.0</h1>
52+
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.22.0</h1>
5353
<section id="section-abstract">
5454
<h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
5555
<p id="section-abstract-1">
@@ -371,7 +371,7 @@ <h2 id="name-introduction">
371371
<p id="section-1-5">
372372
The latest version of this documentation is available in HTML form at <span><a href="https://ietf-tools.github.io/xml2rfc/">https://ietf-tools.github.io/xml2rfc/</a></span>.<a href="#section-1-5" class="pilcrow"></a></p>
373373
<p id="section-1-6">
374-
This documentation applies to xml2rfc version 3.21.0.<a href="#section-1-6" class="pilcrow"></a></p>
374+
This documentation applies to xml2rfc version 3.22.0.<a href="#section-1-6" class="pilcrow"></a></p>
375375
</section>
376376
<section id="section-2">
377377
<h2 id="name-schema-version-3-elements">
@@ -6367,7 +6367,7 @@ <h2 id="name-xml2rfc-documentation-templ">
63676367
<p id="appendix-D-1">
63686368

63696369
The following variables are available for use in an xml2rfc
6370-
manpage Jinja2 template, as of xml2rfc version 3.21.0:<a href="#appendix-D-1" class="pilcrow"></a></p>
6370+
manpage Jinja2 template, as of xml2rfc version 3.22.0:<a href="#appendix-D-1" class="pilcrow"></a></p>
63716371
<span class="break"></span><dl class="dlNewline" id="appendix-D-2">
63726372
<dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
63736373
<dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>

tests/valid/draft-miek-test.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
This version is adapted to work with "xml2rfc" version 2.x.
1717
1818
' name="description">
19-
<meta content="xml2rfc 3.21.0" name="generator">
19+
<meta content="xml2rfc 3.22.0" name="generator">
2020
<meta content="RFC" name="keyword">
2121
<meta content="Request for Comments" name="keyword">
2222
<meta content="I-D" name="keyword">
@@ -26,19 +26,19 @@
2626
<meta content="Extensible Markup Language" name="keyword">
2727
<meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
2828
<!-- Generator version information:
29-
xml2rfc 3.21.0
30-
Python 3.10.12
29+
xml2rfc 3.22.0
30+
Python 3.12.4
3131
ConfigArgParse 1.7
3232
google-i18n-address 3.1.0
3333
intervaltree 3.1.0
34-
Jinja2 3.1.3
34+
Jinja2 3.1.4
3535
lxml 4.9.4
36-
platformdirs 4.2.0
37-
pycountry 23.12.11
38-
PyYAML 6.0.1
39-
requests 2.31.0
40-
setuptools 69.0.2
41-
six 1.16.0
36+
platformdirs 4.2.2
37+
pycountry 24.6.1
38+
pydyf 0.10.0
39+
PyYAML 6.0.2
40+
requests 2.32.3
41+
setuptools 72.2.0
4242
wcwidth 0.2.13
4343
weasyprint 61.2
4444
-->

tests/valid/draft-template.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
Insert an abstract: MANDATORY. This template is for creating an
1212
Internet Draft.
1313
" name="description">
14-
<meta content="xml2rfc 3.21.0" name="generator">
14+
<meta content="xml2rfc 3.22.0" name="generator">
1515
<meta content="template" name="keyword">
1616
<meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
1717
<!-- Generator version information:
18-
xml2rfc 3.21.0
19-
Python 3.10.12
18+
xml2rfc 3.22.0
19+
Python 3.12.4
2020
ConfigArgParse 1.7
2121
google-i18n-address 3.1.0
2222
intervaltree 3.1.0
23-
Jinja2 3.1.3
23+
Jinja2 3.1.4
2424
lxml 4.9.4
25-
platformdirs 4.2.0
26-
pycountry 23.12.11
27-
PyYAML 6.0.1
28-
requests 2.31.0
29-
setuptools 69.0.2
30-
six 1.16.0
25+
platformdirs 4.2.2
26+
pycountry 24.6.1
27+
pydyf 0.10.0
28+
PyYAML 6.0.2
29+
requests 2.32.3
30+
setuptools 72.2.0
3131
wcwidth 0.2.13
3232
weasyprint 61.2
3333
-->

0 commit comments

Comments
 (0)