diff --git a/Doc/Common/glossary.xml b/Doc/Common/glossary.xml
index a3a1dc42b6a07a4c8e391a0502368424bcbfaae0..07621f99adfa7fef3327b45ed822164796572c66 100644
--- a/Doc/Common/glossary.xml
+++ b/Doc/Common/glossary.xml
@@ -444,6 +444,14 @@
</glossdef>
</glossentry>
+ <glossentry xml:id="glo_MathML">
+ <glossterm><acronym>MathML</acronym></glossterm>
+
+ <glossdef>
+ <para>Mathematical Markup Language</para>
+ </glossdef>
+ </glossentry>
+
<glossentry xml:id="glo_Maven">
<glossterm><productname>Maven</productname></glossterm>
@@ -557,6 +565,15 @@
</glossdef>
</glossentry>
+ <glossentry xml:id="glo_Schematron">
+ <glossterm><productname>Schematron</productname></glossterm>
+
+ <glossdef>
+ <para><link xlink:href="https://en.wikipedia.org/wiki/Schematron">A
+ rule based validation language</link></para>
+ </glossdef>
+ </glossentry>
+
<glossentry xml:id="glo_SMB">
<glossterm><acronym>SMB</acronym></glossterm>
@@ -701,6 +718,14 @@
</glossdef>
</glossentry>
+ <glossentry xml:id="glo_TeX">
+ <glossterm>TeX</glossterm>
+
+ <glossdef>
+ <para>The TeX typesetting system</para>
+ </glossdef>
+ </glossentry>
+
<glossentry xml:id="glo_TLS">
<glossterm>TLS</glossterm>
diff --git a/XmlCross/Ref/DbookIntro/sampleTable.png b/XmlCross/Ref/DbookIntro/sampleTable.png
new file mode 100644
index 0000000000000000000000000000000000000000..551bc7e05404165aa0fa5e429a1a763157f9d571
Binary files /dev/null and b/XmlCross/Ref/DbookIntro/sampleTable.png differ
diff --git a/XmlCross/xmlcross.xml b/XmlCross/xmlcross.xml
index b23bf7e01f6d15bdf33cadba92ed47dd341df034..118a8feeb08a4d4ed4ff9f788751e1390750375a 100644
--- a/XmlCross/xmlcross.xml
+++ b/XmlCross/xmlcross.xml
@@ -422,16 +422,6 @@
</informaltable>
</figure>
- <figure xml:id="xmlc_fig_schematronTopOfRelax">
- <title>Schematron on top of RelaxNG</title>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="Ref/DbookIntro/relaxngSchematron.svg"/>
- </imageobject>
- </mediaobject>
- </figure>
-
<figure xml:id="xmlc_fig_targetFormats">
<title>Target format overview</title>
@@ -701,14 +691,14 @@
<para>Block elements are <xref linkend="glo_Docbook"/>'s building
blocks.</para>
- <figure xml:id="xmlc_fig_para">
+ <figure xml:id="xmlc_fig_dbookPara">
<title>Paragraph</title>
<informaltable border="1">
<tr>
<th>View</th>
- <th>Docbook</th>
+ <th><xref linkend="glo_Docbook"/></th>
<th>HTML</th>
</tr>
@@ -729,14 +719,14 @@
<para>This is by design and on purpose.</para>
</figure>
- <figure xml:id="xmlc_fig_itemizedList">
+ <figure xml:id="xmlc_fig_dbookItemizedList">
<title>Itemized list</title>
<informaltable border="1">
<tr>
<th>View</th>
- <th>Docbook</th>
+ <th><xref linkend="glo_Docbook"/></th>
<th>HTML</th>
</tr>
@@ -773,14 +763,14 @@
</informaltable>
</figure>
- <figure xml:id="xmlc_fig_orderedList">
+ <figure xml:id="xmlc_fig_dbookOrderedList">
<title>Ordered list</title>
<informaltable border="1">
<tr>
<th>View</th>
- <th>Docbook</th>
+ <th><xref linkend="glo_Docbook"/></th>
<th>HTML</th>
</tr>
@@ -818,14 +808,14 @@
</informaltable>
</figure>
- <figure xml:id="xmlc_fig_glossList">
+ <figure xml:id="xmlc_fig_dbookGlossList">
<title>Glossary list</title>
<informaltable border="1">
<tr>
<th>View</th>
- <th>Docbook</th>
+ <th><xref linkend="glo_Docbook"/></th>
<th>HTML</th>
</tr>
@@ -874,14 +864,14 @@
</informaltable>
</figure>
- <figure xml:id="xmlc_fig_nestedLists">
+ <figure xml:id="xmlc_fig_dbookNestedLists">
<title>Nested lists</title>
<informaltable border="1">
<tr>
<th>View</th>
- <th>Docbook</th>
+ <th><xref linkend="glo_Docbook"/></th>
<th>HTML</th>
</tr>
@@ -939,6 +929,167 @@
</tr>
</informaltable>
</figure>
+
+ <figure xml:id="xmlc_fig_dbookTables">
+ <title>A table</title>
+
+ <informaltable border="1">
+ <tr>
+ <th>View</th>
+
+ <th><xref linkend="glo_Docbook"/></th>
+
+ <th>HTML</th>
+ </tr>
+
+ <tr>
+ <td valign="top"><!--Real table slide rendering is odd --><mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/DbookIntro/sampleTable.png"/>
+ </imageobject>
+ </mediaobject></td>
+
+ <td valign="top"><programlisting language="xml"><informaltable border="1">
+ <tr>
+ <th>Col 1</th>
+ <th>Col 2</th>
+ </tr>
+ <tr>
+ <td>A1</td>
+ <td>A2</td>
+ </tr>
+ <tr>
+ <td colspan="2">B</td>
+ </tr>
+</informaltable></programlisting></td>
+
+ <td valign="top"><programlisting language="xml"><table border="1">
+ <tr>
+ <th>Col 1</th>
+ <th>Col 2</th>
+ </tr>
+ <tr>
+ <td>A1</td>
+ <td>A2</td>
+ </tr>
+ <tr>
+ <td colspan="2">B</td>
+ </tr>
+</table></programlisting></td>
+ </tr>
+ </informaltable>
+ </figure>
+
+ <figure xml:id="xmlc_fig_dbookMathmlEquation">
+ <title>A <xref linkend="glo_MathML"/> equation</title>
+
+ <informaltable border="1">
+ <tr>
+ <th>View</th>
+
+ <th><xref linkend="glo_Docbook"/></th>
+
+ <th>HTML</th>
+ </tr>
+
+ <tr>
+ <td valign="top"><informalequation>
+ <m:math display="block">
+ <m:mrow>
+ <m:msqrt>
+ <m:mi>4</m:mi>
+ </m:msqrt>
+
+ <m:mo>=</m:mo>
+
+ <m:mi>2</m:mi>
+ </m:mrow>
+ </m:math>
+ </informalequation></td>
+
+ <td valign="top"><programlisting language="xml"><informalequation>
+ <m:math display="block">
+ <m:mrow>
+ <m:msqrt>
+ <m:mi>4</m:mi>
+ </m:msqrt>
+ <m:mo>=</m:mo>
+ <m:mi>2</m:mi>
+ </m:mrow>
+ </m:math>
+</informalequation></programlisting></td>
+
+ <td valign="top"><programlisting language="xml"><math display="block">
+ <mrow>
+ <msqrt>
+ <mi>4</mi>
+ </msqrt>
+ <mo>=</mo>
+ <mi>2</mi>
+ </mrow>
+</math></programlisting></td>
+ </tr>
+ </informaltable>
+ </figure>
+
+ <figure xml:id="xmlc_fig_dbookTexEquation">
+ <title>A <xref linkend="glo_TeX"/> equation</title>
+
+ <informaltable border="1">
+ <tr>
+ <th>View</th>
+
+ <th><xref linkend="glo_Docbook"/></th>
+
+ <th>HTML</th>
+ </tr>
+
+ <tr>
+ <td valign="top"><informalequation>
+ <mathphrase>$ |x| = \left\{ \begin{array}{rl} -x &\mbox{
+ if $x<0$} \\ x &\mbox{ otherwise} \end{array} \right.
+ $</mathphrase>
+ </informalequation></td>
+
+ <td valign="top"><programlisting language="xml"><informalequation>
+ <mathphrase>$ |x| = \left\{
+ \begin{array}{rl} -x &amp;
+ \mbox{if $x&lt;0$} \\ x &amp;
+ \mbox{ otherwise} \end{array}
+ \right.$</mathphrase>
+</informalequation></programlisting></td>
+
+ <td valign="top"><programlisting language="xml"><span class="mathphrase"
+ >$ |x| = \left\{
+ \begin{array}{rl} -x &amp;
+ \mbox{if $x&lt;0$} \\ x &amp;
+ \mbox{ otherwise} \end{array}
+ \right.$</span></programlisting></td>
+ </tr>
+ </informaltable>
+ </figure>
+ </section>
+
+ <section xml:id="xmlc_sect_profiling">
+ <title>Profiling</title>
+
+ <informalequation>
+ <mathphrase role="latex">E = mc^2</mathphrase>
+ </informalequation>
+ </section>
+
+ <section xml:id="xmlc_sect_Schematron">
+ <title>Schematron</title>
+
+ <figure xml:id="xmlc_fig_schematronTopOfRelax">
+ <title><xref linkend="glo_Schematron"/> on top of RelaxNG</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/DbookIntro/relaxngSchematron.svg"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</section>
</chapter>
diff --git a/ws/Docbook/Extensions/Tdata/Components/intro.xml b/ws/Docbook/Extensions/Tdata/Components/intro.xml
index dc8c6e7b1cdbfa9b80e9614698b4a4472760d5e4..644e56fc07f47228dc22000098377adcb096966c 100644
--- a/ws/Docbook/Extensions/Tdata/Components/intro.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/intro.xml
@@ -1,101 +1,116 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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"
- xmlns:ns="http://docbook.org/ns/transclusion"
- xmlns:m="http://www.w3.org/1998/Math/MathML"
- xmlns:html="http://www.w3.org/1999/xhtml"
- xmlns="http://docbook.org/ns/docbook">
+<chapter annotations="slide" version="5.1" xml:id="intro"
+ 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"
+ xmlns:ns2="http://docbook.org/ns/docbook"
+ xmlns:ns="http://docbook.org/ns/transclusion"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml">
<title>Introduction</title>
<para>Some MathML:</para>
- <informalequation>
- <m:math display="block">
- <m:mroot>
- <m:mi>x</m:mi>
+ <figure xml:id="fig_Mathml">
+ <title>MathML examples</title>
- <m:mn>3</m:mn>
- </m:mroot>
- </m:math>
- </informalequation>
+ <informalequation>
+ <m:math display="block">
+ <m:mroot>
+ <m:mi>x</m:mi>
- <orderedlist>
- <listitem xml:id="sw1PhytagoreanTripletCondition1">
- <para><inlineequation>
- <m:math display="inline">
- <m:mrow>
- <m:mi>a</m:mi>
+ <m:mn>3</m:mn>
+ </m:mroot>
+ </m:math>
+ </informalequation>
- <m:mo>≤</m:mo>
-
- <m:mi>b</m:mi>
-
- <m:mo><</m:mo>
-
- <m:mi>c</m:mi>
- </m:mrow>
- </m:math>
- </inlineequation></para>
- </listitem>
-
- <listitem xml:id="sw1PhytagoreanTripletCondition2">
- <para><inlineequation>
- <m:math display="inline">
- <m:mrow>
+ <orderedlist>
+ <listitem xml:id="sw1PhytagoreanTripletCondition1">
+ <para><inlineequation>
+ <m:math display="inline">
<m:mrow>
<m:mi>a</m:mi>
- <m:mo>+</m:mo>
+ <m:mo>≤</m:mo>
<m:mi>b</m:mi>
- <m:mo>+</m:mo>
+ <m:mo><</m:mo>
<m:mi>c</m:mi>
</m:mrow>
+ </m:math>
+ </inlineequation></para>
+ </listitem>
+
+ <listitem xml:id="sw1PhytagoreanTripletCondition2">
+ <para><inlineequation>
+ <m:math display="inline">
+ <m:mrow>
+ <m:mrow>
+ <m:mi>a</m:mi>
+
+ <m:mo>+</m:mo>
+
+ <m:mi>b</m:mi>
+
+ <m:mo>+</m:mo>
+
+ <m:mi>c</m:mi>
+ </m:mrow>
- <m:mo>=</m:mo>
+ <m:mo>=</m:mo>
- <m:mi>1000</m:mi>
- </m:mrow>
- </m:math>
- </inlineequation></para>
- </listitem>
+ <m:mi>1000</m:mi>
+ </m:mrow>
+ </m:math>
+ </inlineequation></para>
+ </listitem>
- <listitem>
- <para><inlineequation>
- <m:math display="inline">
- <m:mrow>
+ <listitem>
+ <para><inlineequation>
+ <m:math display="inline">
<m:mrow>
- <m:msup>
- <m:mi>a</m:mi>
+ <m:mrow>
+ <m:msup>
+ <m:mi>a</m:mi>
- <m:mn>2</m:mn>
- </m:msup>
+ <m:mn>2</m:mn>
+ </m:msup>
+
+ <m:mo>+</m:mo>
- <m:mo>+</m:mo>
+ <m:msup>
+ <m:mi>b</m:mi>
+
+ <m:mn>2</m:mn>
+ </m:msup>
+ </m:mrow>
+
+ <m:mo>=</m:mo>
<m:msup>
- <m:mi>b</m:mi>
+ <m:mi>c</m:mi>
<m:mn>2</m:mn>
</m:msup>
</m:mrow>
+ </m:math>
+ </inlineequation></para>
+ </listitem>
+ </orderedlist>
+ </figure>
- <m:mo>=</m:mo>
+ <para>What about LaTeX?</para>
- <m:msup>
- <m:mi>c</m:mi>
+ <figure xml:id="fig_TeXmath">
+ <title>TeX math example</title>
- <m:mn>2</m:mn>
- </m:msup>
- </m:mrow>
- </m:math>
- </inlineequation></para>
- </listitem>
- </orderedlist>
+ <informalequation>
+ <mathphrase role="latex">$ e = mc^2 $</mathphrase>
+ </informalequation>
+ </figure>
<para>Some sql code:</para>
@@ -103,7 +118,7 @@
<para>A <filename>Fig</filename> figure:</para>
- <figure annotations="slide" xml:id="xslAxisDefinitions">
+ <figure xml:id="xslAxisDefinitions">
<title>XSL axis directions</title>
<mediaobject>
@@ -113,8 +128,7 @@
</mediaobject>
</figure>
- <para>A <filename>Svg</filename> figure containing a
- screenshot:</para>
+ <para>A <filename>Svg</filename> figure containing a screenshot:</para>
<figure xml:id="xhtmlRendering">
<title>Rendering Html</title>
@@ -126,8 +140,7 @@
</mediaobject>
</figure>
- <para>A <filename>.fig</filename> containing TeX based
- math:</para>
+ <para>A <filename>.fig</filename> containing TeX based math:</para>
<mediaobject>
<imageobject>
@@ -164,6 +177,5 @@
</mediaobject>
</figure>
- <para>This is a cross reference to <xref
- linkend="slideCallouts"/>.</para>
+ <para>This is a cross reference to <xref linkend="slideCallouts"/>.</para>
</chapter>
diff --git a/ws/Xmlmind/Patch/020_excludeFromSpellCheck.patch b/ws/Xmlmind/Patch/020_excludeFromSpellCheck.patch
index b8fab1bc6d1efc4abf1746241f4a05220d4d7e46..75ad8ee0bdd5d48b194c3fbc2003832a83231618 100644
--- a/ws/Xmlmind/Patch/020_excludeFromSpellCheck.patch
+++ b/ws/Xmlmind/Patch/020_excludeFromSpellCheck.patch
@@ -32,6 +32,7 @@
+ db:keycode
+ db:keysym
+ db:markup
++ db:mathphrase
+ db:mousebutton
+ db:option
+ db:productnumber