fix(text): Render ol and ul inside blockquote correctly (#1150)

Fixes #1148
ietf-tools · Aug 21, 2024 · 058479b · 058479b
1 parent f743092
commit 058479b
Show file tree

Hide file tree

Showing 21 changed files with 634 additions and 362 deletions.
diff --git a/tests/input/elements.xml b/tests/input/elements.xml
@@ -1052,6 +1052,32 @@ from the Cherokee block look similar to the ASCII characters
              <blockquote quotedFrom="Benjamin Franklin">
                 Tell me and I forget. Teach me and I remember. Involve me and I learn.
              </blockquote>
+             <blockquote>
+               <ul>
+                 <li>First item</li>
+                 <li>Second item</li>
+                 <li>
+                   <t>Third item</t>
+                   <ul>
+                     <li>First of third</li>
+                     <li>Second of third</li>
+                   </ul>
+                 </li>
+               </ul>
+             </blockquote>
+             <blockquote>
+               <ol>
+                 <li>First item</li>
+                 <li>Second item</li>
+                 <li>
+                   <t>Third item</t>
+                   <ol>
+                     <li>First of third</li>
+                     <li>Second of third</li>
+                   </ol>
+                 </li>
+               </ol>
+             </blockquote>
          </aside>
          <aside>
             <t>This sentence has no word joiner 'wj' in the double-word.</t>

diff --git a/tests/valid/docfile.html b/tests/valid/docfile.html
@@ -4,15 +4,15 @@
 <meta charset="utf-8">
 <meta content="Cherokee,Common,Greek,Latin" name="scripts">
 <meta content="initial-scale=1.0" name="viewport">
-<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.21.0</title>
+<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.22.0</title>
 <meta content="xml2rfc(1)" name="author">
 <meta content="
        
        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.
        
     " name="description">
-<meta content="xml2rfc 3.21.0" name="generator">
-<meta content="xml2rfc-docs-3.21.0" name="ietf.draft">
+<meta content="xml2rfc 3.22.0" name="generator">
+<meta content="xml2rfc-docs-3.22.0" name="ietf.draft">
 <link href="tests/out/docfile.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
 <link href="xml2rfc.css" rel="stylesheet">
@@ -24,7 +24,7 @@
 <thead><tr>
 <td class="left"></td>
 <td class="center">Xml2rfc Vocabulary V3 Schema</td>
-<td class="right">April 2024</td>
+<td class="right">August 2024</td>
 </tr></thead>
 <tfoot><tr>
 <td class="left">xml2rfc(1)</td>
@@ -39,7 +39,7 @@
 <dd class="workgroup">xml2rfc(1)</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2024-04-23" class="published">23 April 2024</time>
+<time datetime="2024-08-19" class="published">19 August 2024</time>
     </dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
@@ -49,7 +49,7 @@
 </dd>
 </dl>
 </div>
-<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.21.0</h1>
+<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.22.0</h1>
 <section id="section-abstract">
       <h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
 <p id="section-abstract-1">
@@ -371,7 +371,7 @@ <h2 id="name-introduction">
 <p id="section-1-5">
        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>
 <p id="section-1-6">
-            This documentation applies to xml2rfc version 3.21.0.<a href="#section-1-6" class="pilcrow">¶</a></p>
+            This documentation applies to xml2rfc version 3.22.0.<a href="#section-1-6" class="pilcrow">¶</a></p>
 </section>
 <section id="section-2">
       <h2 id="name-schema-version-3-elements">
@@ -6367,7 +6367,7 @@ <h2 id="name-xml2rfc-documentation-templ">
 <p id="appendix-D-1">
 
             The following variables are available for use in an xml2rfc
-            manpage Jinja2 template, as of xml2rfc version 3.21.0:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
+            manpage Jinja2 template, as of xml2rfc version 3.22.0:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
 <span class="break"></span><dl class="dlNewline" id="appendix-D-2">
         <dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
         <dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>

diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html
@@ -16,7 +16,7 @@
             This version is adapted to work with "xml2rfc" version 2.x.  
        
     ' name="description">
-<meta content="xml2rfc 3.21.0" name="generator">
+<meta content="xml2rfc 3.22.0" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -26,19 +26,19 @@
 <meta content="Extensible Markup Language" name="keyword">
 <meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.21.0
-    Python 3.10.12
+  xml2rfc 3.22.0
+    Python 3.12.4
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
     intervaltree 3.1.0
-    Jinja2 3.1.3
+    Jinja2 3.1.4
     lxml 4.9.4
-    platformdirs 4.2.0
-    pycountry 23.12.11
-    PyYAML 6.0.1
-    requests 2.31.0
-    setuptools 69.0.2
-    six 1.16.0
+    platformdirs 4.2.2
+    pycountry 24.6.1
+    pydyf 0.10.0
+    PyYAML 6.0.2
+    requests 2.32.3
+    setuptools 72.2.0
     wcwidth 0.2.13
     weasyprint 61.2
 -->

diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
@@ -11,23 +11,23 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 3.21.0" name="generator">
+<meta content="xml2rfc 3.22.0" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.21.0
-    Python 3.10.12
+  xml2rfc 3.22.0
+    Python 3.12.4
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
     intervaltree 3.1.0
-    Jinja2 3.1.3
+    Jinja2 3.1.4
     lxml 4.9.4
-    platformdirs 4.2.0
-    pycountry 23.12.11
-    PyYAML 6.0.1
-    requests 2.31.0
-    setuptools 69.0.2
-    six 1.16.0
+    platformdirs 4.2.2
+    pycountry 24.6.1
+    pydyf 0.10.0
+    PyYAML 6.0.2
+    requests 2.32.3
+    setuptools 72.2.0
     wcwidth 0.2.13
     weasyprint 61.2
 -->