From a49cfe48c3702abe6f9498dd11a48e2c47c2977b Mon Sep 17 00:00:00 2001
From: Kesara Rathnayake <kesara@fq.nz>
Date: Wed, 22 Jun 2022 19:00:37 +1200
Subject: [PATCH 1/2] chore: Run yestests

---
 tests/valid/indexes.pages.text     | 12 ++++++------
 tests/valid/indexes.prepped.xml    |  6 +++---
 tests/valid/indexes.text           |  6 +++---
 tests/valid/indexes.v3.html        |  8 ++++----
 tests/valid/manpage.txt            |  2 +-
 tests/valid/sourcecode.pages.text  | 14 +++++++-------
 tests/valid/sourcecode.prepped.xml |  6 +++---
 tests/valid/sourcecode.text        |  6 +++---
 tests/valid/sourcecode.v3.html     |  8 ++++----
 9 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
index abe14b51d..e0ed71ac5 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                                             June 20, 2022
+Internet-Draft                                             June 22, 2022
 Intended status: Experimental                                           
-Expires: December 22, 2022
+Expires: December 24, 2022
 
 
                           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 December 22, 2022.
+   This Internet-Draft will expire on December 24, 2022.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                  Expires December 22, 2022               [Page 1]
+Person                  Expires December 24, 2022               [Page 1]
 
 Internet-Draft             xml2rfc index tests                 June 2022
 
@@ -109,7 +109,7 @@ Index
 
 
 
-Person                  Expires December 22, 2022               [Page 2]
+Person                  Expires December 24, 2022               [Page 2]
 
 Internet-Draft             xml2rfc index tests                 June 2022
 
@@ -165,4 +165,4 @@ Author's Address
 
 
 
-Person                  Expires December 22, 2022               [Page 3]
+Person                  Expires December 24, 2022               [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
index 6e17a8d72..8c60e8e52 100644
--- a/tests/valid/indexes.prepped.xml
+++ b/tests/valid/indexes.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-20T23:09:07" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-22T06:59:07" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.12.10 -->
   
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="20" month="06" year="2022"/>
+    <date day="22" month="06" year="2022"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 22 December 2022.
+        This Internet-Draft will expire on 24 December 2022.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
index 43da998c6..b81ef76ec 100644
--- a/tests/valid/indexes.text
+++ b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 20, 2022
+Internet-Draft                                             June 22, 2022
 Intended status: Experimental                                           
-Expires: December 22, 2022
+Expires: December 24, 2022
 
 
                           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 December 22, 2022.
+   This Internet-Draft will expire on December 24, 2022.
 
 Copyright Notice
 
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
index d24c5875e..b62864910 100644
--- a/tests/valid/indexes.v3.html
+++ b/tests/valid/indexes.v3.html
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires December 22, 2022</td>
+<td class="center">Expires December 24, 2022</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">indexes-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2022-06-20" class="published">June 20, 2022</time>
+<time datetime="2022-06-22" class="published">June 22, 2022</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2022-12-22">December 22, 2022</time></dd>
+<dd class="expires"><time datetime="2022-12-24">December 24, 2022</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-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."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on December 22, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on December 24, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
index c65de436c..127b0a935 100644
--- a/tests/valid/manpage.txt
+++ b/tests/valid/manpage.txt
@@ -1,5 +1,5 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                            20 June 2022
+                                                            22 June 2022
 
 
                   Xml2rfc Vocabulary Version 3 Schema
diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.pages.text
index 8b2e50ac3..73429d0e3 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                                             June 20, 2022
+Internet-Draft                                             June 22, 2022
 Intended status: Experimental                                           
-Expires: December 22, 2022
+Expires: December 24, 2022
 
 
                         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 December 22, 2022.
+   This Internet-Draft will expire on December 24, 2022.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                  Expires December 22, 2022               [Page 1]
+Person                  Expires December 24, 2022               [Page 1]
 
 Internet-Draft          xml2rfc sourcecode tests               June 2022
 
@@ -109,7 +109,7 @@ Internet-Draft          xml2rfc sourcecode tests               June 2022
 
 
 
-Person                  Expires December 22, 2022               [Page 2]
+Person                  Expires December 24, 2022               [Page 2]
 
 Internet-Draft          xml2rfc sourcecode tests               June 2022
 
@@ -165,7 +165,7 @@ Internet-Draft          xml2rfc sourcecode tests               June 2022
 
 
 
-Person                  Expires December 22, 2022               [Page 3]
+Person                  Expires December 24, 2022               [Page 3]
 
 Internet-Draft          xml2rfc sourcecode tests               June 2022
 
@@ -221,4 +221,4 @@ Author's Address
 
 
 
-Person                  Expires December 22, 2022               [Page 4]
+Person                  Expires December 24, 2022               [Page 4]
diff --git a/tests/valid/sourcecode.prepped.xml b/tests/valid/sourcecode.prepped.xml
index 9d749db0f..973d107c6 100644
--- a/tests/valid/sourcecode.prepped.xml
+++ b/tests/valid/sourcecode.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="sourcecode-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-20T23:09:15" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="sourcecode-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-22T06:59:15" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.12.10 -->
   
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="20" month="06" year="2022"/>
+    <date day="22" month="06" year="2022"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 22 December 2022.
+        This Internet-Draft will expire on 24 December 2022.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.text
index d6b6ad081..44a02c0b1 100644
--- a/tests/valid/sourcecode.text
+++ b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 20, 2022
+Internet-Draft                                             June 22, 2022
 Intended status: Experimental                                           
-Expires: December 22, 2022
+Expires: December 24, 2022
 
 
                         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 December 22, 2022.
+   This Internet-Draft will expire on December 24, 2022.
 
 Copyright Notice
 
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
index 6bfc61b7c..152feaab9 100644
--- a/tests/valid/sourcecode.v3.html
+++ b/tests/valid/sourcecode.v3.html
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires December 22, 2022</td>
+<td class="center">Expires December 24, 2022</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">sourcecode-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2022-06-20" class="published">June 20, 2022</time>
+<time datetime="2022-06-22" class="published">June 22, 2022</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2022-12-22">December 22, 2022</time></dd>
+<dd class="expires"><time datetime="2022-12-24">December 24, 2022</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-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."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on December 22, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on December 24, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">

From 39c96cb7371023e9109982a2ae95e0f13b16ed29 Mon Sep 17 00:00:00 2001
From: Kesara Rathnayake <kesara@fq.nz>
Date: Wed, 22 Jun 2022 19:04:58 +1200
Subject: [PATCH 2/2] fix: Handle unblance table errors

---
 xml2rfc/writers/text.py | 78 +++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/xml2rfc/writers/text.py b/xml2rfc/writers/text.py
index 314c3815a..33fc0bddd 100644
--- a/xml2rfc/writers/text.py
+++ b/xml2rfc/writers/text.py
@@ -4137,18 +4137,24 @@ def set_colwidths(cells, rows, cols):
             minspan = sys.maxsize
             for j in range(cols):
                 cell = cells[i][j]
-                k, l = cell.origin
-                hspan = cell.rowspan+k-i if cell.rowspan else minspan
-                if hspan > 0 and hspan < minspan:
-                    minspan = hspan
+                if hasattr(cell, 'origin'):
+                    k, l = cell.origin
+                    hspan = cell.rowspan+k-i if cell.rowspan else minspan
+                    if hspan > 0 and hspan < minspan:
+                        minspan = hspan
+                else:
+                    self.die(e, "Inconsistent table width: Found different row lengths in this table")
             maxlines = 0
             for j in range(cols):
                 cell = cells[i][j]
-                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:
-                    maxlines = lines
+                if hasattr(cell, 'origin'):
+                    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:
+                        maxlines = lines
+                else:
+                    self.die(e, "Inconsistent table width: Found different row lengths in this table")
             for j in range(cols):
                 cells[i][j].lines = maxlines
 
@@ -4156,22 +4162,28 @@ def set_colwidths(cells, rows, cols):
         # Calculate total height for rowspan cells
         for i in range(rows):
             for j in range(cols):
-                cells[i][j].m = None
-                cells[i][j].height = None
-                k, l = cells[i][j].origin
-                cell = cells[k][l]
-                if cell.m is None:
-                    cell.m = 0
-                    cell.height = sum([ cells[n][l].lines for n in range(k, k+cell.rowspan)]) + cell.rowspan-1
+                if hasattr(cells[i][j], 'origin'):
+                    cells[i][j].m = None
+                    cells[i][j].height = None
+                    k, l = cells[i][j].origin
+                    cell = cells[k][l]
+                    if cell.m is None:
+                        cell.m = 0
+                        cell.height = sum([ cells[n][l].lines for n in range(k, k+cell.rowspan)]) + cell.rowspan-1
+                else:
+                    self.die(e, "Inconsistent table width: Found different row lengths in this table")
 
         # ----------------------------------------------------------------------
         # Calculate total width for colspan cells
         for i in range(rows):
             for j in range(cols):
-                k, l = cells[i][j].origin
-                cell = cells[k][l]
-                if cell.origin == (i,j):
-                    cell.colwidth = sum([ cells[i][n].colwidth for n in range(j, j+cell.colspan)]) + cell.colspan-1
+                if hasattr(cells[i][j], 'origin'):
+                    k, l = cells[i][j].origin
+                    cell = cells[k][l]
+                    if cell.origin == (i,j):
+                        cell.colwidth = sum([ cells[i][n].colwidth for n in range(j, j+cell.colspan)]) + cell.colspan-1
+                else:
+                    self.die(e, "Inconsistent table width: Found different row lengths in this table")
 
         # ----------------------------------------------------------------------
         # Calculate minimum padding per table column
@@ -4179,10 +4191,13 @@ def set_colwidths(cells, rows, cols):
         for i in range(rows):
             for j in range(cols):
                 cell = cells[i][j]
-                if cell.origin == (i, j):
-                    padding = min([width] + [(cell.colwidth - textwidth(line)) for line in cell.wrapped])
-                    if padding < minpad[j]:
-                        minpad[j] = padding
+                if hasattr(cell, 'origin'):
+                    if cell.origin == (i, j):
+                        padding = min([width] + [(cell.colwidth - textwidth(line)) for line in cell.wrapped])
+                        if padding < minpad[j]:
+                            minpad[j] = padding
+                else:
+                    self.die(e, "Inconsistent table width: Found different row lengths in this table")
 
         # ----------------------------------------------------------------------
         # Add cell borders
@@ -4191,12 +4206,15 @@ def set_colwidths(cells, rows, cols):
         for i in range(rows):
             for j in range(cols):
                 cell = cells[i][j]
-                if cell.origin == (i, j):
-                    wrapped = (cell.wrapped + ['']*cell.height)[:cell.height]
-                    lines = (  ([ x + cell.top*cell.colwidth + x ] if cell.top else [])
-                             + ([ l + justify(cell, line, minpad[j]) + l for line in wrapped ])
-                             + ([ x + cell.bot*cell.colwidth + x ] if cell.bot else []) )
-                    cell.wrapped = lines
+                if hasattr(cell, 'origin'):
+                    if cell.origin == (i, j):
+                        wrapped = (cell.wrapped + ['']*cell.height)[:cell.height]
+                        lines = (  ([ x + cell.top*cell.colwidth + x ] if cell.top else [])
+                                 + ([ l + justify(cell, line, minpad[j]) + l for line in wrapped ])
+                                 + ([ x + cell.bot*cell.colwidth + x ] if cell.bot else []) )
+                        cell.wrapped = lines
+                else:
+                    self.die(e, "Inconsistent table width: Found different row lengths in this table")
 
         #show(cells, 'lines', 'before assembly')
         # ----------------------------------------------------------------------