- This documentation applies to xml2rfc version 3.13.1.¶
+ This documentation applies to xml2rfc version 3.14.1.¶
@@ -6351,7 +6351,7 @@
The following variables are available for use in an xml2rfc
- manpage Jinja2 template, as of xml2rfc version 3.13.1:¶
+ manpage Jinja2 template, as of xml2rfc version 3.14.1:¶
{{ bare_latin_tags }}:
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html
index 1e05ee171..a40255e59 100644
--- 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">
-
+
@@ -26,7 +26,7 @@
-
- Key words for use in RFCs to Indicate Requirement Levels
-
-
-
- In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
-
-
-
-
-
+
+Key words for use in RFCs to Indicate Requirement Levels
+
+
+In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
+
+
+
+
diff --git a/tests/valid/draft-template-old.prepped.xml b/tests/valid/draft-template-old.prepped.xml
index 3662cb0c5..1e97cecbc 100644
--- a/tests/valid/draft-template-old.prepped.xml
+++ b/tests/valid/draft-template-old.prepped.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -553,10 +553,12 @@ main(int argc, char *argv[])
Key words for use in RFCs to Indicate Requirement Levels
-
-
+
+
+
+
- In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
+ In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
diff --git a/tests/valid/draft-template-old.v2v3.xml b/tests/valid/draft-template-old.v2v3.xml
index 5325a8f78..2df604636 100644
--- a/tests/valid/draft-template-old.v2v3.xml
+++ b/tests/valid/draft-template-old.v2v3.xml
@@ -33,7 +33,7 @@
-
+
@@ -452,10 +452,12 @@ main(int argc, char *argv[])
Key words for use in RFCs to Indicate Requirement Levels
-
-
+
+
+
+
- In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
+ In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
diff --git a/tests/valid/draft-template.exp.xml b/tests/valid/draft-template.exp.xml
index b8e7622f3..d5af611f5 100644
--- a/tests/valid/draft-template.exp.xml
+++ b/tests/valid/draft-template.exp.xml
@@ -417,10 +417,12 @@ main(int argc, char *argv[])
Key words for use in RFCs to Indicate Requirement Levels
-
-
+
+
+
+
- In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
+ In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
index 98ab0f509..c797d992e 100644
--- a/tests/valid/draft-template.html
+++ b/tests/valid/draft-template.html
@@ -11,11 +11,11 @@
Insert an abstract: MANDATORY. This template is for creating an
Internet Draft.
" name="description">
-
+
+
+
@@ -553,10 +553,12 @@ main(int argc, char *argv[])
Key words for use in RFCs to Indicate Requirement Levels
-
-
+
+
+
+
- In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
+ In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
diff --git a/tests/valid/elements.bom.text b/tests/valid/elements.bom.text
index 53799e6f0..6772103dd 100644
--- a/tests/valid/elements.bom.text
+++ b/tests/valid/elements.bom.text
@@ -1327,8 +1327,8 @@ CMS References
Levkowetz, H., "Implementation notes for RFC7991,", Work
in Progress, Internet-Draft, draft-levkowetz-xml2rfc-v3-
implementation-notes-13, 16 September 2021,
- .
+ .
[RFC5083] Housley, R., "Cryptographic Message Syntax (CMS)
Authenticated-Enveloped-Data Content Type", RFC 5083,
@@ -1420,10 +1420,9 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
[REPUBLIC] Πλάτων (Plato), "Πολιτεία", 375 BC.
- [RFC0952] Harrenstien, K., Stahl, M K., and E J. Feinler, "DoD
- Internet host table specification", RFC 952,
- DOI 10.17487/RFC0952, October 1985,
- .
+ [RFC0952] Harrenstien, K., Stahl, M., and E. Feinler, "DoD Internet
+ host table specification", RFC 952, DOI 10.17487/RFC0952,
+ October 1985, .
Appendix A. Some Back Matter
@@ -1453,6 +1452,7 @@ A.1. Contributors
+
Author, et al. Expires 13 January 2019 [Page 26]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
diff --git a/tests/valid/elements.pages.text b/tests/valid/elements.pages.text
index 990b5ced3..453353913 100644
--- a/tests/valid/elements.pages.text
+++ b/tests/valid/elements.pages.text
@@ -1327,8 +1327,8 @@ CMS References
Levkowetz, H., "Implementation notes for RFC7991,", Work
in Progress, Internet-Draft, draft-levkowetz-xml2rfc-v3-
implementation-notes-13, September 16, 2021,
- .
+ .
[RFC5083] Housley, R., "Cryptographic Message Syntax (CMS)
Authenticated-Enveloped-Data Content Type", RFC 5083,
@@ -1420,10 +1420,9 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
[REPUBLIC] Πλάτων (Plato), "Πολιτεία", 375 BC.
- [RFC0952] Harrenstien, K., Stahl, M K., and E J. Feinler, "DoD
- Internet host table specification", RFC 952,
- DOI 10.17487/RFC0952, October 1985,
- .
+ [RFC0952] Harrenstien, K., Stahl, M., and E. Feinler, "DoD Internet
+ host table specification", RFC 952, DOI 10.17487/RFC0952,
+ October 1985, .
Appendix A. Some Back Matter
@@ -1453,6 +1452,7 @@ A.1. Contributors
+
Author, et al. Expires January 13, 2019 [Page 26]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
diff --git a/tests/valid/elements.prepped.xml b/tests/valid/elements.prepped.xml
index ed36b020b..c08058f79 100644
--- a/tests/valid/elements.prepped.xml
+++ b/tests/valid/elements.prepped.xml
@@ -1,5 +1,5 @@
-
+
@@ -1473,10 +1473,12 @@ for opt, value in opts:
Key words for use in RFCs to Indicate Requirement Levels
-
-
+
+
+
+
- In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
+ In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
@@ -1510,10 +1512,12 @@ for opt, value in opts:
Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words
-
-
+
+
+
+
- RFC 2119 specifies common key words that may be used in protocol specifications. This document aims to reduce the ambiguity by clarifying that only UPPERCASE usage of the key words have the defined special meanings.
+ RFC 2119 specifies common key words that may be used in protocol specifications. This document aims to reduce the ambiguity by clarifying that only UPPERCASE usage of the key words have the defined special meanings.
@@ -1525,15 +1529,15 @@ for opt, value in opts:
Informative ReferencesCMS References
-
+ Implementation notes for RFC7991,
-
- Elf Tools AB
-
+
- This memo documents issues and observations found while implementing RFC 7991. Individual notes are organised into separate sections, depending on their character.
+ This memo documents issues and observations found while implementing
+ RFC 7991. Individual notes are organised into separate sections,
+ depending on their character.
@@ -1542,10 +1546,12 @@ for opt, value in opts:
Cryptographic Message Syntax (CMS) Authenticated-Enveloped-Data Content Type
-
-
+
+
+
+
- This document describes an additional content type for the Cryptographic Message Syntax (CMS). The authenticated-enveloped-data content type is intended for use with authenticated encryption modes. All of the various key management techniques that are supported in the CMS enveloped-data content type are also supported by the CMS authenticated-enveloped-data content type. [STANDARDS-TRACK]
+ This document describes an additional content type for the Cryptographic Message Syntax (CMS). The authenticated-enveloped-data content type is intended for use with authenticated encryption modes. All of the various key management techniques that are supported in the CMS enveloped-data content type are also supported by the CMS authenticated-enveloped-data content type. [STANDARDS-TRACK]
@@ -1554,10 +1560,12 @@ for opt, value in opts:
Cryptographic Message Syntax (CMS)
-
-
+
+
+
+
- This document describes the Cryptographic Message Syntax (CMS). This syntax is used to digitally sign, digest, authenticate, or encrypt arbitrary message content. [STANDARDS-TRACK]
+ This document describes the Cryptographic Message Syntax (CMS). This syntax is used to digitally sign, digest, authenticate, or encrypt arbitrary message content. [STANDARDS-TRACK]
@@ -1570,10 +1578,12 @@ for opt, value in opts:
Enhanced Security Services for S/MIME
-
-
+
+
+
+
- This document describes four optional security service extensions for S/MIME. [STANDARDS-TRACK]
+ This document describes four optional security service extensions for S/MIME. [STANDARDS-TRACK]
@@ -1582,10 +1592,12 @@ for opt, value in opts:
Enhanced Security Services (ESS) Update: Adding CertID Algorithm Agility
-
-
+
+
+
+
- In the original Enhanced Security Services for S/MIME document (RFC 2634), a structure for cryptographically linking the certificate to be used in validation with the signature was introduced; this structure was hardwired to use SHA-1. This document allows for the structure to have algorithm agility and defines a new attribute for this purpose. [STANDARDS-TRACK]
+ In the original Enhanced Security Services for S/MIME document (RFC 2634), a structure for cryptographically linking the certificate to be used in validation with the signature was introduced; this structure was hardwired to use SHA-1. This document allows for the structure to have algorithm agility and defines a new attribute for this purpose. [STANDARDS-TRACK]
@@ -1597,11 +1609,15 @@ for opt, value in opts:
Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies
-
-
-
+
+
+
+
+
+
+
- This initial document specifies the various headers used to describe the structure of MIME messages. [STANDARDS-TRACK]
+ This initial document specifies the various headers used to describe the structure of MIME messages. [STANDARDS-TRACK]
@@ -1610,11 +1626,15 @@ for opt, value in opts:
Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types
-
-
-
+
+
+
+
+
+
+
- This second document defines the general structure of the MIME media typing system and defines an initial set of media types. [STANDARDS-TRACK]
+ This second document defines the general structure of the MIME media typing system and defines an initial set of media types. [STANDARDS-TRACK]
@@ -1623,10 +1643,12 @@ for opt, value in opts:
MIME (Multipurpose Internet Mail Extensions) Part Three: Message Header Extensions for Non-ASCII Text
-
-
+
+
+
+
- This particular document is the third document in the series. It describes extensions to RFC 822 to allow non-US-ASCII text data in Internet mail header fields. [STANDARDS-TRACK]
+ This particular document is the third document in the series. It describes extensions to RFC 822 to allow non-US-ASCII text data in Internet mail header fields. [STANDARDS-TRACK]
@@ -1635,11 +1657,15 @@ for opt, value in opts:
Multipurpose Internet Mail Extensions (MIME) Part Five: Conformance Criteria and Examples
-
-
-
+
+
+
+
+
+
+
- This set of documents, collectively called the Multipurpose Internet Mail Extensions, or MIME, redefines the format of messages. This fifth and final document describes MIME conformance criteria as well as providing some illustrative examples of MIME message formats, acknowledgements, and the bibliography. [STANDARDS-TRACK]
+ This set of documents, collectively called the Multipurpose Internet Mail Extensions, or MIME, redefines the format of messages. This fifth and final document describes MIME conformance criteria as well as providing some illustrative examples of MIME message formats, acknowledgements, and the bibliography. [STANDARDS-TRACK]
@@ -1648,9 +1674,13 @@ for opt, value in opts:
Multipurpose Internet Mail Extensions (MIME) Part Four: Registration Procedures
-
-
-
+
+
+
+
+
+
+ This document specifies IANA registration procedures for MIME external body access types and content-transfer-encodings. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
@@ -1662,10 +1692,16 @@ for opt, value in opts:
Media Type Specifications and Registration Procedures
-
-
-
-
+
+
+
+
+
+
+
+
+
+ This document defines procedures for the specification and registration of media types for use in HTTP, MIME, and other Internet protocols. This memo documents an Internet Best Current Practice.
@@ -1739,12 +1775,18 @@ for opt, value in opts:
DoD Internet host table specification
-
-
-
-
+
+
+
+
+
+
+
+
+
+
- This RFC is the official specification of the format of the Internet Host Table. This edition of the specification includes minor revisions to RFC-810 which brings it up to date.
+ This RFC is the official specification of the format of the Internet Host Table. This edition of the specification includes minor revisions to RFC-810 which brings it up to date.
diff --git a/tests/valid/elements.text b/tests/valid/elements.text
index 017bdc3cd..0b3dc37e2 100644
--- a/tests/valid/elements.text
+++ b/tests/valid/elements.text
@@ -1089,8 +1089,8 @@ CMS References
Levkowetz, H., "Implementation notes for RFC7991,", Work
in Progress, Internet-Draft, draft-levkowetz-xml2rfc-v3-
implementation-notes-13, September 16, 2021,
- .
+ .
[RFC5083] Housley, R., "Cryptographic Message Syntax (CMS)
Authenticated-Enveloped-Data Content Type", RFC 5083,
@@ -1164,10 +1164,9 @@ Other References
[REPUBLIC] Πλάτων (Plato), "Πολιτεία", 375 BC.
- [RFC0952] Harrenstien, K., Stahl, M K., and E J. Feinler, "DoD
- Internet host table specification", RFC 952,
- DOI 10.17487/RFC0952, October 1985,
- .
+ [RFC0952] Harrenstien, K., Stahl, M., and E. Feinler, "DoD Internet
+ host table specification", RFC 952, DOI 10.17487/RFC0952,
+ October 1985, .
Appendix A. Some Back Matter
diff --git a/tests/valid/elements.v3.html b/tests/valid/elements.v3.html
index 1c9d668fa..3975dc8a3 100644
--- a/tests/valid/elements.v3.html
+++ b/tests/valid/elements.v3.html
@@ -15,7 +15,7 @@
-
+
@@ -1679,7 +1679,7 @@
-Harrenstien, K., Stahl, M K., and E J. Feinler, "DoD Internet host table specification", RFC 952, DOI 10.17487/RFC0952, , <https://www.rfc-editor.org/info/rfc952>.
+Harrenstien, K., Stahl, M., and E. Feinler, "DoD Internet host table specification", RFC 952, DOI 10.17487/RFC0952, , <https://www.rfc-editor.org/info/rfc952>.
diff --git a/tests/valid/elements.wip.text b/tests/valid/elements.wip.text
index 8acbe3cba..ad4b95f75 100644
--- a/tests/valid/elements.wip.text
+++ b/tests/valid/elements.wip.text
@@ -1327,8 +1327,8 @@ CMS References
Levkowetz, H., "Implementation notes for RFC7991,", Work
in Progress, Internet-Draft, draft-levkowetz-xml2rfc-v3-
implementation-notes-13, 16 September 2021,
- .
+ .
[RFC5083] Housley, R., "Cryptographic Message Syntax (CMS)
Authenticated-Enveloped-Data Content Type", RFC 5083,
@@ -1420,10 +1420,9 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
[REPUBLIC] Πλάτων (Plato), "Πολιτεία", 375 BC.
- [RFC0952] Harrenstien, K., Stahl, M K., and E J. Feinler, "DoD
- Internet host table specification", RFC 952,
- DOI 10.17487/RFC0952, October 1985,
- .
+ [RFC0952] Harrenstien, K., Stahl, M., and E. Feinler, "DoD Internet
+ host table specification", RFC 952, DOI 10.17487/RFC0952,
+ October 1985, .
Appendix A. Some Back Matter
@@ -1453,6 +1452,7 @@ A.1. Contributors
+
Author, et al. Expires 13 January 2019 [Page 26]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
index a6e6aa32f..4082b739d 100644
--- a/tests/valid/indexes.pages.text
+++ b/tests/valid/indexes.pages.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft August 9, 2022
+Internet-Draft August 29, 2022
Intended status: Experimental
-Expires: February 10, 2023
+Expires: March 2, 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 February 10, 2023.
+ This Internet-Draft will expire on March 2, 2023.
Copyright Notice
@@ -53,7 +53,7 @@ Table of Contents
-Person Expires February 10, 2023 [Page 1]
+Person Expires March 2, 2023 [Page 1]
Internet-Draft xml2rfc index tests August 2022
@@ -109,7 +109,7 @@ Index
-Person Expires February 10, 2023 [Page 2]
+Person Expires March 2, 2023 [Page 2]
Internet-Draft xml2rfc index tests August 2022
@@ -165,4 +165,4 @@ Author's Address
-Person Expires February 10, 2023 [Page 3]
+Person Expires March 2, 2023 [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
index 1bb3839a9..3ddc2012a 100644
--- a/tests/valid/indexes.prepped.xml
+++ b/tests/valid/indexes.prepped.xml
@@ -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 10 February 2023.
+ This Internet-Draft will expire on 2 March 2023.
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
index 75e4440ec..ac804da96 100644
--- a/tests/valid/indexes.text
+++ b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft August 9, 2022
+Internet-Draft August 29, 2022
Intended status: Experimental
-Expires: February 10, 2023
+Expires: March 2, 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 February 10, 2023.
+ This Internet-Draft will expire on March 2, 2023.
Copyright Notice
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
index 927e2e045..01cab3c6e 100644
--- a/tests/valid/indexes.v3.html
+++ b/tests/valid/indexes.v3.html
@@ -6,7 +6,7 @@
xml2rfc index tests
-
+
@@ -23,7 +23,7 @@
Person
-
Expires February 10, 2023
+
Expires March 2, 2023
[Page]
@@ -36,12 +36,12 @@
indexes-00
Published:
-
+
Intended Status:
Experimental
Expires:
-
+
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 February 10, 2023.¶
+ This Internet-Draft will expire on March 2, 2023.¶
diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
index 1bebb5e10..108ebb86f 100644
--- a/tests/valid/manpage.txt
+++ b/tests/valid/manpage.txt
@@ -1,10 +1,10 @@
xml2rfc(1) xml2rfc(1)
- 9 August 2022
+ 29 August 2022
Xml2rfc Vocabulary Version 3 Schema
- xml2rfc release 3.13.1
- xml2rfc-docs-3.13.1
+ xml2rfc release 3.14.1
+ xml2rfc-docs-3.14.1
Abstract
@@ -54,7 +54,7 @@ Table of Contents
The latest version of this documentation is available in HTML form at
https://ietf-tools.github.io/xml2rfc/.
- This documentation applies to xml2rfc version 3.13.1.
+ This documentation applies to xml2rfc version 3.14.1.
2. Schema Version 3 Elements
@@ -4310,7 +4310,7 @@ Appendix C. xml2rfc Configuration Files
Appendix D. xml2rfc Documentation Template Variables
The following variables are available for use in an xml2rfc manpage
- Jinja2 template, as of xml2rfc version 3.13.1:
+ Jinja2 template, as of xml2rfc version 3.14.1:
{{ bare_latin_tags }}:
diff --git a/tests/valid/rfc7911.exp.xml b/tests/valid/rfc7911.exp.xml
index ace6d7341..f6d72ede0 100644
--- a/tests/valid/rfc7911.exp.xml
+++ b/tests/valid/rfc7911.exp.xml
@@ -301,10 +301,12 @@
Key words for use in RFCs to Indicate Requirement Levels
-
-
+
+
+
+
- In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
+ In many standards track documents several words are used to signify the requirements in the specification. These words are often capitalized. This document defines these words as they should be interpreted in IETF documents. This document specifies an Internet Best Current Practices for the Internet Community, and requests discussion and suggestions for improvements.
diff --git a/tests/valid/rfc7911.html b/tests/valid/rfc7911.html
index 6d1468403..6a3afc8c0 100644
--- a/tests/valid/rfc7911.html
+++ b/tests/valid/rfc7911.html
@@ -16,10 +16,10 @@
that each path is identified by a Path Identifier in addition to the
address prefix.
" name="description">
-
+
+
+
@@ -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 10 February 2023.
+ This Internet-Draft will expire on 2 March 2023.
diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.text
index ed6b4ac2e..b99377114 100644
--- a/tests/valid/sourcecode.text
+++ b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft August 9, 2022
+Internet-Draft August 29, 2022
Intended status: Experimental
-Expires: February 10, 2023
+Expires: March 2, 2023
xml2rfc sourcecode tests
@@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."
- This Internet-Draft will expire on February 10, 2023.
+ This Internet-Draft will expire on March 2, 2023.
Copyright Notice
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
index 14e224cbf..a6cd4626e 100644
--- a/tests/valid/sourcecode.v3.html
+++ b/tests/valid/sourcecode.v3.html
@@ -6,7 +6,7 @@
xml2rfc sourcecode tests
-
+
@@ -23,7 +23,7 @@
Person
-
Expires February 10, 2023
+
Expires March 2, 2023
[Page]
@@ -36,12 +36,12 @@
sourcecode-00
Published:
-
+
Intended Status:
Experimental
Expires:
-
+
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 February 10, 2023.¶
+ This Internet-Draft will expire on March 2, 2023.¶
diff --git a/xml2rfc/writers/pdf.py b/xml2rfc/writers/pdf.py
index bbfd58856..44981bf53 100644
--- a/xml2rfc/writers/pdf.py
+++ b/xml2rfc/writers/pdf.py
@@ -5,6 +5,7 @@
import io
import logging
import os
+import re
import warnings
@@ -77,6 +78,8 @@ def pdf(self):
htmlwriter = HtmlWriter(self.xmlrfc, quiet=True, options=self.options, date=self.date)
html = htmlwriter.html()
+ html = self.flatten_unicode_spans(html)
+
writer = weasyprint.HTML(string=html, base_url="")
cssin = self.options.css or os.path.join(os.path.dirname(os.path.dirname(__file__)), 'data', 'xml2rfc.css')
@@ -147,6 +150,14 @@ def get_mono_fonts(self):
self.note(None, "Found installed font: %s" % ', '.join(fonts))
return fonts
+ def flatten_unicode_spans(self, html):
+ # This is a fix for bug in WeasyPrint that doesn't handle RTL unicode
+ # content correctly.
+ # See #873 & Kozea/WeasyPrint#1711
+ return re.sub(r'(?P.*?)',
+ r'\g',
+ html)
+
page_css_template = """
@media print {{