From d1585f94444872e36921985746ae779634cdb7b3 Mon Sep 17 00:00:00 2001
From: Kesara Rathnayake
@@ -367,7 +367,7 @@
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.14.1.¶Xml2rfc Vocabulary Version 3 Schema
+
xml2rfc release 3.14.1Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.14.2Abstract
The following variables are available for use in an xml2rfc - manpage Jinja2 template, as of xml2rfc version 3.14.1:¶
+ manpage Jinja2 template, as of xml2rfc version 3.14.2:¶- This Internet-Draft will expire on March 2, 2023.¶
+ This Internet-Draft will expire on March 4, 2023.¶- This Internet-Draft will expire on March 2, 2023.¶
+ This Internet-Draft will expire on March 4, 2023.¶Column Title 1 | +Column Tilte 2 | +Column Title 3 | +TC 4 | +TC 5 | +TC 6 | +TC 7 | +|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
C1 | +C2 | +C3 | +C4 | +C5 | +C6 | +C1 | +C2 | +C1 | +C2 | +C1 | +C2 | +C1 | +C2 | +||
Major Row 1, Column 1 | +Minor Row 1, Column 2 | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +
Minor Row 2, Column 2 | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +
Column Title 1 | +Column Tilte 2 | +Column Title 3 | +TC 4 | +TC 5 | +TC 6 | +TC 7 | +|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
C1 | +C2 | +C3 | +C4 | +C5 | +C6 | +C1 | +C2 | +C1 | +C2 | +C1 | +C2 | +C1 | +C2 | +||
Major Row 1, Column 1 | +Minor Row 1, Column 2 | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +
Minor Row 2, Column 2 | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +
Method | @@ -841,7 +908,7 @@ Definition list, third bullet, fourth element:dns | zone |
- |
active | 1 | @@ -852,7 +919,7 @@ Definition list, third bullet, fourth element:policy | ip |
- |
active | @@ -1266,7 +1333,7 @@ for opt, value in opts:
---|
Column Title 1 | +Column Tilte 2 | +Column Title 3 | +TC 4 | +TC 5 | +TC 6 | +TC 7 | +|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
C1 | +C2 | +C3 | +C4 | +C5 | +C6 | +C1 | +C2 | +C1 | +C2 | +C1 | +C2 | +C1 | +C2 | +||
Major Row 1, Column 1 | +Minor Row 1, Column 2 | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +
Minor Row 2, Column 2 | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +x | +
+
A really tight table where left padding cannot be applied as it would throw - the left-alignment of the text off.¶
-Method | @@ -906,7 +976,7 @@dns | zone |
- DNSWL publicly accessible query root domain¶ +DNSWL publicly accessible query root domain¶ |
active | 1 | @@ -917,8 +987,8 @@policy | ip |
- type A response received (or a quoted, - comma-separated list thereof)¶ +type A response received (or a quoted, + comma-separated list thereof)¶ |
active | 1 | @@ -1397,9 +1467,9 @@
---|
Head 1 | Head 2 | diff --git a/tests/valid/elements.wip.text b/tests/valid/elements.wip.text index ad4b95f75..97c096bd3 100644 --- a/tests/valid/elements.wip.text +++ b/tests/valid/elements.wip.text @@ -618,13 +618,31 @@ Author, et al. Expires 13 January 2019 [Page 11] Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 + +========+========+=================+=====+=====+=========+=========+ + |Column |Column |Column |TC |TC | TC | TC | + |Title 1 |Tilte 2 |Title |4 |5 | 6 | 7 | + | | |3 | | | | | + | | +==+==+==+==+==+==+==+==+==+==+====+====+====+====+ + | | |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, | | | | | | | | | | | | | | | + |Column 1|Column 2| | | | | | | | | | | | | | | + | +--------+--+--+--+--+--+--+--+--+--+--+----+----+----+----+ + | |Minor |x |x |x |x |x |x |x |x |x |x | x | x | x | x | + | |Row 2, | | | | | | | | | | | | | | | + | |Column 2| | | | | | | | | | | | | | | + +--------+--------+--+--+--+--+--+--+--+--+--+--+----+----+----+----+ + + Table 2: Large colspan + +=======+======+ | One | Two | +=======+======+ | Alpha | Beta | +-------+------+ - Table 2: Aligned left + Table 3: Aligned left +=======+======+ | One | Two | @@ -632,7 +650,7 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 | Alpha | Beta | +-------+------+ - Table 3: Aligned center + Table 4: Aligned center +=======+======+ | One | Two | @@ -640,7 +658,7 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 | Alpha | Beta | +-------+------+ - Table 4: Aligned right + Table 5: Aligned right A really tight table where left padding cannot be applied as it would throw the left-alignment of the text off. @@ -648,24 +666,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 - - - - - - - - - - - - - - - - - - @@ -699,7 +699,7 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 | | | | |applicable | | | +------+-----------+------+--------+-----------------+------+-------+ - Table 5 + Table 6 7. Unicode Literals @@ -1198,7 +1198,7 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 | | | path) | | +-----+-----+-------------------+--------------------+ - Table 6: nNLM at nSFF1 + Table 7: nNLM at nSFF1 This is an arbitrary term: And this is some text with a table. @@ -1219,7 +1219,7 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018 | Cell B10 | Empty Cell: | | +----------+-------------+----------+ - Table 7 + Table 8 15. Wide artwork diff --git a/xml2rfc/writers/text.py b/xml2rfc/writers/text.py index 314c3815a..0ac39de2c 100644 --- a/xml2rfc/writers/text.py +++ b/xml2rfc/writers/text.py @@ -4073,7 +4073,10 @@ def set_colwidths(cells, rows, cols): cell = cells[i][j] if cell.text: if cell.foldable: - cell.wrapped = fill(cell.text, width=cell.colwidth, fix_sentence_endings=True).splitlines() + if cell.colspan > 1: + cell.wrapped = fill(cell.text, width=cell.minwidth, fix_sentence_endings=True).splitlines() + else: + cell.wrapped = fill(cell.text, width=cell.colwidth, fix_sentence_endings=True).splitlines() else: cell.wrapped = cell.text.splitlines()
---|