diff --git a/ws/Docbook/Extensions/Tdata/Components/intro.xml b/ws/Docbook/Extensions/Tdata/Components/intro.xml
new file mode 100644
index 0000000000000000000000000000000000000000..396a9767e2675bad4a720ba6aa7f4558e3a8df60
--- /dev/null
+++ b/ws/Docbook/Extensions/Tdata/Components/intro.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<db:chapter
+ version="5.0"
+ 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:m="http://www.w3.org/1998/Math/MathML"
+xmlns:html="http://www.w3.org/1999/xhtml"
+xmlns:db="http://docbook.org/ns/docbook"
+><db:title
+>Introduction</db:title
+><db:para
+>Some MathML:</db:para
+><db:informalequation
+><m:math
+display="block"
+><m:mroot
+><m:mi
+>x</m:mi
+><m:mn
+>3</m:mn
+></m:mroot
+></m:math
+></db:informalequation
+><db:orderedlist
+><db:listitem
+xml:id="sw1PhytagoreanTripletCondition1"
+><db:para
+><db:inlineequation
+><m:math
+display="inline"
+><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:math
+></db:inlineequation
+></db:para
+></db:listitem
+><db:listitem
+xml:id="sw1PhytagoreanTripletCondition2"
+><db:para
+><db: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:mi
+>1000</m:mi
+></m:mrow
+></m:math
+></db:inlineequation
+></db:para
+></db:listitem
+><db:listitem
+><db:para
+><db:inlineequation
+><m:math
+display="inline"
+><m:mrow
+><m:mrow
+><m:msup
+><m:mi
+>a</m:mi
+><m:mn
+>2</m:mn
+></m:msup
+><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
+>c</m:mi
+><m:mn
+>2</m:mn
+></m:msup
+></m:mrow
+></m:math
+></db:inlineequation
+></db:para
+></db:listitem
+></db:orderedlist
+><db:para
+>Some sql code:</db:para
+><db:programlisting
+language="none"
+>SELECT * FROM Table</db:programlisting
+><db:para
+>A <db:filename
+>.fig</db:filename
+> figure:</db:para
+><db:figure
+xml:id="xslAxisDefinitions"
+><db:title
+>XSL axis directions</db:title
+><db:mediaobject
+><db:imageobject
+><db:imagedata
+fileref="../../../../../Doc/Sda1/Ref/Fig/preceding.fig"
+scale="60"
+></db:imagedata
+></db:imageobject
+></db:mediaobject
+></db:figure
+><db:para
+>A <db:filename
+>.fig</db:filename
+> containing TeX based math:</db:para
+><db:mediaobject
+><db:imageobject
+><db:imagedata
+fileref="../Ref/Fig/carSlope.fig"
+></db:imagedata
+></db:imageobject
+></db:mediaobject
+><db:para
+>Embedding <db:acronym
+>SVG</db:acronym
+>:</db:para
+><db:mediaobject
+><db:imageobject
+><db:imagedata
+fileref="../../../../../Doc/Sda1/Ref/Fig/xhtml.svg"
+></db:imagedata
+></db:imageobject
+></db:mediaobject
+><db:para
+>What about <db:acronym
+xlink:href="http://www.w3.org/TR/SVG"
+>SVG</db:acronym
+>?</db:para
+><db:mediaobject
+><db:imageobject
+><db:imagedata
+fileref="../Ref/Fig/freedocs.svg"
+></db:imagedata
+></db:imageobject
+></db:mediaobject
+><db:para
+>A <db:filename
+>.bmp</db:filename
+> screen shot:</db:para
+><db:mediaobject
+><db:imageobject
+><db:imagedata
+fileref="../../../../../Doc/Sd1/Ref/Fig/codingbatSleepExample.bmp"
+></db:imagedata
+></db:imageobject
+></db:mediaobject
+><db:para
+>SVG slide example:</db:para
+><db:figure
+xml:id="hashingPrinciple"
+><db:title
+>Hashing principle</db:title
+><db:mediaobject
+><db:imageobject
+><db:imagedata
+fileref="../../../../../Doc/Sd1/Ref/Fig/hashing.svg"
+></db:imagedata
+></db:imageobject
+></db:mediaobject
+></db:figure
+><db:para
+>This is a cross reference to <db:xref
+linkend="callouts"
+></db:xref
+>.</db:para
+></db:chapter
+>
diff --git a/ws/Docbook/Extensions/Tdata/fig.xml b/ws/Docbook/Extensions/Tdata/fig.xml
index 5dab92d10ed92591fd9101d9cc9fc4589189b208..f0dbedc6011fb869bb180b763a204861c1ba539f 100644
--- a/ws/Docbook/Extensions/Tdata/fig.xml
+++ b/ws/Docbook/Extensions/Tdata/fig.xml
@@ -34,161 +34,7 @@
</itemizedlist>
</preface>
- <chapter xml:id="intro">
- <title>Introduction</title>
-
- <para>Some MathML:</para>
-
- <informalequation>
- <m:math display="block">
- <m:mroot>
- <m:mi>x</m:mi>
-
- <m:mn>3</m:mn>
- </m:mroot>
- </m:math>
- </informalequation>
-
- <orderedlist>
- <listitem xml:id="sw1PhytagoreanTripletCondition1">
- <para><inlineequation>
- <m:math display="inline">
- <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: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:mi>1000</m:mi>
- </m:mrow>
- </m:math>
- </inlineequation></para>
- </listitem>
-
- <listitem>
- <para><inlineequation>
- <m:math display="inline">
- <m:mrow>
- <m:mrow>
- <m:msup>
- <m:mi>a</m:mi>
-
- <m:mn>2</m:mn>
- </m:msup>
-
- <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>c</m:mi>
-
- <m:mn>2</m:mn>
- </m:msup>
- </m:mrow>
- </m:math>
- </inlineequation></para>
- </listitem>
- </orderedlist>
-
- <para>Some sql code:</para>
-
- <programlisting language="none">SELECT * FROM Table</programlisting>
-
- <para>A <filename>.fig</filename> figure:</para>
-
- <figure xml:id="xslAxisDefinitions">
- <title>XSL axis directions</title>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="../../../../Doc/Sda1/Ref/Fig/preceding.fig"
- scale="60"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>A <filename>.fig</filename> containing TeX based math:</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="Ref/Fig/carSlope.fig"/>
- </imageobject>
- </mediaobject>
-
- <para>Embedding <acronym>SVG</acronym>:</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="../../../../Doc/Sda1/Ref/Fig/xhtml.svg"/>
- </imageobject>
- </mediaobject>
-
- <para>What about <acronym
- xlink:href="http://www.w3.org/TR/SVG">SVG</acronym>?</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="Ref/Fig/freedocs.svg"/>
- </imageobject>
- </mediaobject>
-
- <para>A <filename>.bmp</filename> screen shot:</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="../../../../Doc/Sd1/Ref/Fig/codingbatSleepExample.bmp"/>
- </imageobject>
- </mediaobject>
-
- <para>SVG slide example:</para>
-
- <figure xml:id="hashingPrinciple">
- <title>Hashing principle</title>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="../../../../Doc/Sd1/Ref/Fig/hashing.svg"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>This is a cross reference to <xref linkend="callouts"/>.</para>
- </chapter>
+ <xi:include href="Components/intro.xml" xpointer="element(/1)"/>
<chapter xml:id="callouts">
<title>Callouts</title>