JATS writer: support advanced table features

1 files changed, 98 insertions, 106 deletions

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>