diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/cashRegister.svg b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/cashRegister.svg similarity index 100% rename from ws/Docbook/Extensions/Tdata/Scale/Ref/cashRegister.svg rename to ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/cashRegister.svg diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/currencyConverter.webm b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/currencyConverter.webm similarity index 100% rename from ws/Docbook/Extensions/Tdata/Scale/Ref/currencyConverter.webm rename to ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/currencyConverter.webm diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/domtree.fig b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/domtree.fig similarity index 100% rename from ws/Docbook/Extensions/Tdata/Scale/Ref/domtree.fig rename to ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/domtree.fig diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/dualSigned3bit.svg b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/dualSigned3bit.svg similarity index 100% rename from ws/Docbook/Extensions/Tdata/Scale/Ref/dualSigned3bit.svg rename to ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/dualSigned3bit.svg diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/scannerUsage.webm b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/scannerUsage.webm similarity index 100% rename from ws/Docbook/Extensions/Tdata/Scale/Ref/scannerUsage.webm rename to ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/scannerUsage.webm diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/xpath.fig b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/xpath.fig similarity index 100% rename from ws/Docbook/Extensions/Tdata/Scale/Ref/xpath.fig rename to ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/xpath.fig diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/z80DataBus.jpg b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/z80DataBus.jpg similarity index 100% rename from ws/Docbook/Extensions/Tdata/Scale/Ref/z80DataBus.jpg rename to ws/Docbook/Extensions/Tdata/Scale/FormatXfig/Ref/z80DataBus.jpg diff --git a/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/xpath.xml b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/xpath.xml new file mode 100644 index 0000000000000000000000000000000000000000..4267fc53153a3171fbccbcfb30bb6b60d91f566f --- /dev/null +++ b/ws/Docbook/Extensions/Tdata/Scale/FormatXfig/xpath.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8"?> +<chapter annotations="slide" xml:id="scale" + 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" + xmlns:trans="http://docbook.org/ns/transclusion" + 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"> + <title>Images</title> + + <figure xml:id="sd1VideoUsingScannerClass"> + <title>Using a <classname + xlink:href="https://docs.oracle.com/javase/8/docs/api/java/util/Scanner.html">Scanner</classname> + class collecting user input.</title> + + <mediaobject> + <videoobject> + <videodata fileref="Ref/scannerUsage.webm" format="video/webm"/> + </videoobject> + </mediaobject> + </figure> + + <figure xml:id="videoCurrencyConverter"> + <title>A currency converter.</title> + + <mediaobject> + <videoobject> + <videodata fileref="Ref/currencyConverter.webm" format="video/webm"/> + </videoobject> + </mediaobject> + </figure> + + <figure xml:id="cashRegisterScaled200"> + <title>A 75 x 120 image.</title> + + <mediaobject> + <imageobject> + <imagedata fileref="Ref/cashRegister.svg"/> + </imageobject> + </mediaobject> + </figure> + + <figure xml:id="domTree"> + <title>A DOM tree.</title> + + <mediaobject> + <imageobject> + <imagedata fileref="Ref/domtree.fig"/> + </imageobject> + </mediaobject> + </figure> + + <figure xml:id="dualSigned3bit"> + <title>3-bit signed.</title> + + <mediaobject> + <imageobject> + <imagedata fileref="Ref/dualSigned3bit.svg"/> + </imageobject> + </mediaobject> + </figure> + + <figure xml:id="z80"> + <title>Z-80 processor.</title> + + <mediaobject> + <imageobject> + <imagedata fileref="Ref/z80DataBus.jpg"/> + </imageobject> + </mediaobject> + </figure> + + <figure xml:id="xpath"> + <title>XPath</title> + + <mediaobject> + <imageobject> + <imagedata fileref="Ref/xpath.fig"/> + </imageobject> + </mediaobject> + </figure> +</chapter> diff --git a/ws/Docbook/Extensions/Tdata/Scale/scale.xml b/ws/Docbook/Extensions/Tdata/Scale/scale.xml index 5789fb0eccee83d9f666f30e52ef700f275e95e3..4c58a6b038f3ec2e6df260cb17adb146c2da09ba 100644 --- a/ws/Docbook/Extensions/Tdata/Scale/scale.xml +++ b/ws/Docbook/Extensions/Tdata/Scale/scale.xml @@ -22,79 +22,5 @@ <pubdate/> </info> - <chapter annotations="slide" xml:id="scale"> - <title>Images</title> - - <figure xml:id="sd1VideoUsingScannerClass"> - <title>Using a <classname - xlink:href="https://docs.oracle.com/javase/8/docs/api/java/util/Scanner.html">Scanner</classname> - class collecting user input.</title> - - <mediaobject> - <videoobject> - <videodata fileref="Ref/scannerUsage.webm" format="video/webm"/> - </videoobject> - </mediaobject> - </figure> - - <figure xml:id="videoCurrencyConverter"> - <title>A currency converter.</title> - - <mediaobject> - <videoobject> - <videodata fileref="Ref/currencyConverter.webm" format="video/webm"/> - </videoobject> - </mediaobject> - </figure> - - <figure xml:id="cashRegisterScaled200"> - <title>A 75 x 120 image.</title> - - <mediaobject> - <imageobject> - <imagedata fileref="Ref/cashRegister.svg"/> - </imageobject> - </mediaobject> - </figure> - - <figure xml:id="domTree"> - <title>A DOM tree.</title> - - <mediaobject> - <imageobject> - <imagedata fileref="Ref/domtree.fig"/> - </imageobject> - </mediaobject> - </figure> - - <figure xml:id="dualSigned3bit"> - <title>3-bit signed.</title> - - <mediaobject> - <imageobject> - <imagedata fileref="Ref/dualSigned3bit.svg"/> - </imageobject> - </mediaobject> - </figure> - - <figure xml:id="z80"> - <title>Z-80 processor.</title> - - <mediaobject> - <imageobject> - <imagedata fileref="Ref/z80DataBus.jpg"/> - </imageobject> - </mediaobject> - </figure> - - <figure xml:id="xpath"> - <title>XPath</title> - - <mediaobject> - <imageobject> - <imagedata fileref="Ref/xpath.fig"/> - </imageobject> - </mediaobject> - </figure> - </chapter> + <xi:include href="FormatXfig/xpath.xml" xpointer="element(/1)"/> </book>