fix: Respect newline attr on dl tag (#1047)

* test: Run yestests before change * fix: Calc space for <dt> correctly; refactor Trying to make the intention clearer... * test: Update yestests * test: Fix pre-change yestests Previous commits had a stale reference cache * test: Run yestests with changes
ietf-tools · Oct 12, 2023 · cb10344 · cb10344
1 parent ff2ceff
commit cb10344
Show file tree

Hide file tree

Showing 34 changed files with 152 additions and 150 deletions.
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.18.0</title>
+<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.18.1</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.18.0" name="generator">
-<meta content="xml2rfc-docs-3.18.0" name="ietf.draft">
+<meta content="xml2rfc 3.18.1" name="generator">
+<meta content="xml2rfc-docs-3.18.1" 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">September 2023</td>
+<td class="right">October 2023</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="2023-09-27" class="published">27 September 2023</time>
+<time datetime="2023-10-11" class="published">11 October 2023</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.18.0</h1>
+<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.18.1</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.18.0.<a href="#section-1-6" class="pilcrow">¶</a></p>
+            This documentation applies to xml2rfc version 3.18.1.<a href="#section-1-6" class="pilcrow">¶</a></p>
 </section>
 <section id="section-2">
       <h2 id="name-schema-version-3-elements">
@@ -6366,7 +6366,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.18.0:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
+            manpage Jinja2 template, as of xml2rfc version 3.18.1:<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.18.0" name="generator">
+<meta content="xml2rfc 3.18.1" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -26,20 +26,20 @@
 <meta content="Extensible Markup Language" name="keyword">
 <meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.18.0
+  xml2rfc 3.18.1
     Python 3.10.12
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
     intervaltree 3.1.0
     Jinja2 3.1.2
     lxml 4.9.3
-    platformdirs 3.10.0
+    platformdirs 3.11.0
     pycountry 22.3.5
     PyYAML 6.0.1
     requests 2.31.0
     setuptools 68.2.0
     six 1.16.0
-    wcwidth 0.2.7
+    wcwidth 0.2.8
     weasyprint 60.1
 -->
 <link href="tests/input/draft-miek-test.xml" rel="alternate" type="application/rfc+xml">

diff --git a/tests/valid/draft-template-old.exp.xml b/tests/valid/draft-template-old.exp.xml
@@ -545,7 +545,7 @@ main(int argc, char *argv[])
       </reference>
 
       <!-- Reference with query argument -->
-      <reference anchor="DOI_10.1145_2975159" target="http://dx.doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
+      <reference anchor="DOI_10.1145_2975159" target="https://doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
   <front>
     <title>Jupiter rising</title>
     <author fullname="Arjun Singh" surname="Singh">

diff --git a/tests/valid/draft-template-old.html b/tests/valid/draft-template-old.html
@@ -398,7 +398,7 @@
 <link href="#rfc.authors" rel="Chapter">
 
 
-  <meta name="generator" content="xml2rfc version 3.15.3 - https://tools.ietf.org/tools/xml2rfc" />
+  <meta name="generator" content="xml2rfc version 3.18.1 - https://tools.ietf.org/tools/xml2rfc" />
   <link rel="schema.dct" href="http://purl.org/dc/terms/" />
 
   <meta name="dct.creator" content="Davies, E.B., Ed. and Q. Zhao" />
@@ -900,7 +900,7 @@ <h1 id="rfc.references.2">
 <tr>
 <td class="reference"><b id="DOI_10.1145_2975159">[DOI_10.1145_2975159]</b></td>
 <td class="top">
-<a title="Google, Inc.">Singh, A.</a>, <a title="Google, Inc.">Ong, J.</a>, <a title="Google, Inc.">Agarwal, A.</a>, <a title="Google, Inc.">Anderson, G.</a>, <a title="Google, Inc.">Armistead, A.</a>, <a title="Google, Inc.">Bannon, R.</a>, <a title="Google, Inc.">Boving, S.</a>, <a title="Google, Inc.">Desai, G.</a>, <a title="Google, Inc.">Felderman, B.</a>, <a title="Google, Inc.">Germano, P.</a>, <a title="Google, Inc.">Kanagala, A.</a>, <a title="Google, Inc.">Liu, H.</a>, <a title="Google, Inc.">Provost, J.</a>, <a title="Google, Inc.">Simmons, J.</a>, <a title="Google, Inc.">Tanda, E.</a>, <a title="Google, Inc.">Wanderer, J.</a>, <a title="Google, Inc.">H&#246;lzle, U.</a>, <a title="Google, Inc.">Stuart, S.</a>, <a title="Google, Inc.">Vahdat, A.</a> and <a>Association for Computing Machinery (ACM)</a>, "<a href="http://dx.doi.org/10.1145/2975159">Jupiter rising</a>", DOI 10.1145/2975159, August 2016.</td>
+<a title="Google, Inc.">Singh, A.</a>, <a title="Google, Inc.">Ong, J.</a>, <a title="Google, Inc.">Agarwal, A.</a>, <a title="Google, Inc.">Anderson, G.</a>, <a title="Google, Inc.">Armistead, A.</a>, <a title="Google, Inc.">Bannon, R.</a>, <a title="Google, Inc.">Boving, S.</a>, <a title="Google, Inc.">Desai, G.</a>, <a title="Google, Inc.">Felderman, B.</a>, <a title="Google, Inc.">Germano, P.</a>, <a title="Google, Inc.">Kanagala, A.</a>, <a title="Google, Inc.">Liu, H.</a>, <a title="Google, Inc.">Provost, J.</a>, <a title="Google, Inc.">Simmons, J.</a>, <a title="Google, Inc.">Tanda, E.</a>, <a title="Google, Inc.">Wanderer, J.</a>, <a title="Google, Inc.">H&#246;lzle, U.</a>, <a title="Google, Inc.">Stuart, S.</a>, <a title="Google, Inc.">Vahdat, A.</a> and <a>Association for Computing Machinery (ACM)</a>, "<a href="https://doi.org/10.1145/2975159">Jupiter rising</a>", DOI 10.1145/2975159, August 2016.</td>
 </tr>
 <tr>
 <td class="reference"><b id="DOMINATION">[DOMINATION]</b></td>

diff --git a/tests/valid/draft-template-old.nroff b/tests/valid/draft-template-old.nroff
@@ -1,4 +1,4 @@
-.\" automatically generated by xml2rfc v3.15.3 on 2023-01-17T08:46:46Z
+.\" automatically generated by xml2rfc v3.18.1 on 2023-10-11T14:23:54Z
 
 .pl 10.0i
 .po 0
@@ -665,7 +665,7 @@ Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons,
 J., Tanda, E., Wanderer, J., Hoelzle, U., Stuart, S.,
 Vahdat, A., and Association for Computing Machinery (ACM),
 "Jupiter rising", DOI\010.1145/2975159, August 2016,
-<http://dx.doi.org/10.1145/2975159>.
+<https://doi.org/10.1145/2975159>.
 .in 3
 
 [DOMINATION]

diff --git a/tests/valid/draft-template-old.prepped.xml b/tests/valid/draft-template-old.prepped.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" obsoletes="" updates="" submissionType="IETF" xml:lang="en" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" consensus="false" prepTime="2023-08-29T11:29:38" indexInclude="true" scripts="Common,Latin">
-  <!-- xml2rfc v2v3 conversion 3.18.0 -->
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" obsoletes="" updates="" submissionType="IETF" xml:lang="en" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" consensus="false" prepTime="2023-10-11T14:23:55" indexInclude="true" scripts="Common,Latin">
+  <!-- xml2rfc v2v3 conversion 3.18.1 -->
 
 
 
@@ -742,7 +742,7 @@ main(int argc, char *argv[])
 
       <!-- Reference with query argument -->
       <!-- A reference written by by an organization not a person. -->
-        <reference anchor="DOI_10.1145_2975159" target="http://dx.doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml" quoteTitle="true" derivedAnchor="DOI_10.1145_2975159">
+        <reference anchor="DOI_10.1145_2975159" target="https://doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml" quoteTitle="true" derivedAnchor="DOI_10.1145_2975159">
           <front>
             <title>Jupiter rising</title>
             <author fullname="Arjun Singh" surname="Singh">

diff --git a/tests/valid/draft-template-old.raw.txt b/tests/valid/draft-template-old.raw.txt
@@ -452,7 +452,7 @@ Table of Contents
               J., Tanda, E., Wanderer, J., Hoelzle, U., Stuart, S.,
               Vahdat, A., and Association for Computing Machinery (ACM),
               "Jupiter rising", DOI 10.1145/2975159, August 2016,
-              <http://dx.doi.org/10.1145/2975159>.
+              <https://doi.org/10.1145/2975159>.
 
    [DOMINATION]
               Mad Dominators, Inc., "Ultimate Plan for Taking Over the

diff --git a/tests/valid/draft-template-old.txt b/tests/valid/draft-template-old.txt
@@ -542,7 +542,7 @@ Internet-Draft              Abbreviated Title                 March 2009
               J., Tanda, E., Wanderer, J., Hoelzle, U., Stuart, S.,
               Vahdat, A., and Association for Computing Machinery (ACM),
               "Jupiter rising", DOI 10.1145/2975159, August 2016,
-              <http://dx.doi.org/10.1145/2975159>.
+              <https://doi.org/10.1145/2975159>.
 
    [DOMINATION]
               Mad Dominators, Inc., "Ultimate Plan for Taking Over the

diff --git a/tests/valid/draft-template-old.v2v3.xml b/tests/valid/draft-template-old.v2v3.xml
@@ -33,7 +33,7 @@
 <?rfc multiple-initials="yes" ?>
 <!-- end of list of popular I-D processing instructions -->
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" obsoletes="" updates="" submissionType="IETF" xml:lang="en" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.18.0 -->
+  <!-- xml2rfc v2v3 conversion 3.18.1 -->
   <?v3xml2rfc silence=".*[Pp]ostal address" ?>
   <?v3xml2rfc silence="The document date .*? is more than 3 days away from today's date" ?>
   <?v3xml2rfc silence="Found SVG with width or height specified" ?>
@@ -689,7 +689,7 @@ main(int argc, char *argv[])
           <seriesInfo name="Internet-Draft" value="draft-narten-iana-considerations-rfc2434bis-09"/>
         </reference>
         <!-- Reference with query argument -->
-      <reference anchor="DOI_10.1145_2975159" target="http://dx.doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
+      <reference anchor="DOI_10.1145_2975159" target="https://doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
           <front>
             <title>Jupiter rising</title>
             <author fullname="Arjun Singh" surname="Singh">

diff --git a/tests/valid/draft-template.exp.xml b/tests/valid/draft-template.exp.xml
@@ -485,7 +485,7 @@ main(int argc, char *argv[])
         <seriesInfo name="Internet-Draft" value="draft-narten-iana-considerations-rfc2434bis-09"/>
       </reference>
       <!-- Reference with query argument -->
-      <reference anchor="DOI_10.1145_2975159" target="http://dx.doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
+      <reference anchor="DOI_10.1145_2975159" target="https://doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
         <front>
           <title>Jupiter rising</title>
           <author fullname="Arjun Singh" surname="Singh">

diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
@@ -11,24 +11,24 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 3.18.0" name="generator">
+<meta content="xml2rfc 3.18.1" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.18.0
+  xml2rfc 3.18.1
     Python 3.10.12
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
     intervaltree 3.1.0
     Jinja2 3.1.2
     lxml 4.9.3
-    platformdirs 3.10.0
+    platformdirs 3.11.0
     pycountry 22.3.5
     PyYAML 6.0.1
     requests 2.31.0
     setuptools 68.2.0
     six 1.16.0
-    wcwidth 0.2.7
+    wcwidth 0.2.8
     weasyprint 60.1
 -->
 <link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">

diff --git a/tests/valid/draft-template.pages.text b/tests/valid/draft-template.pages.text
@@ -547,7 +547,7 @@ Internet-Draft              Abbreviated Title                 March 2009
               Vahdat, A., and Association for Computing Machinery (ACM),
               "Jupiter rising", Communications of the ACM, vol. 59, no.
               9, pp. 88-97, DOI 10.1145/2975159, August 24, 2016,
-              <http://dx.doi.org/10.1145/2975159>.
+              <https://doi.org/10.1145/2975159>.
 
    [DOMINATION]
               Mad Dominators, Inc., "Ultimate Plan for Taking Over the

diff --git a/tests/valid/draft-template.prepped.xml b/tests/valid/draft-template.prepped.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" consensus="false" prepTime="2023-08-29T11:29:09" indexInclude="true" scripts="Common,Latin" submissionType="IETF">
-  <!-- xml2rfc v2v3 conversion 3.18.0 -->
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" consensus="false" prepTime="2023-10-11T14:23:26" indexInclude="true" scripts="Common,Latin" submissionType="IETF">
+  <!-- xml2rfc v2v3 conversion 3.18.1 -->
 
 
 
@@ -742,7 +742,7 @@ main(int argc, char *argv[])
 
       <!-- Reference with query argument -->
       <!-- A reference written by by an organization not a person. -->
-        <reference anchor="DOI_10.1145_2975159" target="http://dx.doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml" quoteTitle="true" derivedAnchor="DOI_10.1145_2975159">
+        <reference anchor="DOI_10.1145_2975159" target="https://doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml" quoteTitle="true" derivedAnchor="DOI_10.1145_2975159">
           <front>
             <title>Jupiter rising</title>
             <author fullname="Arjun Singh" surname="Singh">

diff --git a/tests/valid/draft-template.text b/tests/valid/draft-template.text
@@ -451,7 +451,7 @@ Table of Contents
               Vahdat, A., and Association for Computing Machinery (ACM),
               "Jupiter rising", Communications of the ACM, vol. 59, no.
               9, pp. 88-97, DOI 10.1145/2975159, August 24, 2016,
-              <http://dx.doi.org/10.1145/2975159>.
+              <https://doi.org/10.1145/2975159>.
 
    [DOMINATION]
               Mad Dominators, Inc., "Ultimate Plan for Taking Over the

diff --git a/tests/valid/draft-template.txt b/tests/valid/draft-template.txt
@@ -547,7 +547,7 @@ Internet-Draft              Abbreviated Title                 March 2009
               Vahdat, A., and Association for Computing Machinery (ACM),
               "Jupiter rising", Communications of the ACM, vol. 59, no.
               9, pp. 88-97, DOI 10.1145/2975159, 24 August 2016,
-              <http://dx.doi.org/10.1145/2975159>.
+              <https://doi.org/10.1145/2975159>.
 
    [DOMINATION]
               Mad Dominators, Inc., "Ultimate Plan for Taking Over the

diff --git a/tests/valid/draft-template.v2v3.xml b/tests/valid/draft-template.v2v3.xml
@@ -30,7 +30,7 @@
 <?rfc multiple-initials="yes" ?>
 <!-- end of list of popular I-D processing instructions -->
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.18.0 -->
+  <!-- xml2rfc v2v3 conversion 3.18.1 -->
   <?v3xml2rfc silence=".*[Pp]ostal address" ?>
   <?v3xml2rfc silence="The document date .*? is more than 3 days away from today's date" ?>
   <?v3xml2rfc silence="Found SVG with width or height specified" ?>
@@ -639,7 +639,7 @@ main(int argc, char *argv[])
         <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml"/>
         <xi:include href="https://datatracker.ietf.org/doc/bibxml3/draft-narten-iana-considerations-rfc2434bis.xml"/>
         <!-- Reference with query argument -->
-      <reference anchor="DOI_10.1145_2975159" target="http://dx.doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
+      <reference anchor="DOI_10.1145_2975159" target="https://doi.org/10.1145/2975159" xml:base="https://bib.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml">
           <front>
             <title>Jupiter rising</title>
             <author fullname="Arjun Singh" surname="Singh">

diff --git a/tests/valid/draft-v3-features.prepped.xml b/tests/valid/draft-v3-features.prepped.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="draft-v3-features" indexInclude="true" prepTime="2023-07-26T21:45:45" scripts="Cherokee,Common,Cyrillic,Greek,Latin" symRefs="true" tocDepth="3" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 3.17.4 -->
+<rfc version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="draft-v3-features" indexInclude="true" prepTime="2023-10-11T14:25:18" scripts="Cherokee,Common,Cyrillic,Greek,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+  <!-- xml2rfc v2v3 conversion 3.18.1 -->