diff --git a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml b/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
index b083b1ec8780897b1262eb5d33fbd56f5f35a2a1..d2b75e44f0de7f88f6e8a5bfc7cb81ccc61bd265 100644
--- a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter version="5.0" xml:id="mixLectureSlides"
+<chapter version="5.1" xml:id="mixLectureSlides"
xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xila="http://www.w3.org/2001/XInclude/local-attributes"
@@ -134,5 +134,215 @@
</caption>
</equation>
</section>
+
+ <section xml:id="sect_tables">
+ <title>Tables</title>
+
+ <informaltable border="1">
+ <colgroup width="25%"/>
+
+ <colgroup width="30%"/>
+
+ <colgroup width="15%"/>
+
+ <colgroup width="30%"/>
+
+ <tr>
+ <th colspan="2">From</th>
+
+ <th colspan="2">To</th>
+ </tr>
+
+ <tr>
+ <th><code>long</code></th>
+
+ <th><code>remark</code></th>
+
+ <th><code>int</code></th>
+
+ <th>remark</th>
+ </tr>
+
+ <tr>
+ <td align="right">0</td>
+
+ <td align="right"/>
+
+ <td align="right">0</td>
+
+ <td align="right"/>
+ </tr>
+
+ <tr>
+ <td align="right">1</td>
+
+ <td align="right"/>
+
+ <td align="right">0</td>
+
+ <td align="right"/>
+ </tr>
+
+ <tr>
+ <td align="center" colspan="2">...</td>
+
+ <td align="right">0</td>
+
+ <td align="center">...</td>
+ </tr>
+
+ <tr>
+ <td align="right">4294967295</td>
+
+ <td align="right"><inlineequation>
+ <m:math display="inline">
+ <m:mrow>
+ <m:msup>
+ <m:mi>2</m:mi>
+
+ <m:mi>32</m:mi>
+ </m:msup>
+
+ <m:mo>-</m:mo>
+
+ <m:mi>1</m:mi>
+ </m:mrow>
+ </m:math>
+ </inlineequation></td>
+
+ <td align="right">0</td>
+
+ <td align="right"/>
+ </tr>
+
+ <tr>
+ <td align="right">4294967296</td>
+
+ <td align="right"><inlineequation>
+ <m:math display="inline">
+ <m:msup>
+ <m:mi>2</m:mi>
+
+ <m:mi>32</m:mi>
+ </m:msup>
+ </m:math>
+ </inlineequation></td>
+
+ <td align="right">1</td>
+
+ <td align="right"/>
+ </tr>
+
+ <tr>
+ <td align="right">4294967297</td>
+
+ <td align="right"><inlineequation>
+ <m:math display="inline">
+ <m:mrow>
+ <m:msup>
+ <m:mi>2</m:mi>
+
+ <m:mi>32</m:mi>
+ </m:msup>
+
+ <m:mo>+</m:mo>
+
+ <m:mi>1</m:mi>
+ </m:mrow>
+ </m:math>
+ </inlineequation></td>
+
+ <td align="right">1</td>
+
+ <td align="right"/>
+ </tr>
+
+ <tr>
+ <td align="center" colspan="4">...</td>
+ </tr>
+
+ <tr>
+ <td align="right">9223372036854775806</td>
+
+ <td align="right"><inlineequation>
+ <m:math display="inline">
+ <m:mrow>
+ <m:msup>
+ <m:mi>2</m:mi>
+
+ <m:mi>63</m:mi>
+ </m:msup>
+
+ <m:mo>-</m:mo>
+
+ <m:mi>2</m:mi>
+ </m:mrow>
+ </m:math>
+ </inlineequation> or <code
+ xlink:href="https://docs.oracle.com/javase/8/docs/api/constant-values.html#java.lang.Long.MAX_VALUE"><varname
+ xlink:href="https://docs.oracle.com/javase/8/docs/api/constant-values.html#java.lang.Long.MAX_VALUE">Long.MAX_VALUE</varname></code>
+ - 1</td>
+
+ <td align="right">2147483647</td>
+
+ <td align="right"><inlineequation>
+ <m:math display="inline">
+ <m:mrow>
+ <m:msup>
+ <m:mi>2</m:mi>
+
+ <m:mi>31</m:mi>
+ </m:msup>
+
+ <m:mo>-</m:mo>
+
+ <m:mi>1</m:mi>
+ </m:mrow>
+ </m:math>
+ </inlineequation> or <varname
+ xlink:href="https://docs.oracle.com/javase/8/docs/api/constant-values.html#java.lang.Integer.MAX_VALUE">Integer.MAX_VALUE</varname></td>
+ </tr>
+
+ <tr>
+ <td align="right">9223372036854775807</td>
+
+ <td align="right"><inlineequation>
+ <m:math display="inline">
+ <m:mrow>
+ <m:msup>
+ <m:mi>2</m:mi>
+
+ <m:mi>63</m:mi>
+ </m:msup>
+
+ <m:mo>-</m:mo>
+
+ <m:mi>1</m:mi>
+ </m:mrow>
+ </m:math>
+ </inlineequation> or <varname
+ xlink:href="https://docs.oracle.com/javase/8/docs/api/constant-values.html#java.lang.Long.MAX_VALUE">Long.MAX_VALUE</varname></td>
+
+ <td align="right">2147483647</td>
+
+ <td align="right"><inlineequation>
+ <m:math display="inline">
+ <m:mrow>
+ <m:msup>
+ <m:mi>2</m:mi>
+
+ <m:mi>31</m:mi>
+ </m:msup>
+
+ <m:mo>-</m:mo>
+
+ <m:mi>1</m:mi>
+ </m:mrow>
+ </m:math>
+ </inlineequation> or <varname
+ xlink:href="https://docs.oracle.com/javase/8/docs/api/constant-values.html#java.lang.Integer.MAX_VALUE">Integer.MAX_VALUE</varname></td>
+ </tr>
+ </informaltable>
+ </section>
</section>
</chapter>
diff --git a/ws/Docbook/Extensions/Tdata/Components/intro.xml b/ws/Docbook/Extensions/Tdata/Components/intro.xml
index c011eadd5e9ef785884cf1466a000faddd0f4fc2..7e38b5e49e06a6e3e32158b64256619f6736e9c1 100644
--- a/ws/Docbook/Extensions/Tdata/Components/intro.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/intro.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<db:chapter version="5.0" xml:id="intro"
+<db:chapter version="5.1" xml:id="intro"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:svg="http://www.w3.org/2000/svg"
diff --git a/ws/Docbook/Extensions/Tdata/Video/video.xml b/ws/Docbook/Extensions/Tdata/Video/video.xml
index 9b2cb8bae115fae17347347cd1e1babf21f20d15..ef4b66d057634e4332fe567910a30bdb28940312 100644
--- a/ws/Docbook/Extensions/Tdata/Video/video.xml
+++ b/ws/Docbook/Extensions/Tdata/Video/video.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter version="5.0" xml:id="chapVideo"
+<chapter version="5.1" xml:id="chapVideo"
xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/ws/Docbook/Extensions/Tdata/bibGloss.xml b/ws/Docbook/Extensions/Tdata/bibGloss.xml
index da713e4a8c234e344fb26b8ed66fbfa176326bd9..4a5632a4bbaca0f419a1011bfab7c3cdeb6569a9 100644
--- a/ws/Docbook/Extensions/Tdata/bibGloss.xml
+++ b/ws/Docbook/Extensions/Tdata/bibGloss.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<book version="5.0" xmlns="http://docbook.org/ns/docbook"
+<book version="5.1" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:svg="http://www.w3.org/2000/svg"
diff --git a/ws/Docbook/Extensions/Tdata/fig.xml b/ws/Docbook/Extensions/Tdata/fig.xml
index 1553676fde55b402d7c81f93239cfca641f7e2c2..5cef962590bbbe1c181d61cae759c13b7914292c 100644
--- a/ws/Docbook/Extensions/Tdata/fig.xml
+++ b/ws/Docbook/Extensions/Tdata/fig.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<book version="5.0" xmlns="http://docbook.org/ns/docbook"
+<book version="5.1" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xila="http://www.w3.org/2001/XInclude/local-attributes"
xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -47,7 +47,37 @@
<qandadiv>
<qandaentry xml:id="q1">
<question>
- <para>My first question</para>
+ <para>My first question containing a table:</para>
+
+ <informaltable border="1">
+ <tr>
+ <th>Key</th>
+
+ <th>Value</th>
+ </tr>
+
+ <tr>
+ <td>b1</td>
+
+ <td>b2</td>
+ </tr>
+ </informaltable>
+
+ <table border="1">
+ <caption>Test table</caption>
+
+ <tr>
+ <th>Key</th>
+
+ <th>Value</th>
+ </tr>
+
+ <tr>
+ <td>b1</td>
+
+ <td>b2</td>
+ </tr>
+ </table>
</question>
<answer>
@@ -81,5 +111,4 @@
<xi:include href="Components/exampleSlides.xml" xpointer="element(/1)"/>
<xi:include href="Video/video.xml" xpointer="element(/1)"/>
-
</book>
diff --git a/ws/Docbook/Extensions/Tdata/qanda.xml b/ws/Docbook/Extensions/Tdata/qanda.xml
index 4cbc9cfc0058dc9ce225269736eabf538d062454..75dca011912c341349ad4984914e82cbaff0c0ef 100644
--- a/ws/Docbook/Extensions/Tdata/qanda.xml
+++ b/ws/Docbook/Extensions/Tdata/qanda.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<book version="5.0" xmlns="http://docbook.org/ns/docbook"
+<book version="5.1" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:svg="http://www.w3.org/2000/svg"