fix: Update for google-i18n-address 3.0.0 (#998)

requirements.txt

@@ -1,6 +1,6 @@
 appdirs>=1.4.4
 configargparse>=1.2.3
-google-i18n-address>=2.3.2
+google-i18n-address>=3.0.0
 intervaltree>=3.1.0
 jinja2>=3.1.2
 lxml>=4.9.0

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.17.1</title>
+<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.17.2</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.17.1" name="generator">
-<meta content="xml2rfc-docs-3.17.1" name="ietf.draft">
+<meta content="xml2rfc 3.17.2" name="generator">
+<meta content="xml2rfc-docs-3.17.2" 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">May 2023</td>
+<td class="right">June 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-05-31" class="published">31 May 2023</time>
+<time datetime="2023-06-05" class="published">5 June 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.17.1</h1>
+<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.17.2</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.17.1.<a href="#section-1-6" class="pilcrow">¶</a></p>
+            This documentation applies to xml2rfc version 3.17.2.<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.17.1:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
+            manpage Jinja2 template, as of xml2rfc version 3.17.2:<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>

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.17.1" name="generator">
+<meta content="xml2rfc 3.17.2" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -26,11 +26,11 @@
 <meta content="Extensible Markup Language" name="keyword">
 <meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.17.1
+  xml2rfc 3.17.2
     Python 3.10.6
     appdirs 1.4.4
     ConfigArgParse 1.5.3
-    google-i18n-address 2.5.2
+    google-i18n-address 3.0.0
     intervaltree 3.1.0
     Jinja2 3.1.2
     lxml 4.9.2

tests/valid/draft-miek-test.v3add-xinclude.xml

@@ -893,7 +893,6 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
   </front>
   <seriesInfo name="W3C CR" value="CR-accelerometer-20191212"/>
   <seriesInfo name="W3C" value="CR-accelerometer-20191212"/>
-  <format target="https://www.w3.org/TR/2019/CR-accelerometer-20191212/" type="TXT"/>
 </reference><!-- bibxml-ieee reference -->
         <reference anchor="IEEE.802-1Y.1990" xml:base="https://bib.ietf.org/public/rfc/bibxml-misc/reference.IEEE.802-1Y.1990.xml">
   <front>

tests/valid/draft-template-old.exp.xml

@@ -516,7 +516,6 @@ main(int argc, char *argv[])
   </front>
   <seriesInfo name="RFC" value="2629"/>
   <seriesInfo name="DOI" value="10.17487/RFC2629"/>
-  <format target="https://www.rfc-editor.org/info/rfc2629" type="TXT"/>
 </reference><reference anchor="RFC3552" target="https://www.rfc-editor.org/info/rfc3552" xml:base="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml" quote-title="true">
   <front>
     <title>Guidelines for Writing RFC Text on Security Considerations</title>
@@ -530,7 +529,6 @@ main(int argc, char *argv[])
   <seriesInfo name="BCP" value="72"/>
   <seriesInfo name="RFC" value="3552"/>
   <seriesInfo name="DOI" value="10.17487/RFC3552"/>
-  <format target="https://www.rfc-editor.org/info/rfc3552" type="TXT"/>
 </reference>
 
       <reference anchor="I-D.narten-iana-considerations-rfc2434bis" target="https://www.ietf.org/archive/id/draft-narten-iana-considerations-rfc2434bis-09.txt" xml:base="https://bib.ietf.org/public/rfc/bibxml3/reference.I-D.narten-iana-considerations-rfc2434bis.xml" quote-title="true">
@@ -617,7 +615,6 @@ main(int argc, char *argv[])
   </front>
   <refcontent>Communications of the ACM, vol. 59, no. 9, pp. 88-97</refcontent>
   <seriesInfo name="DOI" value="10.1145/2975159"/>
-  <format target="http://dx.doi.org/10.1145/2975159" type="TXT"/>
 </reference><!-- A reference written by by an organization not a person. -->
 
       <reference anchor="DOMINATION" target="http://www.example.com/dominator.html" quote-title="true">

tests/valid/draft-template.exp.xml

@@ -453,7 +453,6 @@ main(int argc, char *argv[])
         </front>
         <seriesInfo name="RFC" value="2629"/>
         <seriesInfo name="DOI" value="10.17487/RFC2629"/>
-        <format target="https://www.rfc-editor.org/info/rfc2629" type="TXT"/>
       </reference>
       <reference anchor="RFC3552" target="https://www.rfc-editor.org/info/rfc3552" xml:base="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml">
         <front>
@@ -468,9 +467,8 @@ main(int argc, char *argv[])
         <seriesInfo name="BCP" value="72"/>
         <seriesInfo name="RFC" value="3552"/>
         <seriesInfo name="DOI" value="10.17487/RFC3552"/>
-        <format target="https://www.rfc-editor.org/info/rfc3552" type="TXT"/>
       </reference>
-      <reference anchor="I-D.narten-iana-considerations-rfc2434bis" target="https://www.ietf.org/archive/id/draft-narten-iana-considerations-rfc2434bis-09.txt" xml:base="https://bib.ietf.org/public/rfc/bibxml3/reference.I-D.narten-iana-considerations-rfc2434bis.xml">
+      <reference anchor="I-D.narten-iana-considerations-rfc2434bis" target="https://datatracker.ietf.org/doc/html/draft-narten-iana-considerations-rfc2434bis-09" xml:base="https://bib.ietf.org/public/rfc/bibxml3/reference.I-D.narten-iana-considerations-rfc2434bis.xml">
         <front>
           <title>Guidelines for Writing an IANA Considerations Section in RFCs</title>
           <author fullname="Harald T. Alvestrand" initials="H. T." surname="Alvestrand">
@@ -485,7 +483,6 @@ main(int argc, char *argv[])
           </abstract>
         </front>
         <seriesInfo name="Internet-Draft" value="draft-narten-iana-considerations-rfc2434bis-09"/>
-        <format target="https://www.ietf.org/archive/id/draft-narten-iana-considerations-rfc2434bis-09.txt" type="TXT"/>
       </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">
@@ -558,7 +555,6 @@ main(int argc, char *argv[])
         </front>
         <refcontent>Communications of the ACM, vol. 59, no. 9, pp. 88-97</refcontent>
         <seriesInfo name="DOI" value="10.1145/2975159"/>
-        <format target="http://dx.doi.org/10.1145/2975159" type="TXT"/>
       </reference>
       <!-- A reference written by by an organization not a person. -->
 

tests/valid/draft-template.html

@@ -11,15 +11,15 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 3.17.1" name="generator">
+<meta content="xml2rfc 3.17.2" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.17.1
+  xml2rfc 3.17.2
     Python 3.10.6
     appdirs 1.4.4
     ConfigArgParse 1.5.3
-    google-i18n-address 2.5.2
+    google-i18n-address 3.0.0
     intervaltree 3.1.0
     Jinja2 3.1.2
     lxml 4.9.2
@@ -2023,7 +2023,7 @@ <h3 id="name-informative-references-2">
 <dd class="break"></dd>
 <dt id="I-D.narten-iana-considerations-rfc2434bis">[I-D.narten-iana-considerations-rfc2434bis]</dt>
         <dd>
-<span class="refAuthor">Alvestrand, H. T.</span> and <span class="refAuthor">T. Narten</span>, <span class="refTitle">"Guidelines for Writing an IANA Considerations Section in RFCs"</span>, <span class="refContent">Work in Progress</span>, <span class="seriesInfo">Internet-Draft, draft-narten-iana-considerations-rfc2434bis-09</span>, <time datetime="2008-03-26" class="refDate">26 March 2008</time>, <span>&lt;<a href="https://www.ietf.org/archive/id/draft-narten-iana-considerations-rfc2434bis-09.txt">https://www.ietf.org/archive/id/draft-narten-iana-considerations-rfc2434bis-09.txt</a>&gt;</span>. </dd>
+<span class="refAuthor">Alvestrand, H. T.</span> and <span class="refAuthor">T. Narten</span>, <span class="refTitle">"Guidelines for Writing an IANA Considerations Section in RFCs"</span>, <span class="refContent">Work in Progress</span>, <span class="seriesInfo">Internet-Draft, draft-narten-iana-considerations-rfc2434bis-09</span>, <time datetime="2008-03-26" class="refDate">26 March 2008</time>, <span>&lt;<a href="https://datatracker.ietf.org/doc/html/draft-narten-iana-considerations-rfc2434bis-09">https://datatracker.ietf.org/doc/html/draft-narten-iana-considerations-rfc2434bis-09</a>&gt;</span>. </dd>
 <dd class="break"></dd>
 <dt id="RFC2629">[RFC2629]</dt>
         <dd>

tests/valid/draft-template.pages.text

@@ -567,8 +567,8 @@ Internet-Draft              Abbreviated Title                 March 2009
               an IANA Considerations Section in RFCs", Work in Progress,
               Internet-Draft, draft-narten-iana-considerations-
               rfc2434bis-09, March 26, 2008,
-              <https://www.ietf.org/archive/id/draft-narten-iana-
-              considerations-rfc2434bis-09.txt>.
+              <https://datatracker.ietf.org/doc/html/draft-narten-iana-
+              considerations-rfc2434bis-09>.
 
    [RFC2629]  Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629,
               DOI 10.17487/RFC2629, June 1999,

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" consensus="false" docName="draft-ietf-xml2rfc-template-05" indexInclude="true" ipr="trust200902" prepTime="2023-01-17T08:46:19" scripts="Common,Latin" sortRefs="true" submissionType="IETF" symRefs="true" tocDepth="4" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 3.15.3 -->
+<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-06-05T18:55:02" indexInclude="true" scripts="Common,Latin" submissionType="IETF">
+  <!-- xml2rfc v2v3 conversion 3.17.2 -->
 
 
 
@@ -650,7 +650,7 @@ main(int argc, char *argv[])
             <date year="1984"/>
           </front>
         </reference>
-        <reference anchor="I-D.narten-iana-considerations-rfc2434bis" target="https://www.ietf.org/archive/id/draft-narten-iana-considerations-rfc2434bis-09.txt" xml:base="https://bib.ietf.org/public/rfc/bibxml3/reference.I-D.narten-iana-considerations-rfc2434bis.xml" quoteTitle="true" derivedAnchor="I-D.narten-iana-considerations-rfc2434bis">
+        <reference anchor="I-D.narten-iana-considerations-rfc2434bis" target="https://datatracker.ietf.org/doc/html/draft-narten-iana-considerations-rfc2434bis-09" xml:base="https://bib.ietf.org/public/rfc/bibxml3/reference.I-D.narten-iana-considerations-rfc2434bis.xml" quoteTitle="true" derivedAnchor="I-D.narten-iana-considerations-rfc2434bis">
           <front>
             <title>Guidelines for Writing an IANA Considerations Section in RFCs</title>
             <author fullname="Harald T. Alvestrand" initials="H. T." surname="Alvestrand">

tests/valid/draft-template.text

@@ -462,8 +462,8 @@ Table of Contents
               an IANA Considerations Section in RFCs", Work in Progress,
               Internet-Draft, draft-narten-iana-considerations-
               rfc2434bis-09, March 26, 2008,
-              <https://www.ietf.org/archive/id/draft-narten-iana-
-              considerations-rfc2434bis-09.txt>.
+              <https://datatracker.ietf.org/doc/html/draft-narten-iana-
+              considerations-rfc2434bis-09>.
 
    [RFC2629]  Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629,
               DOI 10.17487/RFC2629, June 1999,

tests/valid/draft-template.txt

@@ -567,8 +567,8 @@ Internet-Draft              Abbreviated Title                 March 2009
               an IANA Considerations Section in RFCs", Work in Progress,
               Internet-Draft, draft-narten-iana-considerations-
               rfc2434bis-09, 26 March 2008,
-              <https://www.ietf.org/archive/id/draft-narten-iana-
-              considerations-rfc2434bis-09.txt>.
+              <https://datatracker.ietf.org/doc/html/draft-narten-iana-
+              considerations-rfc2434bis-09>.
 
    [RFC2629]  Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629,
               DOI 10.17487/RFC2629, June 1999,

tests/valid/draft-template.v3add-xinclude.xml

@@ -893,7 +893,6 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
   </front>
   <seriesInfo name="W3C CR" value="CR-accelerometer-20191212"/>
   <seriesInfo name="W3C" value="CR-accelerometer-20191212"/>
-  <format target="https://www.w3.org/TR/2019/CR-accelerometer-20191212/" type="TXT"/>
 </reference><!-- bibxml-ieee reference -->
         <reference anchor="IEEE.802-1Y.1990" xml:base="https://bib.ietf.org/public/rfc/bibxml-misc/reference.IEEE.802-1Y.1990.xml">
   <front>

tests/valid/draft-v3-features.prepped.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc version="3" category="exp" docName="draft-v3-features" indexInclude="true" ipr="trust200902" prepTime="2023-01-17T08:47:28" scripts="Cherokee,Common,Cyrillic,Greek,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 3.15.3 -->
+<rfc version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="draft-v3-features" indexInclude="true" prepTime="2023-06-05T18:57:29" scripts="Cherokee,Common,Cyrillic,Greek,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+  <!-- xml2rfc v2v3 conversion 3.17.2 -->
 
 
 
@@ -3977,7 +3977,6 @@ foo = bar
         </front>
         <seriesInfo name="RFC" value="7996"/>
         <seriesInfo name="DOI" value="10.17487/RFC7996"/>
-        <format target="https://www.rfc-editor.org/info/rfc7996" type="TXT"/>
       </reference>
       <referencegroup anchor="STD78" target="https://www.rfc-editor.org/info/std78" derivedAnchor="STD78">
         <reference anchor="RFC5343" target="https://www.rfc-editor.org/info/rfc5343" xml:base="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5343.xml" quoteTitle="true">
@@ -3994,7 +3993,6 @@ foo = bar
           <seriesInfo name="STD" value="78"/>
           <seriesInfo name="RFC" value="5343"/>
           <seriesInfo name="DOI" value="10.17487/RFC5343"/>
-          <format target="https://www.rfc-editor.org/info/rfc5343" type="TXT"/>
         </reference>
         <reference anchor="RFC5590" target="https://www.rfc-editor.org/info/rfc5590" xml:base="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5590.xml" quoteTitle="true">
           <front>
@@ -4009,7 +4007,6 @@ foo = bar
           <seriesInfo name="STD" value="78"/>
           <seriesInfo name="RFC" value="5590"/>
           <seriesInfo name="DOI" value="10.17487/RFC5590"/>
-          <format target="https://www.rfc-editor.org/info/rfc5590" type="TXT"/>
         </reference>
         <reference anchor="RFC5591" target="https://www.rfc-editor.org/info/rfc5591" xml:base="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5591.xml" quoteTitle="true">
           <front>
@@ -4025,7 +4022,6 @@ foo = bar
           <seriesInfo name="STD" value="78"/>
           <seriesInfo name="RFC" value="5591"/>
           <seriesInfo name="DOI" value="10.17487/RFC5591"/>
-          <format target="https://www.rfc-editor.org/info/rfc5591" type="TXT"/>
         </reference>
         <reference anchor="RFC6353" target="https://www.rfc-editor.org/info/rfc6353" xml:base="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.6353.xml" quoteTitle="true">
           <front>
@@ -4041,7 +4037,6 @@ foo = bar
           <seriesInfo name="STD" value="78"/>
           <seriesInfo name="RFC" value="6353"/>
           <seriesInfo name="DOI" value="10.17487/RFC6353"/>
-          <format target="https://www.rfc-editor.org/info/rfc6353" type="TXT"/>
         </reference>
       </referencegroup>
       <reference anchor="STPETER" quoteTitle="true" derivedAnchor="STPETER">

tests/valid/indexes.pages.text

@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                              May 31, 2023
+Internet-Draft                                              June 5, 2023
 Intended status: Experimental                                           
-Expires: December 2, 2023
+Expires: December 7, 2023
 
 
                           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 December 2, 2023.
+   This Internet-Draft will expire on December 7, 2023.
 
 Copyright Notice
 
@@ -53,9 +53,9 @@ Table of Contents
 
 
 
-Person                  Expires December 2, 2023                [Page 1]
+Person                  Expires December 7, 2023                [Page 1]
 
-Internet-Draft             xml2rfc index tests                  May 2023
+Internet-Draft             xml2rfc index tests                 June 2023
 
 
    This is another section!
@@ -109,9 +109,9 @@ Index
 
 
 
-Person                  Expires December 2, 2023                [Page 2]
+Person                  Expires December 7, 2023                [Page 2]
 
-Internet-Draft             xml2rfc index tests                  May 2023
+Internet-Draft             xml2rfc index tests                 June 2023
 
 
       E
@@ -165,4 +165,4 @@ Author's Address
 
 
 
-Person                  Expires December 2, 2023                [Page 3]
+Person                  Expires December 7, 2023                [Page 3]