fix(v2v3): Preserve t element in ol and li (#972)

* fix(v2v3): Preserve t element in ol and li This change preserves `<t>` elements inside `<ol>` and `<li>` elements on v2v3 conversion. Fixes #850
ietf-tools · Aug 30, 2023 · 0704155 · 0704155
1 parent 02253d8
commit 0704155
Show file tree

Hide file tree

Showing 24 changed files with 2,365 additions and 943 deletions.
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html
diff --git a/tests/valid/draft-miek-test.prepped.xml b/tests/valid/draft-miek-test.prepped.xml
diff --git a/tests/valid/draft-miek-test.v2v3.xml b/tests/valid/draft-miek-test.v2v3.xml
diff --git a/tests/valid/draft-miek-test.v3.html b/tests/valid/draft-miek-test.v3.html
diff --git a/tests/valid/draft-template-old.prepped.xml b/tests/valid/draft-template-old.prepped.xml
diff --git a/tests/valid/draft-template-old.v2v3.xml b/tests/valid/draft-template-old.v2v3.xml
diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
diff --git a/tests/valid/draft-template.prepped.xml b/tests/valid/draft-template.prepped.xml
diff --git a/tests/valid/draft-template.v2v3.xml b/tests/valid/draft-template.v2v3.xml
diff --git a/tests/valid/draft-template.v3.html b/tests/valid/draft-template.v3.html
diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                           August 21, 2023
+Internet-Draft                                           August 29, 2023
 Intended status: Experimental                                           
-Expires: February 22, 2024
+Expires: March 1, 2024
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on February 22, 2024.
+   This Internet-Draft will expire on March 1, 2024.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                  Expires February 22, 2024               [Page 1]
+Person                    Expires March 1, 2024                 [Page 1]
 
 Internet-Draft             xml2rfc index tests               August 2023
 
@@ -109,7 +109,7 @@ Index
 
 
 
-Person                  Expires February 22, 2024               [Page 2]
+Person                    Expires March 1, 2024                 [Page 2]
 
 Internet-Draft             xml2rfc index tests               August 2023
 
@@ -165,4 +165,4 @@ Author's Address
 
 
 
-Person                  Expires February 22, 2024               [Page 3]
+Person                    Expires March 1, 2024                 [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2023-08-21T04:28:58" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2023-08-29T11:20:28" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.18.0 -->
 
 
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="21" month="08" year="2023"/>
+    <date day="29" month="08" year="2023"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 22 February 2024.
+        This Internet-Draft will expire on 1 March 2024.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">

diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                           August 21, 2023
+Internet-Draft                                           August 29, 2023
 Intended status: Experimental                                           
-Expires: February 22, 2024
+Expires: March 1, 2024
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on February 22, 2024.
+   This Internet-Draft will expire on March 1, 2024.
 
 Copyright Notice
 

diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires February 22, 2024</td>
+<td class="center">Expires March 1, 2024</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">indexes-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2023-08-21" class="published">August 21, 2023</time>
+<time datetime="2023-08-29" class="published">August 29, 2023</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2024-02-22">February 22, 2024</time></dd>
+<dd class="expires"><time datetime="2024-03-01">March 1, 2024</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-status-of-this-memo">
         time. It is inappropriate to use Internet-Drafts as reference
         material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on February 22, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on March 1, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">

diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
@@ -1,5 +1,5 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                          21 August 2023
+                                                          29 August 2023
 
 
                   Xml2rfc Vocabulary Version 3 Schema

diff --git a/tests/valid/rfc7911.html b/tests/valid/rfc7911.html
@@ -1460,27 +1460,31 @@ <h2 id="name-add-path-capability">
 <li class="normal ulEmpty" id="section-4-4.1">
           <p id="section-4-4.1.1">Address Family Identifier (AFI):<a href="#section-4-4.1.1" class="pilcrow">¶</a></p>
 <ul class="normal">
-<li class="normal" id="section-4-4.1.2.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.1.2.1" class="pilcrow">¶</a>
+<li class="normal" id="section-4-4.1.2.1">
+              <p id="section-4-4.1.2.1.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.1.2.1.1" class="pilcrow">¶</a></p>
 </li>
           </ul>
 </li>
         <li class="normal ulEmpty" id="section-4-4.2">
           <p id="section-4-4.2.1">Subsequent Address Family Identifier (SAFI):<a href="#section-4-4.2.1" class="pilcrow">¶</a></p>
 <ul class="normal">
-<li class="normal" id="section-4-4.2.2.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.2.2.1" class="pilcrow">¶</a>
+<li class="normal" id="section-4-4.2.2.1">
+              <p id="section-4-4.2.2.1.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.2.2.1.1" class="pilcrow">¶</a></p>
 </li>
           </ul>
 </li>
         <li class="normal ulEmpty" id="section-4-4.3">
           <p id="section-4-4.3.1">Send/Receive:<a href="#section-4-4.3.1" class="pilcrow">¶</a></p>
 <ul class="normal">
-<li class="normal" id="section-4-4.3.2.1">This field indicates whether the sender is (a) able to
+<li class="normal" id="section-4-4.3.2.1">
+              <p id="section-4-4.3.2.1.1">This field indicates whether the sender is (a) able to
               receive multiple paths from its peer (value 1), (b) able to send
               multiple paths to its peer (value 2), or (c) both (value 3) for
-              the &lt;AFI, SAFI&gt;.<a href="#section-4-4.3.2.1" class="pilcrow">¶</a>
+              the &lt;AFI, SAFI&gt;.<a href="#section-4-4.3.2.1.1" class="pilcrow">¶</a></p>
 </li>
-            <li class="normal" id="section-4-4.3.2.2">If any other value is received, then the capability SHOULD be
-              treated as not understood and ignored <span>[<a href="#RFC5492" class="cite xref">RFC5492</a>]</span>.<a href="#section-4-4.3.2.2" class="pilcrow">¶</a>
+            <li class="normal" id="section-4-4.3.2.2">
+              <p id="section-4-4.3.2.2.1">If any other value is received, then the capability SHOULD be
+              treated as not understood and ignored <span>[<a href="#RFC5492" class="cite xref">RFC5492</a>]</span>.<a href="#section-4-4.3.2.2.1" class="pilcrow">¶</a></p>
 </li>
           </ul>
 </li>

diff --git a/tests/valid/rfc7911.prepped.xml b/tests/valid/rfc7911.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" number="7911" category="std" consensus="true" submissionType="IETF" ipr="trust200902" docName="draft-ietf-idr-add-paths" obsoletes="" updates="" xml:lang="en" tocInclude="true" sortRefs="true" symRefs="true" prepTime="2023-08-02T01:28:17" indexInclude="true" scripts="Common,Latin" tocDepth="3">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" number="7911" category="std" consensus="true" submissionType="IETF" ipr="trust200902" docName="draft-ietf-idr-add-paths" obsoletes="" updates="" xml:lang="en" tocInclude="true" sortRefs="true" symRefs="true" prepTime="2023-08-29T11:29:51" indexInclude="true" scripts="Common,Latin" tocDepth="3">
   <link href="https://dx.doi.org/10.17487/rfc7911" rel="alternate"/>
   <link href="urn:issn:2070-1721" rel="alternate"/>
   <link href="https://datatracker.ietf.org/doc/draft-ietf-idr-add-paths" rel="prev"/>
@@ -241,24 +241,32 @@
         <li pn="section-4-4.1">
           <t indent="0" pn="section-4-4.1.1">Address Family Identifier (AFI): </t>
           <ul spacing="normal" bare="false" empty="false" indent="3" pn="section-4-4.1.2">
-            <li pn="section-4-4.1.2.1">This field is the same as the one used in <xref format="default" target="RFC4760" sectionFormat="of" derivedContent="RFC4760"/>.</li>
+            <li pn="section-4-4.1.2.1">
+              <t indent="0" pn="section-4-4.1.2.1.1">This field is the same as the one used in <xref format="default" target="RFC4760" sectionFormat="of" derivedContent="RFC4760"/>.</t>
+            </li>
           </ul>
         </li>
         <li pn="section-4-4.2">
           <t indent="0" pn="section-4-4.2.1">Subsequent Address Family Identifier (SAFI): </t>
           <ul spacing="normal" bare="false" empty="false" indent="3" pn="section-4-4.2.2">
-            <li pn="section-4-4.2.2.1">This field is the same as the one used in <xref format="default" target="RFC4760" sectionFormat="of" derivedContent="RFC4760"/>.</li>
+            <li pn="section-4-4.2.2.1">
+              <t indent="0" pn="section-4-4.2.2.1.1">This field is the same as the one used in <xref format="default" target="RFC4760" sectionFormat="of" derivedContent="RFC4760"/>.</t>
+            </li>
           </ul>
         </li>
         <li pn="section-4-4.3">
           <t indent="0" pn="section-4-4.3.1">Send/Receive: </t>
           <ul spacing="normal" bare="false" empty="false" indent="3" pn="section-4-4.3.2">
-            <li pn="section-4-4.3.2.1">This field indicates whether the sender is (a) able to
+            <li pn="section-4-4.3.2.1">
+              <t indent="0" pn="section-4-4.3.2.1.1">This field indicates whether the sender is (a) able to
               receive multiple paths from its peer (value 1), (b) able to send
               multiple paths to its peer (value 2), or (c) both (value 3) for
-              the &lt;AFI, SAFI&gt;.</li>
-            <li pn="section-4-4.3.2.2">If any other value is received, then the capability SHOULD be
-              treated as not understood and ignored <xref format="default" target="RFC5492" sectionFormat="of" derivedContent="RFC5492"/>.</li>
+              the &lt;AFI, SAFI&gt;.</t>
+            </li>
+            <li pn="section-4-4.3.2.2">
+              <t indent="0" pn="section-4-4.3.2.2.1">If any other value is received, then the capability SHOULD be
+              treated as not understood and ignored <xref format="default" target="RFC5492" sectionFormat="of" derivedContent="RFC5492"/>.</t>
+            </li>
           </ul>
         </li>
       </ul>

diff --git a/tests/valid/rfc7911.v2v3.xml b/tests/valid/rfc7911.v2v3.xml
@@ -11,7 +11,7 @@
 <?rfc compact="yes"?>
 <?rfc subcompact="no"?>
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" number="7911" category="std" consensus="true" submissionType="IETF" ipr="trust200902" docName="draft-ietf-idr-add-paths" obsoletes="" updates="" xml:lang="en" tocInclude="true" sortRefs="true" symRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.17.5 -->
+  <!-- xml2rfc v2v3 conversion 3.18.0 -->
   <link href="https://datatracker.ietf.org/doc/draft-ietf-idr-add-paths" rel="prev"/>
   <front>
     <title abbrev="ADD-PATH">Advertisement of Multiple Paths in BGP</title>
@@ -159,24 +159,32 @@
         <li>
           <t>Address Family Identifier (AFI): </t>
           <ul spacing="normal">
-            <li>This field is the same as the one used in <xref format="default" target="RFC4760"/>.</li>
+            <li>
+              <t>This field is the same as the one used in <xref format="default" target="RFC4760"/>.</t>
+            </li>
           </ul>
         </li>
         <li>
           <t>Subsequent Address Family Identifier (SAFI): </t>
           <ul spacing="normal">
-            <li>This field is the same as the one used in <xref format="default" target="RFC4760"/>.</li>
+            <li>
+              <t>This field is the same as the one used in <xref format="default" target="RFC4760"/>.</t>
+            </li>
           </ul>
         </li>
         <li>
           <t>Send/Receive: </t>
           <ul spacing="normal">
-            <li>This field indicates whether the sender is (a) able to
+            <li>
+              <t>This field indicates whether the sender is (a) able to
               receive multiple paths from its peer (value 1), (b) able to send
               multiple paths to its peer (value 2), or (c) both (value 3) for
-              the &lt;AFI, SAFI&gt;.</li>
-            <li>If any other value is received, then the capability SHOULD be
-              treated as not understood and ignored <xref format="default" target="RFC5492"/>.</li>
+              the &lt;AFI, SAFI&gt;.</t>
+            </li>
+            <li>
+              <t>If any other value is received, then the capability SHOULD be
+              treated as not understood and ignored <xref format="default" target="RFC5492"/>.</t>
+            </li>
           </ul>
         </li>
       </ul>

diff --git a/tests/valid/rfc7911.v3.html b/tests/valid/rfc7911.v3.html
@@ -16,7 +16,7 @@
       that each path is identified by a Path Identifier in addition to the
       address prefix. 
     " name="description">
-<meta content="xml2rfc 3.15.3" name="generator">
+<meta content="xml2rfc 3.18.0" name="generator">
 <meta content="7911" name="rfc.number">
 <link href="tests/input/rfc7911.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -280,27 +280,31 @@ <h2 id="name-add-path-capability">
 <li class="normal ulEmpty" id="section-4-4.1">
           <p id="section-4-4.1.1">Address Family Identifier (AFI):<a href="#section-4-4.1.1" class="pilcrow">¶</a></p>
 <ul class="normal">
-<li class="normal" id="section-4-4.1.2.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.1.2.1" class="pilcrow">¶</a>
+<li class="normal" id="section-4-4.1.2.1">
+              <p id="section-4-4.1.2.1.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.1.2.1.1" class="pilcrow">¶</a></p>
 </li>
           </ul>
 </li>
         <li class="normal ulEmpty" id="section-4-4.2">
           <p id="section-4-4.2.1">Subsequent Address Family Identifier (SAFI):<a href="#section-4-4.2.1" class="pilcrow">¶</a></p>
 <ul class="normal">
-<li class="normal" id="section-4-4.2.2.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.2.2.1" class="pilcrow">¶</a>
+<li class="normal" id="section-4-4.2.2.1">
+              <p id="section-4-4.2.2.1.1">This field is the same as the one used in <span>[<a href="#RFC4760" class="cite xref">RFC4760</a>]</span>.<a href="#section-4-4.2.2.1.1" class="pilcrow">¶</a></p>
 </li>
           </ul>
 </li>
         <li class="normal ulEmpty" id="section-4-4.3">
           <p id="section-4-4.3.1">Send/Receive:<a href="#section-4-4.3.1" class="pilcrow">¶</a></p>
 <ul class="normal">
-<li class="normal" id="section-4-4.3.2.1">This field indicates whether the sender is (a) able to
+<li class="normal" id="section-4-4.3.2.1">
+              <p id="section-4-4.3.2.1.1">This field indicates whether the sender is (a) able to
               receive multiple paths from its peer (value 1), (b) able to send
               multiple paths to its peer (value 2), or (c) both (value 3) for
-              the &lt;AFI, SAFI&gt;.<a href="#section-4-4.3.2.1" class="pilcrow">¶</a>
+              the &lt;AFI, SAFI&gt;.<a href="#section-4-4.3.2.1.1" class="pilcrow">¶</a></p>
 </li>
-            <li class="normal" id="section-4-4.3.2.2">If any other value is received, then the capability SHOULD be
-              treated as not understood and ignored <span>[<a href="#RFC5492" class="cite xref">RFC5492</a>]</span>.<a href="#section-4-4.3.2.2" class="pilcrow">¶</a>
+            <li class="normal" id="section-4-4.3.2.2">
+              <p id="section-4-4.3.2.2.1">If any other value is received, then the capability SHOULD be
+              treated as not understood and ignored <span>[<a href="#RFC5492" class="cite xref">RFC5492</a>]</span>.<a href="#section-4-4.3.2.2.1" class="pilcrow">¶</a></p>
 </li>
           </ul>
 </li>

diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.pages.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                           August 21, 2023
+Internet-Draft                                           August 29, 2023
 Intended status: Experimental                                           
-Expires: February 22, 2024
+Expires: March 1, 2024
 
 
                         xml2rfc sourcecode tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on February 22, 2024.
+   This Internet-Draft will expire on March 1, 2024.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                  Expires February 22, 2024               [Page 1]
+Person                    Expires March 1, 2024                 [Page 1]
 
 Internet-Draft          xml2rfc sourcecode tests             August 2023
 
@@ -109,7 +109,7 @@ Internet-Draft          xml2rfc sourcecode tests             August 2023
 
 
 
-Person                  Expires February 22, 2024               [Page 2]
+Person                    Expires March 1, 2024                 [Page 2]
 
 Internet-Draft          xml2rfc sourcecode tests             August 2023
 
@@ -165,7 +165,7 @@ Internet-Draft          xml2rfc sourcecode tests             August 2023
 
 
 
-Person                  Expires February 22, 2024               [Page 3]
+Person                    Expires March 1, 2024                 [Page 3]
 
 Internet-Draft          xml2rfc sourcecode tests             August 2023
 
@@ -221,4 +221,4 @@ Author's Address
 
 
 
-Person                  Expires February 22, 2024               [Page 4]
+Person                    Expires March 1, 2024                 [Page 4]