Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.12.1

Abstract

@@ -367,7 +367,7 @@

The latest version of this documentation is available in HTML form at https://xml2rfc.ietf.org/xml2rfc-doc.¶

- This documentation applies to xml2rfc version 3.12.0.¶

+ This documentation applies to xml2rfc version 3.12.1.¶

@@ -6342,7 +6342,7 @@
The following variables are available for use in an xml2rfc - manpage Jinja2 template, as of xml2rfc version 3.12.0:¶
+ manpage Jinja2 template, as of xml2rfc version 3.12.1:¶

{{ bare_latin_tags }}:

diff -Nru xml2rfc-3.12.1/tests/valid/docfile.py38.html xml2rfc-3.12.2/tests/valid/docfile.py38.html --- xml2rfc-3.12.1/tests/valid/docfile.py38.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/docfile.py38.html 2022-02-16 20:30:53.000000000 +0000 @@ -4,15 +4,15 @@ -Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.0 +Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.1 - - + + @@ -45,7 +45,7 @@
-

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.12.0

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.12.1

Abstract

@@ -367,7 +367,7 @@

The latest version of this documentation is available in HTML form at https://xml2rfc.ietf.org/xml2rfc-doc.¶

- This documentation applies to xml2rfc version 3.12.0.¶

+ This documentation applies to xml2rfc version 3.12.1.¶

@@ -6342,7 +6342,7 @@
The following variables are available for use in an xml2rfc - manpage Jinja2 template, as of xml2rfc version 3.12.0:¶
+ manpage Jinja2 template, as of xml2rfc version 3.12.1:¶

{{ bare_latin_tags }}:

diff -Nru xml2rfc-3.12.1/tests/valid/draft-miek-test.pages.text xml2rfc-3.12.2/tests/valid/draft-miek-test.pages.text --- xml2rfc-3.12.1/tests/valid/draft-miek-test.pages.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-miek-test.pages.text 2022-02-16 20:30:53.000000000 +0000 @@ -1154,12 +1154,12 @@ London SW1W 9SH United Kingdom - Email: miek@miek.nl URI: http://miek.nl/ + diff -Nru xml2rfc-3.12.1/tests/valid/draft-miek-test.text xml2rfc-3.12.2/tests/valid/draft-miek-test.text --- xml2rfc-3.12.1/tests/valid/draft-miek-test.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-miek-test.text 2022-02-16 20:30:53.000000000 +0000 @@ -968,6 +968,5 @@ London SW1W 9SH United Kingdom - Email: miek@miek.nl URI: http://miek.nl/ diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.exp.xml xml2rfc-3.12.2/tests/valid/draft-template.exp.xml --- xml2rfc-3.12.1/tests/valid/draft-template.exp.xml 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.exp.xml 2022-02-16 20:30:53.000000000 +0000 @@ -505,7 +505,7 @@ - + Writing I-Ds and RFCs using XML @@ -514,7 +514,7 @@ - + Guidelines for Writing RFC Text on Security Considerations @@ -527,32 +527,31 @@ - - -Guidelines for Writing an IANA Considerations Section in RFCs - - - - - - - - - - - -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 - - - - - + + + Guidelines for Writing an IANA Considerations Section in RFCs + + + + + + + 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 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. + + This document obsoletes RFC 2434. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements. + + + + + - + - Jupiter rising + Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.html xml2rfc-3.12.2/tests/valid/draft-template.html --- xml2rfc-3.12.1/tests/valid/draft-template.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.html 2022-02-16 20:30:53.000000000 +0000 @@ -398,7 +398,7 @@ - + @@ -910,7 +910,7 @@ [JUPITER] -Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S. and A. Vahdat, "Jupiter rising", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016. +Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S. and A. Vahdat, "Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016. [RFC2629] diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.nroff xml2rfc-3.12.2/tests/valid/draft-template.nroff --- xml2rfc-3.12.1/tests/valid/draft-template.nroff 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.nroff 2022-02-16 20:30:53.000000000 +0000 @@ -1,4 +1,4 @@ -.\" automatically generated by xml2rfc v3.7.0 on 2021-04-08T15:08:39Z +.\" automatically generated by xml2rfc v3.12.1 on 2022-02-15T18:13:24Z .pl 10.0i .po 0 @@ -675,8 +675,10 @@ A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hoelzle, U., Stuart, S., and -A. Vahdat, "Jupiter rising", Communications of the -ACM\0Vol. 59, pp. \%88-97, DOI\010.1145/2975159, August 2016. +A. Vahdat, "Jupiter rising: a decade of clos topologies +and centralized control in Google's datacenter network", +Communications of the ACM\0Vol. 59, pp. \%88-97, +DOI\010.1145/2975159, August 2016. .bp .ti 3 [RFC2629] Rose, M., "Writing \%I-Ds and RFCs using XML", RFC\02629, diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.pages.text xml2rfc-3.12.2/tests/valid/draft-template.pages.text --- xml2rfc-3.12.1/tests/valid/draft-template.pages.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.pages.text 2022-02-16 20:30:53.000000000 +0000 @@ -547,9 +547,9 @@ Narten, T. and H. Alvestrand, "Guidelines for Writing an IANA Considerations Section in RFCs", Work in Progress, Internet-Draft, draft-narten-iana-considerations- - rfc2434bis-09, March 26, 2008, . + rfc2434bis-09, March 26, 2008, + . [JUPITER] Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., @@ -563,8 +563,10 @@ J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and - A. Vahdat, "Jupiter rising", Communications of the - ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, + A. Vahdat, "Jupiter rising: a decade of clos topologies + and centralized control in Google's datacenter network", + Communications of the ACM Vol. 59, pp. 88-97, + DOI 10.1145/2975159, August 2016, . [RFC2629] Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629, @@ -593,7 +595,6 @@ Folly Consulting Soham United Kingdom - Phone: +44 7889 488 335 Email: elwynd@dial.pipex.com @@ -603,13 +604,10 @@ 125 Nagog Technology Park Acton, MA 01719 United States of America - Email: quintin.zhao@huawei.com - - diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.prepped.xml xml2rfc-3.12.2/tests/valid/draft-template.prepped.xml --- xml2rfc-3.12.1/tests/valid/draft-template.prepped.xml 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.prepped.xml 2022-02-16 20:30:53.000000000 +0000 @@ -1,6 +1,6 @@ - - + + @@ -581,26 +581,29 @@ - + Guidelines for Writing an IANA Considerations Section in RFCs - - - - - - + + + + - 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 + 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 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. + + This document obsoletes RFC 2434. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements. + Work in Progress - + - Jupiter rising + Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network @@ -663,7 +666,7 @@ - + Writing I-Ds and RFCs using XML @@ -677,7 +680,7 @@ - + Guidelines for Writing RFC Text on Security Considerations diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.raw.txt xml2rfc-3.12.2/tests/valid/draft-template.raw.txt --- xml2rfc-3.12.1/tests/valid/draft-template.raw.txt 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.raw.txt 2022-02-16 20:30:53.000000000 +0000 @@ -459,8 +459,10 @@ A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hoelzle, U., Stuart, S., and - A. Vahdat, "Jupiter rising", Communications of the - ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016. + A. Vahdat, "Jupiter rising: a decade of clos topologies + and centralized control in Google's datacenter network", + Communications of the ACM Vol. 59, pp. 88-97, + DOI 10.1145/2975159, August 2016. [RFC2629] Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629, DOI 10.17487/RFC2629, June 1999, diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.text xml2rfc-3.12.2/tests/valid/draft-template.text --- xml2rfc-3.12.1/tests/valid/draft-template.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.text 2022-02-16 20:30:53.000000000 +0000 @@ -451,16 +451,18 @@ Narten, T. and H. Alvestrand, "Guidelines for Writing an IANA Considerations Section in RFCs", Work in Progress, Internet-Draft, draft-narten-iana-considerations- - rfc2434bis-09, March 26, 2008, . + rfc2434bis-09, March 26, 2008, + . [JUPITER] Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and - A. Vahdat, "Jupiter rising", Communications of the - ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, + A. Vahdat, "Jupiter rising: a decade of clos topologies + and centralized control in Google's datacenter network", + Communications of the ACM Vol. 59, pp. 88-97, + DOI 10.1145/2975159, August 2016, . [RFC2629] Rose, M., "Writing I-Ds and RFCs using XML", RFC 2629, @@ -489,7 +491,6 @@ Folly Consulting Soham United Kingdom - Phone: +44 7889 488 335 Email: elwynd@dial.pipex.com @@ -499,5 +500,4 @@ 125 Nagog Technology Park Acton, MA 01719 United States of America - Email: quintin.zhao@huawei.com diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.txt xml2rfc-3.12.2/tests/valid/draft-template.txt --- xml2rfc-3.12.1/tests/valid/draft-template.txt 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.txt 2022-02-16 20:30:53.000000000 +0000 @@ -549,10 +549,10 @@ A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hoelzle, U., Stuart, S., and - A. Vahdat, "Jupiter rising", Communications of the - ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016. - - + A. Vahdat, "Jupiter rising: a decade of clos topologies + and centralized control in Google's datacenter network", + Communications of the ACM Vol. 59, pp. 88-97, + DOI 10.1145/2975159, August 2016. diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.v2v3.xml xml2rfc-3.12.2/tests/valid/draft-template.v2v3.xml --- xml2rfc-3.12.1/tests/valid/draft-template.v2v3.xml 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.v2v3.xml 2022-02-16 20:30:53.000000000 +0000 @@ -35,7 +35,7 @@ - + @@ -472,9 +472,9 @@ - + - Jupiter rising + Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.v3.py36.html xml2rfc-3.12.2/tests/valid/draft-template.v3.py36.html --- xml2rfc-3.12.1/tests/valid/draft-template.v3.py36.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.v3.py36.html 2022-02-16 20:30:53.000000000 +0000 @@ -11,7 +11,7 @@ Insert an abstract: MANDATORY. This template is for creating an Internet Draft. " name="description"> - + @@ -839,11 +839,11 @@

[I-D.narten-iana-considerations-rfc2434bis]

-Narten, T. and H. Alvestrand, "Guidelines for Writing an IANA Considerations Section in RFCs", Work in Progress, Internet-Draft, draft-narten-iana-considerations-rfc2434bis-09, March 26, 2008, <http://www.ietf.org/internet-drafts/draft-narten-iana-considerations-rfc2434bis-09.txt>.
+Narten, T. and H. Alvestrand, "Guidelines for Writing 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>.

[JUPITER]

-Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and A. Vahdat, "Jupiter rising", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, <https://doi.org/10.1145/2975159>.
+Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and A. Vahdat, "Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, <https://doi.org/10.1145/2975159>.

[RFC2629]

diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.v3.py37.html xml2rfc-3.12.2/tests/valid/draft-template.v3.py37.html --- xml2rfc-3.12.1/tests/valid/draft-template.v3.py37.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.v3.py37.html 2022-02-16 20:30:53.000000000 +0000 @@ -11,7 +11,7 @@ Insert an abstract: MANDATORY. This template is for creating an Internet Draft. " name="description"> - + @@ -839,11 +839,11 @@

[I-D.narten-iana-considerations-rfc2434bis]

-Narten, T. and H. Alvestrand, "Guidelines for Writing an IANA Considerations Section in RFCs", Work in Progress, Internet-Draft, draft-narten-iana-considerations-rfc2434bis-09, March 26, 2008, <http://www.ietf.org/internet-drafts/draft-narten-iana-considerations-rfc2434bis-09.txt>.
+Narten, T. and H. Alvestrand, "Guidelines for Writing 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>.

[JUPITER]

-Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and A. Vahdat, "Jupiter rising", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, <https://doi.org/10.1145/2975159>.
+Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and A. Vahdat, "Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, <https://doi.org/10.1145/2975159>.

[RFC2629]

diff -Nru xml2rfc-3.12.1/tests/valid/draft-template.v3.py38.html xml2rfc-3.12.2/tests/valid/draft-template.v3.py38.html --- xml2rfc-3.12.1/tests/valid/draft-template.v3.py38.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/draft-template.v3.py38.html 2022-02-16 20:30:53.000000000 +0000 @@ -11,7 +11,7 @@ Insert an abstract: MANDATORY. This template is for creating an Internet Draft. " name="description"> - + @@ -839,11 +839,11 @@

[I-D.narten-iana-considerations-rfc2434bis]

-Narten, T. and H. Alvestrand, "Guidelines for Writing an IANA Considerations Section in RFCs", Work in Progress, Internet-Draft, draft-narten-iana-considerations-rfc2434bis-09, March 26, 2008, <http://www.ietf.org/internet-drafts/draft-narten-iana-considerations-rfc2434bis-09.txt>.
+Narten, T. and H. Alvestrand, "Guidelines for Writing 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>.

[JUPITER]

-Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and A. Vahdat, "Jupiter rising", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, <https://doi.org/10.1145/2975159>.
+Singh, A., Ong, J., Agarwal, A., Anderson, G., Armistead, A., Bannon, R., Boving, S., Desai, G., Felderman, B., Germano, P., Kanagala, A., Liu, H., Provost, J., Simmons, J., Tanda, E., Wanderer, J., Hölzle, U., Stuart, S., and A. Vahdat, "Jupiter rising: a decade of clos topologies and centralized control in Google's datacenter network", Communications of the ACM Vol. 59, pp. 88-97, DOI 10.1145/2975159, August 2016, <https://doi.org/10.1145/2975159>.

[RFC2629]

diff -Nru xml2rfc-3.12.1/tests/valid/elements.bom.text xml2rfc-3.12.2/tests/valid/elements.bom.text --- xml2rfc-3.12.1/tests/valid/elements.bom.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/elements.bom.text 2022-02-16 20:30:53.000000000 +0000 @@ -1469,7 +1469,6 @@ Midtskogveien 18 2020 Skedsmokorset Norway - Email: henrik@levkowetz.com, henrik@tools.ietf.org @@ -1478,7 +1477,6 @@ David Hamelech 14 Tel Aviv 64953 Israel - Email: ron.even.tlv@gmail.com Additional contact information: @@ -1495,7 +1493,6 @@ 4-3-2 Hakusan, Bunkyo-ku, Tokyo 112-0001 Japan - Email: hanako.tanaka@nihon.example Additional contact information: @@ -1509,6 +1506,9 @@ + + + Author, et al. Expires 13 January 2019 [Page 27] Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 @@ -1518,7 +1518,6 @@ Tokyo 112-0001 Japan - Email: no@org.example.org @@ -1540,6 +1539,7 @@ + diff -Nru xml2rfc-3.12.1/tests/valid/elements.pages.text xml2rfc-3.12.2/tests/valid/elements.pages.text --- xml2rfc-3.12.1/tests/valid/elements.pages.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/elements.pages.text 2022-02-16 20:30:53.000000000 +0000 @@ -1469,7 +1469,6 @@ Midtskogveien 18 2020 Skedsmokorset Norway - Email: henrik@levkowetz.com, henrik@tools.ietf.org @@ -1478,7 +1477,6 @@ David Hamelech 14 Tel Aviv 64953 Israel - Email: ron.even.tlv@gmail.com Additional contact information: @@ -1495,7 +1493,6 @@ 4-3-2 Hakusan, Bunkyo-ku, Tokyo 112-0001 Japan - Email: hanako.tanaka@nihon.example Additional contact information: @@ -1509,6 +1506,9 @@ + + + Author, et al. Expires January 13, 2019 [Page 27] Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 @@ -1518,7 +1518,6 @@ Tokyo 112-0001 Japan - Email: no@org.example.org @@ -1540,6 +1539,7 @@ + diff -Nru xml2rfc-3.12.1/tests/valid/elements.text xml2rfc-3.12.2/tests/valid/elements.text --- xml2rfc-3.12.1/tests/valid/elements.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/elements.text 2022-02-16 20:30:53.000000000 +0000 @@ -1204,7 +1204,6 @@ Midtskogveien 18 2020 Skedsmokorset Norway - Email: henrik@levkowetz.com, henrik@tools.ietf.org @@ -1213,7 +1212,6 @@ David Hamelech 14 Tel Aviv 64953 Israel - Email: ron.even.tlv@gmail.com Additional contact information: @@ -1230,7 +1228,6 @@ 4-3-2 Hakusan, Bunkyo-ku, Tokyo 112-0001 Japan - Email: hanako.tanaka@nihon.example Additional contact information: @@ -1247,7 +1244,6 @@ Tokyo 112-0001 Japan - Email: no@org.example.org diff -Nru xml2rfc-3.12.1/tests/valid/elements.wip.text xml2rfc-3.12.2/tests/valid/elements.wip.text --- xml2rfc-3.12.1/tests/valid/elements.wip.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/elements.wip.text 2022-02-16 20:30:53.000000000 +0000 @@ -1469,7 +1469,6 @@ Midtskogveien 18 2020 Skedsmokorset Norway - Email: henrik@levkowetz.com, henrik@tools.ietf.org @@ -1478,7 +1477,6 @@ David Hamelech 14 Tel Aviv 64953 Israel - Email: ron.even.tlv@gmail.com Additional contact information: @@ -1495,7 +1493,6 @@ 4-3-2 Hakusan, Bunkyo-ku, Tokyo 112-0001 Japan - Email: hanako.tanaka@nihon.example Additional contact information: @@ -1509,6 +1506,9 @@ + + + Author, et al. Expires 13 January 2019 [Page 27] Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 @@ -1518,7 +1518,6 @@ Tokyo 112-0001 Japan - Email: no@org.example.org @@ -1540,6 +1539,7 @@ + diff -Nru xml2rfc-3.12.1/tests/valid/.gitignore xml2rfc-3.12.2/tests/valid/.gitignore --- xml2rfc-3.12.1/tests/valid/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/.gitignore 2022-02-16 20:30:53.000000000 +0000 @@ -0,0 +1 @@ +/attic diff -Nru xml2rfc-3.12.1/tests/valid/indexes.pages.text xml2rfc-3.12.2/tests/valid/indexes.pages.text --- xml2rfc-3.12.1/tests/valid/indexes.pages.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/indexes.pages.text 2022-02-16 20:30:53.000000000 +0000 @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft February 1, 2022 +Internet-Draft February 15, 2022 Intended status: Experimental -Expires: August 5, 2022 +Expires: August 19, 2022 xml2rfc index tests @@ -26,7 +26,7 @@ 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 August 5, 2022. + This Internet-Draft will expire on August 19, 2022. Copyright Notice @@ -53,7 +53,7 @@ -Person Expires August 5, 2022 [Page 1] +Person Expires August 19, 2022 [Page 1] Internet-Draft xml2rfc index tests February 2022 @@ -109,7 +109,7 @@ -Person Expires August 5, 2022 [Page 2] +Person Expires August 19, 2022 [Page 2] Internet-Draft xml2rfc index tests February 2022 @@ -165,4 +165,4 @@ -Person Expires August 5, 2022 [Page 3] +Person Expires August 19, 2022 [Page 3] diff -Nru xml2rfc-3.12.1/tests/valid/indexes.prepped.xml xml2rfc-3.12.2/tests/valid/indexes.prepped.xml --- xml2rfc-3.12.1/tests/valid/indexes.prepped.xml 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/indexes.prepped.xml 2022-02-16 20:30:53.000000000 +0000 @@ -1,6 +1,6 @@ - - + + @@ -20,7 +20,7 @@ - +
Status of This Memo @@ -41,7 +41,7 @@ material or to cite them other than as "work in progress." - This Internet-Draft will expire on 5 August 2022. + This Internet-Draft will expire on 19 August 2022.

diff -Nru xml2rfc-3.12.1/tests/valid/indexes.text xml2rfc-3.12.2/tests/valid/indexes.text --- xml2rfc-3.12.1/tests/valid/indexes.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/indexes.text 2022-02-16 20:30:53.000000000 +0000 @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft February 1, 2022 +Internet-Draft February 15, 2022 Intended status: Experimental -Expires: August 5, 2022 +Expires: August 19, 2022 xml2rfc index tests @@ -26,7 +26,7 @@ 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 August 5, 2022. + This Internet-Draft will expire on August 19, 2022. Copyright Notice diff -Nru xml2rfc-3.12.1/tests/valid/indexes.v3.py36.html xml2rfc-3.12.2/tests/valid/indexes.v3.py36.html --- xml2rfc-3.12.1/tests/valid/indexes.v3.py36.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/indexes.v3.py36.html 2022-02-16 20:30:53.000000000 +0000 @@ -6,7 +6,7 @@ xml2rfc index tests - + @@ -23,7 +23,7 @@ Person -Expires August 5, 2022 +Expires August 19, 2022 [Page] @@ -36,12 +36,12 @@
indexes-00

Published:

-February 1, 2022 +February 15, 2022

Intended Status:

Experimental

Expires:
-
August 5, 2022
+
August 19, 2022

Author:

@@ -71,7 +71,7 @@ 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 August 5, 2022.¶
+ This Internet-Draft will expire on August 19, 2022.¶

diff -Nru xml2rfc-3.12.1/tests/valid/indexes.v3.py37.html xml2rfc-3.12.2/tests/valid/indexes.v3.py37.html --- xml2rfc-3.12.1/tests/valid/indexes.v3.py37.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/indexes.v3.py37.html 2022-02-16 20:30:53.000000000 +0000 @@ -6,7 +6,7 @@ xml2rfc index tests - + @@ -23,7 +23,7 @@ Person -Expires August 5, 2022 +Expires August 19, 2022 [Page] @@ -36,12 +36,12 @@
indexes-00

Published:

-February 1, 2022 +February 15, 2022

Intended Status:

Experimental

Expires:
-
August 5, 2022
+
August 19, 2022

Author:

@@ -71,7 +71,7 @@ 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 August 5, 2022.¶
+ This Internet-Draft will expire on August 19, 2022.¶

diff -Nru xml2rfc-3.12.1/tests/valid/indexes.v3.py38.html xml2rfc-3.12.2/tests/valid/indexes.v3.py38.html --- xml2rfc-3.12.1/tests/valid/indexes.v3.py38.html 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/indexes.v3.py38.html 2022-02-16 20:30:53.000000000 +0000 @@ -6,7 +6,7 @@ xml2rfc index tests - + @@ -23,7 +23,7 @@ Person -Expires August 5, 2022 +Expires August 19, 2022 [Page] @@ -36,12 +36,12 @@

indexes-00

Published:

-February 1, 2022 +February 15, 2022

Intended Status:

Experimental

Expires:

August 5, 2022

August 19, 2022

Author:

@@ -71,7 +71,7 @@ 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 August 5, 2022.¶

+ This Internet-Draft will expire on August 19, 2022.¶

diff -Nru xml2rfc-3.12.1/tests/valid/manpage.txt xml2rfc-3.12.2/tests/valid/manpage.txt --- xml2rfc-3.12.1/tests/valid/manpage.txt 2022-02-01 17:30:29.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/manpage.txt 2022-02-16 20:30:53.000000000 +0000 @@ -1,5 +1,5 @@ xml2rfc(1) xml2rfc(1) - 1 February 2022 + 15 February 2022 Xml2rfc Vocabulary Version 3 Schema diff -Nru xml2rfc-3.12.1/tests/valid/rfc6787.pages.text xml2rfc-3.12.2/tests/valid/rfc6787.pages.text --- xml2rfc-3.12.1/tests/valid/rfc6787.pages.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/rfc6787.pages.text 2022-02-16 20:30:53.000000000 +0000 @@ -10548,7 +10548,6 @@ 189 South Orange Avenue #1000 Orlando, FL 32801 United States of America - Email: dburnett@voxeo.com @@ -10557,5 +10556,4 @@ 170 W. Tasman Dr. San Jose, CA 95134 United States of America - Email: sarvi@cisco.com diff -Nru xml2rfc-3.12.1/tests/valid/rfc6787.text xml2rfc-3.12.2/tests/valid/rfc6787.text --- xml2rfc-3.12.1/tests/valid/rfc6787.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/rfc6787.text 2022-02-16 20:30:53.000000000 +0000 @@ -10548,7 +10548,6 @@ 189 South Orange Avenue #1000 Orlando, FL 32801 United States of America - Email: dburnett@voxeo.com @@ -10557,5 +10556,4 @@ 170 W. Tasman Dr. San Jose, CA 95134 United States of America - Email: sarvi@cisco.com diff -Nru xml2rfc-3.12.1/tests/valid/rfc7911.exp.xml xml2rfc-3.12.2/tests/valid/rfc7911.exp.xml --- xml2rfc-3.12.1/tests/valid/rfc7911.exp.xml 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/rfc7911.exp.xml 2022-02-16 20:30:53.000000000 +0000 @@ -328,7 +328,7 @@ - + Capabilities Advertisement with BGP-4 @@ -363,7 +363,7 @@ - + Border Gateway Protocol (BGP) Persistent Route Oscillation Condition @@ -472,7 +472,7 @@ - + Graceful Restart Mechanism for BGP @@ -485,7 +485,7 @@ - + BGP Security Vulnerabilities Analysis diff -Nru xml2rfc-3.12.1/tests/valid/rfc7911.pages.text xml2rfc-3.12.2/tests/valid/rfc7911.pages.text --- xml2rfc-3.12.1/tests/valid/rfc7911.pages.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/rfc7911.pages.text 2022-02-16 20:30:53.000000000 +0000 @@ -340,7 +340,6 @@ 185 E. Dana Street Mountain View, CA 94041 United States of America - Email: dwalton@cumulusnetworks.com @@ -349,7 +348,6 @@ Kit Creek Rd. Research Triangle Park, NC 27709 United States of America - Email: aretana@cisco.com @@ -358,7 +356,6 @@ 170 W. Tasman Dr. San Jose, CA 95134 United States of America - Email: enkechen@cisco.com @@ -367,5 +364,4 @@ 1194 N. Mathilda Ave Sunnyvale, CA 94089 United States of America - Email: jgs@juniper.net diff -Nru xml2rfc-3.12.1/tests/valid/rfc7911.text xml2rfc-3.12.2/tests/valid/rfc7911.text --- xml2rfc-3.12.1/tests/valid/rfc7911.text 2022-02-01 16:59:24.000000000 +0000 +++ xml2rfc-3.12.2/tests/valid/rfc7911.text 2022-02-16 20:30:53.000000000 +0000 @@ -340,7 +340,6 @@ 185 E. Dana Street Mountain View, CA 94041 United States of America - Email: dwalton@cumulusnetworks.com @@ -349,7 +348,6 @@ Kit Creek Rd. Research Triangle Park, NC 27709 United States of America - Email: aretana@cisco.com @@ -358,7 +356,6 @@ 170 W. Tasman Dr. San Jose, CA 95134 United States of America - Email: enkechen@cisco.com @@ -367,5 +364,4 @@ 1194 N. Mathilda Ave Sunnyvale, CA 94089 United States of America - Email: jgs@juniper.net diff -Nru xml2rfc-3.12.1/tox.ini xml2rfc-3.12.2/tox.ini --- xml2rfc-3.12.1/tox.ini 2022-02-01 16:59:25.000000000 +0000 +++ xml2rfc-3.12.2/tox.ini 2022-02-16 20:30:53.000000000 +0000 @@ -4,7 +4,20 @@ # and then run "tox" from this directory. [tox] -envlist = py36, py37, py38 +envlist = py{36,37,38,39}-{linux,macos,windows} + +[gh-actions] +python = + 3.6: py36 + 3.7: py37 + 3.8: py38 + 3.9: py39 + +[gh-actions:env] +PLATFORM = + ubuntu-latest: linux + macos-latest: macos + windows-latest: windows [testenv] commands = diff -Nru xml2rfc-3.12.1/xml2rfc/__init__.py xml2rfc-3.12.2/xml2rfc/__init__.py --- xml2rfc-3.12.1/xml2rfc/__init__.py 2022-02-01 17:29:53.000000000 +0000 +++ xml2rfc-3.12.2/xml2rfc/__init__.py 2022-02-16 20:31:31.000000000 +0000 @@ -3,7 +3,7 @@ from __future__ import unicode_literals, print_function, division # Static values -__version__ = '3.12.1' +__version__ = '3.12.2' NAME = 'xml2rfc' VERSION = [ int(i) if i.isdigit() else i for i in __version__.split('.') ] CACHES = ['/var/cache/xml2rfc', '~/.cache/xml2rfc'] # Ordered by priority diff -Nru xml2rfc-3.12.1/xml2rfc/templates/rfc2629.dtd xml2rfc-3.12.2/xml2rfc/templates/rfc2629.dtd --- xml2rfc-3.12.1/xml2rfc/templates/rfc2629.dtd 2022-02-01 16:59:25.000000000 +0000 +++ xml2rfc-3.12.2/xml2rfc/templates/rfc2629.dtd 2022-02-16 20:30:53.000000000 +0000 @@ -1,328 +1,328 @@ - - - - - - - - - - - - - -%rfc2629-xhtml; - - -%rfc2629-other; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +%rfc2629-xhtml; + + +%rfc2629-other; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru xml2rfc-3.12.1/xml2rfc/writers/text.py xml2rfc-3.12.2/xml2rfc/writers/text.py --- xml2rfc-3.12.1/xml2rfc/writers/text.py 2022-02-01 16:59:25.000000000 +0000 +++ xml2rfc-3.12.2/xml2rfc/writers/text.py 2022-02-16 20:30:53.000000000 +0000 @@ -2560,7 +2560,7 @@ latin = True try: text = format_address(adr, latin=latin) - text = text.strip(stripspace)+'\n\n' + text = text.strip(stripspace)+'\n' return mklines(text, e) except: debug.pprint('adr') diff -Nru xml2rfc-3.12.1/xml2rfc.egg-info/PKG-INFO xml2rfc-3.12.2/xml2rfc.egg-info/PKG-INFO --- xml2rfc-3.12.1/xml2rfc.egg-info/PKG-INFO 2022-02-01 17:55:05.000000000 +0000 +++ xml2rfc-3.12.2/xml2rfc.egg-info/PKG-INFO 2022-02-16 20:31:32.000000000 +0000 @@ -1,6 +1,6 @@ -Metadata-Version: 1.2 +Metadata-Version: 2.1 Name: xml2rfc -Version: 3.12.1 +Version: 3.12.2 Summary: Xml2rfc generates RFCs and IETF drafts from document source in XML according to the IETF xml2rfc v2 and v3 vocabularies. Home-page: https://tools.ietf.org/tools/xml2rfc/trac/ Author: Henrik Levkowetz @@ -9,141 +9,6 @@ Maintainer-email: henrik@levkowetz.com License: BSD-3-Clause Download-URL: https://pypi.python.org/pypi/xml2rfc -Description: Introduction - ============ - - The IETF_ uses a specific format for the standards and other documents it - publishes as RFCs_, and for the draft documents which are produced when - developing documents for publications. There exists a number of different - tools to facilitate the formatting of drafts and RFCs according to the - existing rules, and this tool, **xml2rfc**, is one of them. It takes as input - an xml file which contains the text and meta-information about author names - etc., and transforms it into suitably formatted output. The input xml file - should follow the grammars in RFC7749_ (for v2 documents) or RFC7991_ (for - v3 documents). Note that the grammar for v3 is still being refined, and - changes will eventually be captured in the `bis draft for 7991`_. - Changes not yet captured can be seen in the xml2rfc source `v3.rng`_, - or in the `documentation xml2rfc produces`_ with its --doc flag. - - **xml2rfc** provides a variety of output formats. See the command line - help for a full list of formats. It also provides conversion from v2 to - v3, and can run the preptool_ on its input. - - .. _IETF: https://www.ietf.org/ - .. _RFCs: https://www.rfc-editor.org/ - .. _RFC7749: https://tools.ietf.org/html/rfc7749 - .. _RFC7991: https://tools.ietf.org/html/rfc7991 - .. _bis draft for 7991: https://tools.ietf.org/html/draft-iab-rfc7991bis - .. _v3.rng: https://trac.tools.ietf.org/tools/xml2rfc/trac/browser/trunk/cli/xml2rfc/data/v3.rng - .. _documentation xml2rfc produces: https://xml2rfc.tools.ietf.org/xml2rfc-doc.html - .. _preptool: https://tools.ietf.org/html/rfc7998 - - Installation - ============ - - Installation of the python package is done as usual with 'pip install xml2rfc', - using appropriate switches and/or sudo. - - Installation of support libraries for the PDF-formatter - ------------------------------------------------------- - - In order to generate PDFs, xml2rfc uses the WeasyPrint module, which - depends on external libaries that must be installed as native packages - on your platform, separately from the xml2rfc install. - - First, install the Cairo, Pango, and GDK-PixBuf library files on your - system. See installation instructions on the WeasyPrint Docs: - - https://weasyprint.readthedocs.io/en/stable/install.html - - (On some OS X systems with System Integrity Protection active, you may - need to create a symlink from your home directory to the library installation - directory (often /opt/local/lib): - - ln -s /opt/local/lib ~/lib - - in order for weasyprint to find the installed cairo and pango libraries. - Whether this is needed or not depends on whether you used macports or homebrew - to install cairo and pango, and the homebrew / macport version.) - - Next, install the pycairo and weasyprint python modules using pip. - Depending on your system, you may need to use 'sudo' or install in - user-specific directories, using the --user switch. On OS X in - particular, you may also need to install a newer version of setuptools - using --user before weasyprint can be installed. If you install with - the --user switch, you may need to also set PYTHONPATH, e.g., - - PYTHONPATH=/Users/henrik/Library/Python/3.6/lib/python/site-packages - - for Python 3.6. - - The basic pip commands (modify as needed according to the text above) - are: - - pip install 'pycairo>=1.18' 'weasyprint<=0.42.3' - - With these installed and available to xml2rfc, the --pdf switch will be - enabled. - - For PDF output, you also need to install the Noto font set. Download the full - set from https://noto-website-2.storage.googleapis.com/pkgs/Noto-unhinted.zip, - and install as appropriate for your platform. - - Usage - ===== - - xml2rfc accepts a single XML document as input and outputs to one or more conversion formats. - - **Basic Usage**: ``xml2rfc SOURCE [options] FORMATS...`` - - Run ``xml2rfc --help`` for a full listing of command-line options. - - - - Changelog - ========= - - - Version 3.12.1 (01 Feb 2022) - ------------------------------------------------ - - - * Merged in [4090] from krathnayake@ietf.org: - Improve local file lookup: Add source directory to the allowed list, Disallow any files that are on child directories of the source directory, Add a warning when including .ent files. Fixes #703. - - * Merged in [4089] from krathnayake@ietf.org: - Update bibxml subdirectories list. Fixes #701. - - * Merged in [4088] from krathnayake@ietf.org: - Fixes manpage generation issue. Fixes #694. - - - - - - - - Version 3.12.0 (08 Dec 2021) - ------------------------------------------------ - - * Security release - disallow includes from local filesystem by default. - Adds a --allow-local-file-access flag (and associated library - configuration option) to allow it. - - - - - - - Version 3.11.1 (29 Oct 2021) - ------------------------------------------------ - - * Cosmetic release to address changelog formatting - - - - - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Environment :: Console @@ -154,3 +19,99 @@ Classifier: Topic :: Text Processing Classifier: Topic :: Text Processing :: Markup :: XML Classifier: License :: OSI Approved :: BSD License +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 +Description-Content-Type: text/markdown +License-File: LICENSE + +

+ +

+ +[![Release](https://img.shields.io/github/release/ietf-tools/xml2rfc.svg?style=flat&maxAge=600)](https://github.com/ietf-tools/xml2rfc/releases) +[![License](https://img.shields.io/github/license/ietf-tools/xml2rfc)](https://github.com/ietf-tools/xml2rfc/blob/main/LICENSE) +[![PyPI - Version](https://img.shields.io/pypi/v/xml2rfc)](https://pypi.org/project/xml2rfc/) +[![PyPI - Status](https://img.shields.io/pypi/status/xml2rfc)](https://pypi.org/project/xml2rfc/) +[![PyPI - Format](https://img.shields.io/pypi/format/xml2rfc)](https://pypi.org/project/xml2rfc/) + +##### Generate RFCs and IETF drafts from document source in XML according to the IETF xml2rfc v2 and v3 vocabularies + +

+ +- [Changelog](https://github.com/ietf-tools/xml2rfc/blob/main/CHANGELOG.md) +- [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) +- [Installation](#installation) +- [Usage](#usage) +- [Release Procedure](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md#release-procedure) + +--- + +### Introduction + +The [IETF] uses a specific format for the standards and other documents it publishes as [RFCs], and for the draft documents which are produced when developing documents for publications. There exists a number of different tools to facilitate the formatting of drafts and RFCs according to the existing rules, and this tool, **xml2rfc**, is one of them. It takes as input an xml file which contains the text and meta-information about author names etc., and transforms it into suitably formatted output. The input xml file should follow the grammars in [RFC7749] *(for v2 documents)* or [RFC7991] *(for v3 documents)*. Note that the grammar for v3 is still being refined, and changes will eventually be captured in the [bis draft for 7991]. Changes not yet captured can be seen in the xml2rfc source [v3.rng], or in the [documentation xml2rfc produces] with its `--doc` flag. + +**xml2rfc** provides a variety of output formats. See the command line help for a full list of formats. It also provides conversion from v2 to v3, and can run the [preptool] on its input. + +### Installation + +Installation of the python package is done as usual with `pip install xml2rfc`, using appropriate switches and/or sudo. + +#### Installation of support libraries for the PDF-formatter + +In order to generate PDFs, **xml2rfc** uses the WeasyPrint module, which depends on external libaries that must be installed as native packages on your platform, separately from the **xml2rfc** install. + +First, install the **Cairo**, **Pango**, and **GDK-PixBuf** library files on your system. See installation instructions on the [WeasyPrint Docs](https://weasyprint.readthedocs.io/en/stable/install.html). + +> On some macOS systems with **System Integrity Protection** active, you may need to create a symlink from your home directory to the library installation directory (often `/opt/local/lib`): +> +> ```sh +> ln -s /opt/local/lib ~/lib +> ``` +> +> in order for weasyprint to find the installed cairo and pango libraries. Whether this is needed or not depends on whether you used macports or homebrew to install cairo and pango, and the homebrew / macport version. + +Next, install the `pycairo` and `weasyprint` python modules using pip. Depending on your system, you may need to use `sudo` or install in user-specific directories, using the `--user` switch. On macOS in particular, you may also need to install a newer version of `setuptools` using `--user` before `weasyprint` can be installed. + +> If you install with the `--user` switch, you may need to also set `PYTHONPATH`, e.g.: +> +> ```sh +> PYTHONPATH=/Users/henrik/Library/Python/3.6/lib/python/site-packages +> ``` +> +> for Python 3.6. + +The basic pip commands (modify as needed according to the text above) are: + +```sh +pip install 'pycairo>=1.18' 'weasyprint<=0.42.3' +``` + +With these installed and available to **xml2rfc**, the `--pdf` switch will be enabled. + +For PDF output, you also need to install the Noto font set. [Download the full set](https://noto-website-2.storage.googleapis.com/pkgs/Noto-unhinted.zip) and install as appropriate for your platform. + +### Usage + +**xml2rfc** accepts a single XML document as input and outputs to one or more conversion formats. + +#### Basic Usage + +```sh +xml2rfc SOURCE [options] FORMATS... +``` + +Run `xml2rfc --help` for a full listing of command-line options. + +[IETF]: https://www.ietf.org/ +[RFCs]: https://www.rfc-editor.org/ +[RFC7749]: https://tools.ietf.org/html/rfc7749 +[RFC7991]: https://tools.ietf.org/html/rfc7991 +[bis draft for 7991]: https://tools.ietf.org/html/draft-iab-rfc7991bis +[v3.rng]: https://trac.tools.ietf.org/tools/xml2rfc/trac/browser/trunk/cli/xml2rfc/data/v3.rng +[documentation xml2rfc produces]: https://xml2rfc.tools.ietf.org/xml2rfc-doc.html +[preptool]: https://tools.ietf.org/html/rfc7998 + + diff -Nru xml2rfc-3.12.1/xml2rfc.egg-info/SOURCES.txt xml2rfc-3.12.2/xml2rfc.egg-info/SOURCES.txt --- xml2rfc-3.12.1/xml2rfc.egg-info/SOURCES.txt 2022-02-01 17:55:05.000000000 +0000 +++ xml2rfc-3.12.2/xml2rfc.egg-info/SOURCES.txt 2022-02-16 20:31:32.000000000 +0000 @@ -1,102 +1,13 @@ +CHANGELOG.md LICENSE MANIFEST.in -README -changelog +README.md requirements.txt setup.cfg setup.py test.py tox.ini -tests/cache/2975159-x7cSb7sXITTe0OdOQ2uuNd6NBVw=.xml -tests/cache/reference.I-D.draft-ietf-6lo-ap-nd-23.xml -tests/cache/reference.I-D.levkowetz-xml2rfc-v3-implementation-notes.xml -tests/cache/reference.I-D.narten-iana-considerations-rfc2434bis.xml -tests/cache/reference.IEEE.802-1Y.1990.xml -tests/cache/reference.ISO.8327.1990.xml -tests/cache/reference.ISO.8601.1988.xml -tests/cache/reference.ISO.8859-1.1987.xml -tests/cache/reference.RFC.0793.xml -tests/cache/reference.RFC.0952.xml -tests/cache/reference.RFC.1035.xml -tests/cache/reference.RFC.2026.xml -tests/cache/reference.RFC.2045.xml -tests/cache/reference.RFC.2046.xml -tests/cache/reference.RFC.2047.xml -tests/cache/reference.RFC.2049.xml -tests/cache/reference.RFC.2119.xml -tests/cache/reference.RFC.2326.xml -tests/cache/reference.RFC.2392.xml -tests/cache/reference.RFC.2397.xml -tests/cache/reference.RFC.2483.xml -tests/cache/reference.RFC.2616.xml -tests/cache/reference.RFC.2629.xml -tests/cache/reference.RFC.2634.xml -tests/cache/reference.RFC.2818.xml -tests/cache/reference.RFC.3023.xml -tests/cache/reference.RFC.3261.xml -tests/cache/reference.RFC.3264.xml -tests/cache/reference.RFC.3339.xml -tests/cache/reference.RFC.3345.xml -tests/cache/reference.RFC.3550.xml -tests/cache/reference.RFC.3552.xml -tests/cache/reference.RFC.3629.xml -tests/cache/reference.RFC.3688.xml -tests/cache/reference.RFC.3711.xml -tests/cache/reference.RFC.3966.xml -tests/cache/reference.RFC.3986.xml -tests/cache/reference.RFC.4145.xml -tests/cache/reference.RFC.4217.xml -tests/cache/reference.RFC.4267.xml -tests/cache/reference.RFC.4271.xml -tests/cache/reference.RFC.4272.xml -tests/cache/reference.RFC.4288.xml -tests/cache/reference.RFC.4289.xml -tests/cache/reference.RFC.4301.xml -tests/cache/reference.RFC.4313.xml -tests/cache/reference.RFC.4395.xml -tests/cache/reference.RFC.4463.xml -tests/cache/reference.RFC.4467.xml -tests/cache/reference.RFC.4566.xml -tests/cache/reference.RFC.4568.xml -tests/cache/reference.RFC.4572.xml -tests/cache/reference.RFC.4724.xml -tests/cache/reference.RFC.4733.xml -tests/cache/reference.RFC.4760.xml -tests/cache/reference.RFC.4941.xml -tests/cache/reference.RFC.4960.xml -tests/cache/reference.RFC.5035.xml -tests/cache/reference.RFC.5083.xml -tests/cache/reference.RFC.5226.xml -tests/cache/reference.RFC.5234.xml -tests/cache/reference.RFC.5246.xml -tests/cache/reference.RFC.5322.xml -tests/cache/reference.RFC.5343.xml -tests/cache/reference.RFC.5492.xml -tests/cache/reference.RFC.5590.xml -tests/cache/reference.RFC.5591.xml -tests/cache/reference.RFC.5646.xml -tests/cache/reference.RFC.5652.xml -tests/cache/reference.RFC.5888.xml -tests/cache/reference.RFC.5905.xml -tests/cache/reference.RFC.5922.xml -tests/cache/reference.RFC.6068.xml -tests/cache/reference.RFC.6087.xml -tests/cache/reference.RFC.6265.xml -tests/cache/reference.RFC.6353.xml -tests/cache/reference.RFC.6454.xml -tests/cache/reference.RFC.6838.xml -tests/cache/reference.RFC.7322.xml -tests/cache/reference.RFC.7669.xml -tests/cache/reference.RFC.7841.xml -tests/cache/reference.RFC.7991.xml -tests/cache/reference.RFC.7996.xml -tests/cache/reference.RFC.7997.xml -tests/cache/reference.RFC.7998.xml -tests/cache/reference.RFC.8174.xml -tests/cache/reference.W3C.CR-accelerometer-20191212.xml -tests/cache/reference.W3C.REC-speech-grammar-20040316.xml -tests/cache/reference.W3C.REC-speech-synthesis-20040907.xml -tests/cache/reference.W3C.REC-voicexml20-20040316.xml +tests/input/.gitignore tests/input/abbreviations.xml tests/input/draft-flanagan-nonascii-05.xml tests/input/draft-miek-test.v3.xml @@ -132,6 +43,7 @@ tests/input/textwrap.xml tests/input/unicode.xml tests/input/utf8.xml +tests/valid/.gitignore tests/valid/abbreviations.html tests/valid/abbreviations.nroff tests/valid/abbreviations.raw.txt

Xml2rfc Vocabulary Version 3 Schemaxml2rfc release 3.12.0

Xml2rfc Vocabulary Version 3 Schemaxml2rfc release 3.12.1

Abstract

Xml2rfc Vocabulary Version 3 Schemaxml2rfc release 3.12.0

Xml2rfc Vocabulary Version 3 Schemaxml2rfc release 3.12.1

Abstract

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.12.0

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.12.1

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.12.0

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.12.1