JATS writer: support advanced table features

7 files changed, 537 insertions, 319 deletions

diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs
index 2eb9e9cb0..aca2d05d0 100644
--- a/test/Tests/Old.hs
+++ b/test/Tests/Old.hs
@@ -101,7 +101,7 @@ tests pandocPath =
   , testGroup "jats"
     [ testGroup "writer"
       [ testGroup "jats_archiving" $
-        writerTests' "jats_archiving"
+        extWriterTests' "jats_archiving"
       , testGroup "jats_articleauthoring" $
         writerTests' "jats_articleauthoring"
       , testGroup "jats_publishing" $
diff --git a/test/tables.jats_archiving b/test/tables.jats_archiving
index 30bacc2e8..78d6a79d4 100644
--- a/test/tables.jats_archiving
+++ b/test/tables.jats_archiving
@@ -4,35 +4,31 @@
     <p>Demonstration of simple table syntax.</p>
   </caption>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -41,35 +37,31 @@
 <p>Simple table without caption:</p>
 <table-wrap>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -81,35 +73,31 @@
     <p>Demonstration of simple table syntax.</p>
   </caption>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -121,30 +109,33 @@
     <p>Here’s the caption. It may span multiple lines.</p>
   </caption>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <thead>
       <tr>
-        <th>Centered Header</th>
-        <th>Left Aligned</th>
-        <th>Right Aligned</th>
-        <th>Default aligned</th>
+        <th align="center">Centered Header</th>
+        <th align="left">Left Aligned</th>
+        <th align="right">Right Aligned</th>
+        <th align="left">Default aligned</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
-        <td>Example of a row that spans multiple lines.</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
+        <td align="left">Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
-        <td>Here’s another one. Note the blank line between rows.</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
+        <td align="left">Here’s another one. Note the blank line between
+        rows.</td>
       </tr>
     </tbody>
   </table>
@@ -152,30 +143,33 @@
 <p>Multiline table without caption:</p>
 <table-wrap>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <thead>
       <tr>
-        <th>Centered Header</th>
-        <th>Left Aligned</th>
-        <th>Right Aligned</th>
-        <th>Default aligned</th>
+        <th align="center">Centered Header</th>
+        <th align="left">Left Aligned</th>
+        <th align="right">Right Aligned</th>
+        <th align="left">Default aligned</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
-        <td>Example of a row that spans multiple lines.</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
+        <td align="left">Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
-        <td>Here’s another one. Note the blank line between rows.</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
+        <td align="left">Here’s another one. Note the blank line between
+        rows.</td>
       </tr>
     </tbody>
   </table>
@@ -183,28 +177,24 @@
 <p>Table without column headers:</p>
 <table-wrap>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="right" />
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
+        <td align="right">12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
+        <td align="right">123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
+        <td align="right">1</td>
       </tr>
     </tbody>
   </table>
@@ -212,21 +202,23 @@
 <p>Multiline table without column headers:</p>
 <table-wrap>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
         <td>Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
         <td>Here’s another one. Note the blank line between rows.</td>
       </tr>
     </tbody>
diff --git a/test/tables.jats_articleauthoring b/test/tables.jats_articleauthoring
index 30bacc2e8..78d6a79d4 100644
--- a/test/tables.jats_articleauthoring
+++ b/test/tables.jats_articleauthoring
@@ -4,35 +4,31 @@
     <p>Demonstration of simple table syntax.</p>
   </caption>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -41,35 +37,31 @@
 <p>Simple table without caption:</p>
 <table-wrap>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -81,35 +73,31 @@
     <p>Demonstration of simple table syntax.</p>
   </caption>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -121,30 +109,33 @@
     <p>Here’s the caption. It may span multiple lines.</p>
   </caption>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <thead>
       <tr>
-        <th>Centered Header</th>
-        <th>Left Aligned</th>
-        <th>Right Aligned</th>
-        <th>Default aligned</th>
+        <th align="center">Centered Header</th>
+        <th align="left">Left Aligned</th>
+        <th align="right">Right Aligned</th>
+        <th align="left">Default aligned</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
-        <td>Example of a row that spans multiple lines.</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
+        <td align="left">Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
-        <td>Here’s another one. Note the blank line between rows.</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
+        <td align="left">Here’s another one. Note the blank line between
+        rows.</td>
       </tr>
     </tbody>
   </table>
@@ -152,30 +143,33 @@
 <p>Multiline table without caption:</p>
 <table-wrap>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <thead>
       <tr>
-        <th>Centered Header</th>
-        <th>Left Aligned</th>
-        <th>Right Aligned</th>
-        <th>Default aligned</th>
+        <th align="center">Centered Header</th>
+        <th align="left">Left Aligned</th>
+        <th align="right">Right Aligned</th>
+        <th align="left">Default aligned</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
-        <td>Example of a row that spans multiple lines.</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
+        <td align="left">Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
-        <td>Here’s another one. Note the blank line between rows.</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
+        <td align="left">Here’s another one. Note the blank line between
+        rows.</td>
       </tr>
     </tbody>
   </table>
@@ -183,28 +177,24 @@
 <p>Table without column headers:</p>
 <table-wrap>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="right" />
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
+        <td align="right">12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
+        <td align="right">123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
+        <td align="right">1</td>
       </tr>
     </tbody>
   </table>
@@ -212,21 +202,23 @@
 <p>Multiline table without column headers:</p>
 <table-wrap>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
         <td>Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
         <td>Here’s another one. Note the blank line between rows.</td>
       </tr>
     </tbody>
diff --git a/test/tables.jats_publishing b/test/tables.jats_publishing
index 30bacc2e8..78d6a79d4 100644
--- a/test/tables.jats_publishing
+++ b/test/tables.jats_publishing
@@ -4,35 +4,31 @@
     <p>Demonstration of simple table syntax.</p>
   </caption>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -41,35 +37,31 @@
 <p>Simple table without caption:</p>
 <table-wrap>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -81,35 +73,31 @@
     <p>Demonstration of simple table syntax.</p>
   </caption>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="left" />
     <thead>
       <tr>
-        <th>Right</th>
-        <th>Left</th>
-        <th>Center</th>
+        <th align="right">Right</th>
+        <th align="left">Left</th>
+        <th align="center">Center</th>
         <th>Default</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
         <td>12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
         <td>123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
         <td>1</td>
       </tr>
     </tbody>
@@ -121,30 +109,33 @@
     <p>Here’s the caption. It may span multiple lines.</p>
   </caption>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <thead>
       <tr>
-        <th>Centered Header</th>
-        <th>Left Aligned</th>
-        <th>Right Aligned</th>
-        <th>Default aligned</th>
+        <th align="center">Centered Header</th>
+        <th align="left">Left Aligned</th>
+        <th align="right">Right Aligned</th>
+        <th align="left">Default aligned</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
-        <td>Example of a row that spans multiple lines.</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
+        <td align="left">Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
-        <td>Here’s another one. Note the blank line between rows.</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
+        <td align="left">Here’s another one. Note the blank line between
+        rows.</td>
       </tr>
     </tbody>
   </table>
@@ -152,30 +143,33 @@
 <p>Multiline table without caption:</p>
 <table-wrap>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <thead>
       <tr>
-        <th>Centered Header</th>
-        <th>Left Aligned</th>
-        <th>Right Aligned</th>
-        <th>Default aligned</th>
+        <th align="center">Centered Header</th>
+        <th align="left">Left Aligned</th>
+        <th align="right">Right Aligned</th>
+        <th align="left">Default aligned</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
-        <td>Example of a row that spans multiple lines.</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
+        <td align="left">Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
-        <td>Here’s another one. Note the blank line between rows.</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
+        <td align="left">Here’s another one. Note the blank line between
+        rows.</td>
       </tr>
     </tbody>
   </table>
@@ -183,28 +177,24 @@
 <p>Table without column headers:</p>
 <table-wrap>
   <table>
-    <col align="right" />
-    <col align="left" />
-    <col align="center" />
-    <col align="right" />
     <tbody>
       <tr>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
-        <td>12</td>
+        <td align="right">12</td>
+        <td align="left">12</td>
+        <td align="center">12</td>
+        <td align="right">12</td>
       </tr>
       <tr>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
-        <td>123</td>
+        <td align="right">123</td>
+        <td align="left">123</td>
+        <td align="center">123</td>
+        <td align="right">123</td>
       </tr>
       <tr>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
-        <td>1</td>
+        <td align="right">1</td>
+        <td align="left">1</td>
+        <td align="center">1</td>
+        <td align="right">1</td>
       </tr>
     </tbody>
   </table>
@@ -212,21 +202,23 @@
 <p>Multiline table without column headers:</p>
 <table-wrap>
   <table>
-    <col width="15*" align="center" />
-    <col width="13*" align="left" />
-    <col width="16*" align="right" />
-    <col width="35*" align="left" />
+    <colgroup>
+      <col width="15%" />
+      <col width="14%" />
+      <col width="16%" />
+      <col width="35%" />
+    </colgroup>
     <tbody>
       <tr>
-        <td>First</td>
-        <td>row</td>
-        <td>12.0</td>
+        <td align="center">First</td>
+        <td align="left">row</td>
+        <td align="right">12.0</td>
         <td>Example of a row that spans multiple lines.</td>
       </tr>
       <tr>
-        <td>Second</td>
-        <td>row</td>
-        <td>5.0</td>
+        <td align="center">Second</td>
+        <td align="left">row</td>
+        <td align="right">5.0</td>
         <td>Here’s another one. Note the blank line between rows.</td>
       </tr>
     </tbody>
diff --git a/test/tables/nordics.jats_archiving b/test/tables/nordics.jats_archiving
new file mode 100644
index 000000000..5ac78bacd
--- /dev/null
+++ b/test/tables/nordics.jats_archiving
@@ -0,0 +1,58 @@
+<table-wrap>
+  <caption>
+    <p>States belonging to the <italic>Nordics.</italic></p>
+  </caption>
+  <table id="nordics">
+    <colgroup>
+      <col width="30%" />
+      <col width="30%" />
+      <col width="20%" />
+      <col width="20%" />
+    </colgroup>
+    <thead>
+      <tr>
+        <th align="center">Name</th>
+        <th align="center">Capital</th>
+        <th align="center">Population
+        (in 2018)</th>
+        <th align="center">Area
+        (in km<sup>2</sup>)</th>
+      </tr>
+    </thead>
+    <tfoot>
+      <tr id="summary">
+        <td align="center">Total</td>
+        <td align="left"></td>
+        <td align="left" id="total-population">27,376,022</td>
+        <td align="left" id="total-area">1,258,336</td>
+      </tr>
+    </tfoot>
+    <tbody>
+      <tr>
+        <th align="center">Denmark</th><td align="left">Copenhagen</td>
+        <td align="left">5,809,502</td>
+        <td align="left">43,094</td>
+      </tr>
+      <tr>
+        <th align="center">Finland</th><td align="left">Helsinki</td>
+        <td align="left">5,537,364</td>
+        <td align="left">338,145</td>
+      </tr>
+      <tr>
+        <th align="center">Iceland</th><td align="left">Reykjavik</td>
+        <td align="left">343,518</td>
+        <td align="left">103,000</td>
+      </tr>
+      <tr>
+        <th align="center">Norway</th><td align="left">Oslo</td>
+        <td align="left">5,372,191</td>
+        <td align="left">323,802</td>
+      </tr>
+      <tr>
+        <th align="center">Sweden</th><td align="left">Stockholm</td>
+        <td align="left">10,313,447</td>
+        <td align="left">450,295</td>
+      </tr>
+    </tbody>
+  </table>
+</table-wrap>
diff --git a/test/tables/planets.jats_archiving b/test/tables/planets.jats_archiving
new file mode 100644
index 000000000..e0158b6fa
--- /dev/null
+++ b/test/tables/planets.jats_archiving
@@ -0,0 +1,128 @@
+<table-wrap>
+  <caption>
+    <p>Data about the planets of our solar system.</p>
+  </caption>
+  <table>
+    <thead>
+      <tr>
+        <th align="center" colspan="2"></th>
+        <th>Name</th>
+        <th align="right">Mass (10^24kg)</th>
+        <th align="right">Diameter (km)</th>
+        <th align="right">Density (kg/m^3)</th>
+        <th align="right">Gravity (m/s^2)</th>
+        <th align="right">Length of day (hours)</th>
+        <th align="right">Distance from Sun (10^6km)</th>
+        <th align="right">Mean temperature (C)</th>
+        <th align="right">Number of moons</th>
+        <th>Notes</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th align="center" rowspan="4" colspan="2">Terrestrial planets</th>
+        <th>Mercury</th><td align="right">0.330</td>
+        <td align="right">4,879</td>
+        <td align="right">5427</td>
+        <td align="right">3.7</td>
+        <td align="right">4222.6</td>
+        <td align="right">57.9</td>
+        <td align="right">167</td>
+        <td align="right">0</td>
+        <td>Closest to the Sun</td>
+      </tr>
+      <tr>
+        <th>Venus</th><td align="right">4.87</td>
+        <td align="right">12,104</td>
+        <td align="right">5243</td>
+        <td align="right">8.9</td>
+        <td align="right">2802.0</td>
+        <td align="right">108.2</td>
+        <td align="right">464</td>
+        <td align="right">0</td>
+        <td></td>
+      </tr>
+      <tr>
+        <th>Earth</th><td align="right">5.97</td>
+        <td align="right">12,756</td>
+        <td align="right">5514</td>
+        <td align="right">9.8</td>
+        <td align="right">24.0</td>
+        <td align="right">149.6</td>
+        <td align="right">15</td>
+        <td align="right">1</td>
+        <td>Our world</td>
+      </tr>
+      <tr>
+        <th>Mars</th><td align="right">0.642</td>
+        <td align="right">6,792</td>
+        <td align="right">3933</td>
+        <td align="right">3.7</td>
+        <td align="right">24.7</td>
+        <td align="right">227.9</td>
+        <td align="right">-65</td>
+        <td align="right">2</td>
+        <td>The red planet</td>
+      </tr>
+      <tr>
+        <th align="center" rowspan="4">Jovian planets</th>
+        <th align="center" rowspan="2">Gas giants</th>
+        <th>Jupiter</th><td align="right">1898</td>
+        <td align="right">142,984</td>
+        <td align="right">1326</td>
+        <td align="right">23.1</td>
+        <td align="right">9.9</td>
+        <td align="right">778.6</td>
+        <td align="right">-110</td>
+        <td align="right">67</td>
+        <td>The largest planet</td>
+      </tr>
+      <tr>
+        <th>Saturn</th><td align="right">568</td>
+        <td align="right">120,536</td>
+        <td align="right">687</td>
+        <td align="right">9.0</td>
+        <td align="right">10.7</td>
+        <td align="right">1433.5</td>
+        <td align="right">-140</td>
+        <td align="right">62</td>
+        <td></td>
+      </tr>
+      <tr>
+        <th align="center" rowspan="2">Ice giants</th>
+        <th>Uranus</th><td align="right">86.8</td>
+        <td align="right">51,118</td>
+        <td align="right">1271</td>
+        <td align="right">8.7</td>
+        <td align="right">17.2</td>
+        <td align="right">2872.5</td>
+        <td align="right">-195</td>
+        <td align="right">27</td>
+        <td></td>
+      </tr>
+      <tr>
+        <th>Neptune</th><td align="right">102</td>
+        <td align="right">49,528</td>
+        <td align="right">1638</td>
+        <td align="right">11.0</td>
+        <td align="right">16.1</td>
+        <td align="right">4495.1</td>
+        <td align="right">-200</td>
+        <td align="right">14</td>
+        <td></td>
+      </tr>
+      <tr>
+        <th align="center" colspan="2">Dwarf planets</th>
+        <th>Pluto</th><td align="right">0.0146</td>
+        <td align="right">2,370</td>
+        <td align="right">2095</td>
+        <td align="right">0.7</td>
+        <td align="right">153.3</td>
+        <td align="right">5906.4</td>
+        <td align="right">-225</td>
+        <td align="right">5</td>
+        <td>Declassified as a planet in 2006.</td>
+      </tr>
+    </tbody>
+  </table>
+</table-wrap>
diff --git a/test/tables/students.jats_archiving b/test/tables/students.jats_archiving
new file mode 100644
index 000000000..3edf58a7f
--- /dev/null
+++ b/test/tables/students.jats_archiving
@@ -0,0 +1,56 @@
+<table-wrap>
+  <caption>
+    <p>List of Students</p>
+  </caption>
+  <table id="students">
+    <colgroup>
+      <col width="50%" />
+      <col width="50%" />
+    </colgroup>
+    <thead>
+      <tr>
+        <th align="center">Student ID</th>
+        <th align="center">Name</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th align="left" colspan="2">Computer Science</th>
+      </tr>
+      <tr>
+        <td align="left">3741255</td>
+        <td align="left">Jones, Martha</td>
+      </tr>
+      <tr>
+        <td align="left">4077830</td>
+        <td align="left">Pierce, Benjamin</td>
+      </tr>
+      <tr>
+        <td align="left">5151701</td>
+        <td align="left">Kirk, James</td>
+      </tr>
+    </tbody>
+    <tbody>
+      <tr>
+        <th align="left" colspan="2">Russian Literature</th>
+      </tr>
+      <tr>
+        <td align="left">3971244</td>
+        <td align="left">Nim, Victor</td>
+      </tr>
+    </tbody>
+    <tbody>
+      <tr>
+        <th align="left" colspan="2">Astrophysics</th>
+      </tr>
+      <tr>
+        <td align="left">4100332</td>
+        <td align="left">Petrov, Alexandra</td>
+      </tr>
+      <tr>
+        <td align="left">4100332</td>
+        <td align="left">Toyota, Hiroko</td>
+      </tr>
+    </tbody>
+  </table>
+</table-wrap>