- This documentation applies to xml2rfc version 3.23.2.¶
+ This documentation applies to xml2rfc version 3.24.0.¶
@@ -6387,7 +6387,7 @@
The following variables are available for use in an xml2rfc
- manpage Jinja2 template, as of xml2rfc version 3.23.2:¶
+ manpage Jinja2 template, as of xml2rfc version 3.24.0:¶
{{ bare_latin_tags }}:
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html
index a58f9eef..ec692a8f 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 @@
diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
index afbf7e08..46008723 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">
-
+
diff --git a/tests/valid/elements.bom.text b/tests/valid/elements.bom.text
index d658816e..0d455244 100644
--- a/tests/valid/elements.bom.text
+++ b/tests/valid/elements.bom.text
@@ -597,7 +597,8 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
- | | column. +----+----+
+ | | column. | | |
+ | | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
@@ -612,7 +613,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
-
Author, et al. Expires 13 January 2019 [Page 11]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
@@ -620,8 +620,10 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
- | Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
- | 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+ | Title | Tilte | | | | | |
+ | 1 | 2 | | | | | |
+ | | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
+ | | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
@@ -667,8 +669,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
-
-
Author, et al. Expires 13 January 2019 [Page 12]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
diff --git a/tests/valid/elements.pages.text b/tests/valid/elements.pages.text
index 371752ff..dfb82d69 100644
--- a/tests/valid/elements.pages.text
+++ b/tests/valid/elements.pages.text
@@ -597,7 +597,8 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
- | | column. +----+----+
+ | | column. | | |
+ | | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
@@ -612,7 +613,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
-
Author, et al. Expires January 13, 2019 [Page 11]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
@@ -620,8 +620,10 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
- | Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
- | 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+ | Title | Tilte | | | | | |
+ | 1 | 2 | | | | | |
+ | | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
+ | | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
@@ -667,8 +669,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
-
-
Author, et al. Expires January 13, 2019 [Page 12]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
diff --git a/tests/valid/elements.text b/tests/valid/elements.text
index 7c9c2099..7c292818 100644
--- a/tests/valid/elements.text
+++ b/tests/valid/elements.text
@@ -507,7 +507,8 @@ Table of Contents
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
- | | column. +----+----+
+ | | column. | | |
+ | | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
@@ -520,8 +521,10 @@ Table of Contents
+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
- | Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
- | 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+ | Title | Tilte | | | | | |
+ | 1 | 2 | | | | | |
+ | | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
+ | | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
diff --git a/tests/valid/elements.wip.text b/tests/valid/elements.wip.text
index 9261689e..2ec054b0 100644
--- a/tests/valid/elements.wip.text
+++ b/tests/valid/elements.wip.text
@@ -597,7 +597,8 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
- | | column. +----+----+
+ | | column. | | |
+ | | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
@@ -612,7 +613,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
-
Author, et al. Expires 13 January 2019 [Page 11]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
@@ -620,8 +620,10 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
- | Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
- | 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+ | Title | Tilte | | | | | |
+ | 1 | 2 | | | | | |
+ | | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
+ | | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
@@ -667,8 +669,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
-
-
Author, et al. Expires 13 January 2019 [Page 12]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
index 8ececd1b..fd131462 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 October 22, 2024
+Internet-Draft November 14, 2024
Intended status: Experimental
-Expires: April 25, 2025
+Expires: May 18, 2025
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 April 25, 2025.
+ This Internet-Draft will expire on May 18, 2025.
Copyright Notice
@@ -53,9 +53,9 @@ Table of Contents
-Person Expires April 25, 2025 [Page 1]
+Person Expires May 18, 2025 [Page 1]
-Internet-Draft xml2rfc index tests October 2024
+Internet-Draft xml2rfc index tests November 2024
This is another section!
@@ -109,9 +109,9 @@ Index
-Person Expires April 25, 2025 [Page 2]
+Person Expires May 18, 2025 [Page 2]
-Internet-Draft xml2rfc index tests October 2024
+Internet-Draft xml2rfc index tests November 2024
E
@@ -165,4 +165,4 @@ Author's Address
-Person Expires April 25, 2025 [Page 3]
+Person Expires May 18, 2025 [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
index 79e9f8b4..6bc8a498 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 25 April 2025.
+ This Internet-Draft will expire on 18 May 2025.
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
index 69d166bc..e51940a2 100644
--- a/tests/valid/indexes.text
+++ b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft October 22, 2024
+Internet-Draft November 14, 2024
Intended status: Experimental
-Expires: April 25, 2025
+Expires: May 18, 2025
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 April 25, 2025.
+ This Internet-Draft will expire on May 18, 2025.
Copyright Notice
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
index da81bfe6..ae3e33e3 100644
--- a/tests/valid/indexes.v3.html
+++ b/tests/valid/indexes.v3.html
@@ -6,7 +6,7 @@
xml2rfc index tests
-
+
@@ -19,11 +19,11 @@
Internet-Draft
xml2rfc index tests
-
October 2024
+
November 2024
Person
-
Expires April 25, 2025
+
Expires May 18, 2025
[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 April 25, 2025.¶
+ This Internet-Draft will expire on May 18, 2025.¶
diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
index 64b920af..c9e53ad8 100644
--- a/tests/valid/manpage.txt
+++ b/tests/valid/manpage.txt
@@ -1,10 +1,10 @@
xml2rfc(1) xml2rfc(1)
- 22 October 2024
+ 14 November 2024
Xml2rfc Vocabulary Version 3 Schema
- xml2rfc release 3.23.2
- xml2rfc-docs-3.23.2
+ xml2rfc release 3.24.0
+ xml2rfc-docs-3.24.0
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.23.2.
+ This documentation applies to xml2rfc version 3.24.0.
2. Schema Version 3 Elements
@@ -4336,7 +4336,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.23.2:
+ Jinja2 template, as of xml2rfc version 3.24.0:
{{ bare_latin_tags }}:
diff --git a/tests/valid/rfc7911.html b/tests/valid/rfc7911.html
index 51eeda22..24d31f0b 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">
-
+
diff --git a/tests/valid/rfc99999.html b/tests/valid/rfc99999.html
index af8cff57..9efdb065 100644
--- a/tests/valid/rfc99999.html
+++ b/tests/valid/rfc99999.html
@@ -9,10 +9,10 @@
-
+
diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.pages.text
index 9148c0bc..75fcf7c1 100644
--- a/tests/valid/sourcecode.pages.text
+++ b/tests/valid/sourcecode.pages.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft October 22, 2024
+Internet-Draft November 14, 2024
Intended status: Experimental
-Expires: April 25, 2025
+Expires: May 18, 2025
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 April 25, 2025.
+ This Internet-Draft will expire on May 18, 2025.
Copyright Notice
@@ -53,9 +53,9 @@ Table of Contents
-Person Expires April 25, 2025 [Page 1]
+Person Expires May 18, 2025 [Page 1]
-Internet-Draft xml2rfc sourcecode tests October 2024
+Internet-Draft xml2rfc sourcecode tests November 2024
print("01")
@@ -109,9 +109,9 @@ Internet-Draft xml2rfc sourcecode tests October 2024
-Person Expires April 25, 2025 [Page 2]
+Person Expires May 18, 2025 [Page 2]
-Internet-Draft xml2rfc sourcecode tests October 2024
+Internet-Draft xml2rfc sourcecode tests November 2024
print("49")
@@ -165,9 +165,9 @@ Internet-Draft xml2rfc sourcecode tests October 2024
-Person Expires April 25, 2025 [Page 3]
+Person Expires May 18, 2025 [Page 3]
-Internet-Draft xml2rfc sourcecode tests October 2024
+Internet-Draft xml2rfc sourcecode tests November 2024
print("47")
@@ -221,4 +221,4 @@ Author's Address
-Person Expires April 25, 2025 [Page 4]
+Person Expires May 18, 2025 [Page 4]
diff --git a/tests/valid/sourcecode.prepped.xml b/tests/valid/sourcecode.prepped.xml
index c42ef085..08a20d13 100644
--- a/tests/valid/sourcecode.prepped.xml
+++ b/tests/valid/sourcecode.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 25 April 2025.
+ This Internet-Draft will expire on 18 May 2025.
diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.text
index 503d889f..daccf11b 100644
--- a/tests/valid/sourcecode.text
+++ b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft October 22, 2024
+Internet-Draft November 14, 2024
Intended status: Experimental
-Expires: April 25, 2025
+Expires: May 18, 2025
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 April 25, 2025.
+ This Internet-Draft will expire on May 18, 2025.
Copyright Notice
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
index 101bc331..bbc9bf49 100644
--- a/tests/valid/sourcecode.v3.html
+++ b/tests/valid/sourcecode.v3.html
@@ -6,7 +6,7 @@
xml2rfc sourcecode tests
-
+
@@ -19,11 +19,11 @@
Internet-Draft
xml2rfc sourcecode tests
-
October 2024
+
November 2024
Person
-
Expires April 25, 2025
+
Expires May 18, 2025
[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 April 25, 2025.¶
+ This Internet-Draft will expire on May 18, 2025.¶
diff --git a/xml2rfc/writers/text.py b/xml2rfc/writers/text.py
index 47261ff7..94a3b7fb 100644
--- a/xml2rfc/writers/text.py
+++ b/xml2rfc/writers/text.py
@@ -4179,7 +4179,7 @@ def set_colwidths(cells, rows, cols):
k, l = cell.origin
hspan = cell.rowspan+k-i if cell.rowspan else minspan
lines = len(cell.wrapped) if cell.wrapped else 0
- if hspan == minspan and lines > maxlines:
+ if lines > maxlines:
maxlines = lines
for j in range(cols):
cells[i][j].lines = maxlines