diff --git a/ws/Docbook/Extensions/Tdata/SvgAnimate/animate.xml b/ws/Docbook/Extensions/Tdata/SvgAnimate/animate.xml index 04af61b27ad5b6b717659f0b08161499ee7fb399..1d0d16bfeece9330c31add2f99bde5b6c01a313d 100644 --- a/ws/Docbook/Extensions/Tdata/SvgAnimate/animate.xml +++ b/ws/Docbook/Extensions/Tdata/SvgAnimate/animate.xml @@ -36,6 +36,16 @@ ...</screen> </figure> + <figure xml:id="pyramidFig"> + <title>A <quote>pyramid</quote> type animated figure</title> + + <mediaobject> + <imageobject> + <imagedata fileref="Ref/pyramid.multi.svg"/> + </imageobject> + </mediaobject> + </figure> + <figure xml:id="fig"> <title>An animated figure</title> diff --git a/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl b/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl index a62d43a6c5b524dfedac9d3b309d5f3a89eedce1..38dfbd90ed1ea935b0da5a37ff69e4f1613feb08 100644 --- a/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl +++ b/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl @@ -2,8 +2,11 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:jessyink="https://launchpad.net/jessyink" + xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:d="http://docbook.org/ns/docbook"> @@ -147,8 +150,12 @@ </file> <xsl:result-document href="{$svgLayerBasefilename}.svg" exclude-result-prefixes="svg"> <svg xmlns="http://www.w3.org/2000/svg"> - <xsl:copy-of select="$svgRoot/@*" /> + <xsl:copy-of select="$svgRoot/@*"/> <xsl:copy-of select="$svgRoot/*[not (name(.) = 'g')]"/> + <xsl:if test="contains(/svg:svg/svg:metadata/rdf:RDF/cc:Work/dc:description, 'meta:pyramid')"> + <xsl:apply-templates select="following-sibling::svg:g[not(@jessyink:masterSlide)]" mode="sortLayer"/> + </xsl:if> + <xsl:apply-templates select="." mode="sortLayer"/> <xsl:copy-of select="$masterSlide"/> </svg>