From 786a4f643d6b0e75bb509e0407b8a71e1f0f5da6 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 9 Jul 2017 15:24:18 +0200
Subject: [PATCH] Update to Dbook 5.1, table examples including qandaset
problem
---
.../Tdata/Components/exampleSlides.xml | 212 +++++++++++++++++-
.../Extensions/Tdata/Components/intro.xml | 2 +-
ws/Docbook/Extensions/Tdata/Video/video.xml | 2 +-
ws/Docbook/Extensions/Tdata/bibGloss.xml | 2 +-
ws/Docbook/Extensions/Tdata/fig.xml | 35 ++-
ws/Docbook/Extensions/Tdata/qanda.xml | 2 +-
6 files changed, 247 insertions(+), 8 deletions(-)
diff --git a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml b/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
index b083b1ec8..d2b75e44f 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 c011eadd5..7e38b5e49 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 9b2cb8bae..ef4b66d05 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 da713e4a8..4a5632a4b 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 1553676fd..5cef96259 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 4cbc9cfc0..75dca0119 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"
--
GitLab