Skip to content

Commit fe71b28

Browse files
authored
fix: Remove the blank line from the contact information in text output (#720)
1 parent 9717333 commit fe71b28

33 files changed

+140
-153
lines changed

tests/valid/docfile.py37.html

Lines changed: 6 additions & 6 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.12.0</title>
7+
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.1</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.12.0" name="generator">
15-
<meta content="xml2rfc-docs-3.12.0" name="ietf.draft">
14+
<meta content="xml2rfc 3.12.1" name="generator">
15+
<meta content="xml2rfc-docs-3.12.1" 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">
@@ -45,7 +45,7 @@
4545
</dd>
4646
</dl>
4747
</div>
48-
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.0</h1>
48+
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.1</h1>
4949
<section id="section-abstract">
5050
<h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
5151
<p id="section-abstract-1">
@@ -367,7 +367,7 @@ <h2 id="name-introduction">
367367
<p id="section-1-5">
368368
The latest version of this documentation is available in HTML form at <span><a href="https://xml2rfc.ietf.org/xml2rfc-doc">https://xml2rfc.ietf.org/xml2rfc-doc</a></span>.<a href="#section-1-5" class="pilcrow"></a></p>
369369
<p id="section-1-6">
370-
This documentation applies to xml2rfc version 3.12.0.<a href="#section-1-6" class="pilcrow"></a></p>
370+
This documentation applies to xml2rfc version 3.12.1.<a href="#section-1-6" class="pilcrow"></a></p>
371371
</section>
372372
<section id="section-2">
373373
<h2 id="name-schema-version-3-elements">
@@ -6342,7 +6342,7 @@ <h2 id="name-xml2rfc-documentation-templ">
63426342
<p id="appendix-D-1">
63436343

63446344
The following variables are available for use in an xml2rfc
6345-
manpage Jinja2 template, as of xml2rfc version 3.12.0:<a href="#appendix-D-1" class="pilcrow"></a></p>
6345+
manpage Jinja2 template, as of xml2rfc version 3.12.1:<a href="#appendix-D-1" class="pilcrow"></a></p>
63466346
<span class="break"></span><dl class="dlNewline" id="appendix-D-2">
63476347
<dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
63486348
<dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>

tests/valid/docfile.py38.html

Lines changed: 6 additions & 6 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.12.0</title>
7+
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.1</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.12.0" name="generator">
15-
<meta content="xml2rfc-docs-3.12.0" name="ietf.draft">
14+
<meta content="xml2rfc 3.12.1" name="generator">
15+
<meta content="xml2rfc-docs-3.12.1" 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">
@@ -45,7 +45,7 @@
4545
</dd>
4646
</dl>
4747
</div>
48-
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.0</h1>
48+
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.1</h1>
4949
<section id="section-abstract">
5050
<h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
5151
<p id="section-abstract-1">
@@ -367,7 +367,7 @@ <h2 id="name-introduction">
367367
<p id="section-1-5">
368368
The latest version of this documentation is available in HTML form at <span><a href="https://xml2rfc.ietf.org/xml2rfc-doc">https://xml2rfc.ietf.org/xml2rfc-doc</a></span>.<a href="#section-1-5" class="pilcrow"></a></p>
369369
<p id="section-1-6">
370-
This documentation applies to xml2rfc version 3.12.0.<a href="#section-1-6" class="pilcrow"></a></p>
370+
This documentation applies to xml2rfc version 3.12.1.<a href="#section-1-6" class="pilcrow"></a></p>
371371
</section>
372372
<section id="section-2">
373373
<h2 id="name-schema-version-3-elements">
@@ -6342,7 +6342,7 @@ <h2 id="name-xml2rfc-documentation-templ">
63426342
<p id="appendix-D-1">
63436343

63446344
The following variables are available for use in an xml2rfc
6345-
manpage Jinja2 template, as of xml2rfc version 3.12.0:<a href="#appendix-D-1" class="pilcrow"></a></p>
6345+
manpage Jinja2 template, as of xml2rfc version 3.12.1:<a href="#appendix-D-1" class="pilcrow"></a></p>
63466346
<span class="break"></span><dl class="dlNewline" id="appendix-D-2">
63476347
<dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
63486348
<dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>

tests/valid/draft-miek-test.pages.text

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,6 @@ Author's Address
11541154
London
11551155
SW1W 9SH
11561156
United Kingdom
1157-
11581157
11591158
URI: http://miek.nl/
11601159

@@ -1173,4 +1172,5 @@ Author's Address
11731172

11741173

11751174

1175+
11761176
Gieben Expires July 5, 2013 [Page 21]

tests/valid/draft-miek-test.text

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,5 @@ Author's Address
968968
London
969969
SW1W 9SH
970970
United Kingdom
971-
972971
973972
URI: http://miek.nl/

tests/valid/draft-template.exp.xml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ main(int argc, char *argv[])
505505
<references title="Informative References">
506506
<!-- Here we use entities that we defined at the beginning. -->
507507

508-
<reference anchor="RFC2629" target="https://www.rfc-editor.org/info/rfc2629" xml:base="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2629.xml">
508+
<reference anchor="RFC2629" target="https://www.rfc-editor.org/info/rfc2629" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2629.xml">
509509
<front>
510510
<title>Writing I-Ds and RFCs using XML</title>
511511
<author initials="M." surname="Rose" fullname="M. Rose"><organization/></author>
@@ -514,7 +514,7 @@ main(int argc, char *argv[])
514514
</front>
515515
<seriesInfo name="RFC" value="2629"/>
516516
<seriesInfo name="DOI" value="10.17487/RFC2629"/>
517-
</reference><reference anchor="RFC3552" target="https://www.rfc-editor.org/info/rfc3552" xml:base="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml" quote-title="true">
517+
</reference><reference anchor="RFC3552" target="https://www.rfc-editor.org/info/rfc3552" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml" quote-title="true">
518518
<front>
519519
<title>Guidelines for Writing RFC Text on Security Considerations</title>
520520
<author initials="E." surname="Rescorla" fullname="E. Rescorla"><organization/></author>
@@ -527,32 +527,31 @@ main(int argc, char *argv[])
527527
<seriesInfo name="DOI" value="10.17487/RFC3552"/>
528528
</reference>
529529

530-
<reference anchor="I-D.narten-iana-considerations-rfc2434bis" xml:base="https://xml2rfc.ietf.org/public/rfc/bibxml3/reference.I-D.narten-iana-considerations-rfc2434bis.xml" quote-title="true">
531-
<front>
532-
<title>Guidelines for Writing an IANA Considerations Section in RFCs</title>
533-
534-
<author initials="T" surname="Narten" fullname="Thomas Narten">
535-
<organization/>
536-
</author>
537-
538-
<author initials="H" surname="Alvestrand" fullname="Harald Alvestrand">
539-
<organization/>
540-
</author>
541-
542-
<date month="March" day="26" year="2008"/>
543-
544-
<abstract><t>Many protocols make use of identifiers consisting of constants and other well-known values. Even after a protocol has been defined and deployment has begun, new values may need to be assigned (e.g., for a new option type in DHCP, or a new encryption or authentication transform for IPsec). To ensure that such quantities have consistent values and interpretations across all implementations, their assignment must be administered by a central authority. For IETF protocols, that role is provided by the Internet Assigned Numbers Authority (IANA). In order for IANA to manage a given name space prudently, it needs guidelines describing the conditions under which new values can be assigned, or when modifications to existing values can be made. If IANA is expected to play a role in the management of a name space, the IANA must be given clear and concise instructions describing that role. This document discusses issues that should be considered in formulating a policy for assigning values to a name space and provides guidelines to document authors on the specific text that must be included in documents that place demands on IANA. This document obsoletes RFC 2434. Contents Status of this Memo.......................................... 1</t></abstract>
545-
546-
</front>
547-
548-
<seriesInfo name="Internet-Draft" value="draft-narten-iana-considerations-rfc2434bis-09"/>
549-
<format type="TXT" target="http://www.ietf.org/internet-drafts/draft-narten-iana-considerations-rfc2434bis-09.txt"/>
530+
<reference anchor="I-D.narten-iana-considerations-rfc2434bis" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml3/reference.I-D.narten-iana-considerations-rfc2434bis.xml" quote-title="true">
531+
<front>
532+
<title>Guidelines for Writing an IANA Considerations Section in RFCs</title>
533+
<author fullname="Thomas Narten">
534+
</author>
535+
<author fullname="Harald Alvestrand">
536+
</author>
537+
<date month="March" day="26" year="2008"/>
538+
<abstract>
539+
<t>Many protocols make use of identifiers consisting of constants and other well-known values. Even after a protocol has been defined and deployment has begun, new values may need to be assigned (e.g., for a new option type in DHCP, or a new encryption or authentication transform for IPsec). To ensure that such quantities have consistent values and interpretations across all implementations, their assignment must be administered by a central authority. For IETF protocols, that role is provided by the Internet Assigned Numbers Authority (IANA).
540+
541+
In order for IANA to manage a given namespace prudently, it needs guidelines describing the conditions under which new values can be assigned or when modifications to existing values can be made. If IANA is expected to play a role in the management of a namespace, IANA must be given clear and concise instructions describing that role. This document discusses issues that should be considered in formulating a policy for assigning values to a namespace and provides guidelines for authors on the specific text that must be included in documents that place demands on IANA.
542+
543+
This document obsoletes RFC 2434. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
544+
</t>
545+
</abstract>
546+
</front>
547+
<seriesInfo name="Internet-Draft" value="draft-narten-iana-considerations-rfc2434bis-09"/>
548+
<format type="TXT" target="https://www.ietf.org/archive/id/draft-narten-iana-considerations-rfc2434bis-09.txt"/>
550549
</reference>
551550

552551
<!-- Reference with query argument -->
553-
<reference anchor="JUPITER" xml:base="https://xml2rfc.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml?anchor=JUPITER">
552+
<reference anchor="JUPITER" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml?anchor=JUPITER">
554553
<front>
555-
<title>Jupiter rising</title>
554+
<title>Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network</title>
556555
<author initials="A." surname="Singh" fullname="Arjun Singh">
557556
<organization/>
558557
</author>

tests/valid/draft-template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
<link href="#rfc.authors" rel="Chapter">
399399

400400

401-
<meta name="generator" content="xml2rfc version 3.7.0 - https://tools.ietf.org/tools/xml2rfc" />
401+
<meta name="generator" content="xml2rfc version 3.12.1 - https://tools.ietf.org/tools/xml2rfc" />
402402
<link rel="schema.dct" href="http://purl.org/dc/terms/" />
403403

404404
<meta name="dct.creator" content="Davies, E.B., Ed. and Q. Zhao" />
@@ -910,7 +910,7 @@ <h1 id="rfc.references.2">
910910
<tr>
911911
<td class="reference"><b id="JUPITER">[JUPITER]</b></td>
912912
<td class="top">
913-
<a>Singh, A.</a>, <a>Ong, J.</a>, <a>Agarwal, A.</a>, <a>Anderson, G.</a>, <a>Armistead, A.</a>, <a>Bannon, R.</a>, <a>Boving, S.</a>, <a>Desai, G.</a>, <a>Felderman, B.</a>, <a>Germano, P.</a>, <a>Kanagala, A.</a>, <a>Liu, H.</a>, <a>Provost, J.</a>, <a>Simmons, J.</a>, <a>Tanda, E.</a>, <a>Wanderer, J.</a>, <a>H&#246;lzle, U.</a>, <a>Stuart, S.</a> and <a>A. Vahdat</a>, "<a>Jupiter rising</a>", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016.</td>
913+
<a>Singh, A.</a>, <a>Ong, J.</a>, <a>Agarwal, A.</a>, <a>Anderson, G.</a>, <a>Armistead, A.</a>, <a>Bannon, R.</a>, <a>Boving, S.</a>, <a>Desai, G.</a>, <a>Felderman, B.</a>, <a>Germano, P.</a>, <a>Kanagala, A.</a>, <a>Liu, H.</a>, <a>Provost, J.</a>, <a>Simmons, J.</a>, <a>Tanda, E.</a>, <a>Wanderer, J.</a>, <a>H&#246;lzle, U.</a>, <a>Stuart, S.</a> and <a>A. Vahdat</a>, "<a>Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network</a>", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016.</td>
914914
</tr>
915915
<tr>
916916
<td class="reference"><b id="RFC2629">[RFC2629]</b></td>

tests/valid/draft-template.nroff

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" automatically generated by xml2rfc v3.7.0 on 2021-04-08T15:08:39Z
1+
.\" automatically generated by xml2rfc v3.12.1 on 2022-02-15T18:13:24Z
22

33
.pl 10.0i
44
.po 0
@@ -675,8 +675,10 @@ IANA Considerations Section\0in RFCs", \%draft-narten-iana-
675675
A., Bannon, R., Boving, S., Desai, G., Felderman, B.,
676676
Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons,
677677
J., Tanda, E., Wanderer, J., Hoelzle, U., Stuart, S., and
678-
A. Vahdat, "Jupiter rising", Communications of the
679-
ACM\0Vol. 59, pp. \%88-97, DOI\010.1145/2975159, August 2016.
678+
A. Vahdat, "Jupiter rising: a decade of clos topologies
679+
and centralized control in Google's datacenter network",
680+
Communications of the ACM\0Vol. 59, pp. \%88-97,
681+
DOI\010.1145/2975159, August 2016.
680682
.bp
681683
.ti 3
682684
[RFC2629] Rose, M., "Writing \%I-Ds and RFCs using XML", RFC\02629,

tests/valid/draft-template.pages.text

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,9 @@ Internet-Draft Abbreviated Title March 2009
547547
Narten, T. and H. Alvestrand, "Guidelines for Writing an
548548
IANA Considerations Section in RFCs", Work in Progress,
549549
Internet-Draft, draft-narten-iana-considerations-
550-
rfc2434bis-09, March 26, 2008, <http://www.ietf.org/
551-
internet-drafts/draft-narten-iana-considerations-
552-
rfc2434bis-09.txt>.
550+
rfc2434bis-09, March 26, 2008,
551+
<https://www.ietf.org/archive/id/draft-narten-iana-
552+
considerations-rfc2434bis-09.txt>.
553553

554554
[JUPITER] Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead,
555555
A., Bannon, R., Boving, S., Desai, G., Felderman, B.,
@@ -563,8 +563,10 @@ Internet-Draft Abbreviated Title March 2009
563563

564564

565565
J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and
566-
A. Vahdat, "Jupiter rising", Communications of the
567-
ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016,
566+
A. Vahdat, "Jupiter rising: a decade of clos topologies
567+
and centralized control in Google's datacenter network",
568+
Communications of the ACM Vol. 59, pp. 88-97,
569+
DOI 10.1145/2975159, August 2016,
568570
<https://doi.org/10.1145/2975159>.
569571

570572
[RFC2629] Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629,
@@ -593,7 +595,6 @@ Authors' Addresses
593595
Folly Consulting
594596
Soham
595597
United Kingdom
596-
597598
Phone: +44 7889 488 335
598599
599600

@@ -603,14 +604,11 @@ Authors' Addresses
603604
125 Nagog Technology Park
604605
Acton, MA 01719
605606
United States of America
606-
607607
608608

609609

610610

611611

612612

613613

614-
615-
616614
Davies & Zhao Expires September 2, 2009 [Page 11]

0 commit comments

Comments
 (0)