Enabled support for selecting imageobject using the role attribute.

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index 009f5d48e093da5aec520ff153e75a1323eb4b92..690cec1c576ca8a47e6a38e844cce698bc27b001 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -309,7 +309,39 @@
 
 <xsl:template match="mediaobject|mediaobjectco">
   <fo:block>
-    <xsl:call-template name="select.mediaobject"/>
+    <xsl:choose>
+      <xsl:when test="$use.role.for.mediaobject != 0 
+                 and $preferred.mediaobject.role != ''
+                 and (imageobject|imageobjectco
+                     |videoobject|audioobject
+                     |textobject)[@role = $preferred.mediaobject.role]"> 
+        <xsl:call-template name="select.mediaobject">
+         <xsl:with-param name="olist"
+                 select="(imageobject|imageobjectco
+                     |videoobject|audioobject
+                     |textobject)[@role = $preferred.mediaobject.role]"/> 
+       </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="$use.role.for.mediaobject != 0 
+                 and (imageobject|imageobjectco
+                     |videoobject|audioobject
+                    |textobject)[@role = 'fo']">
+        <xsl:call-template name="select.mediaobject">
+         <xsl:with-param name="olist"
+                 select="(imageobject|imageobjectco
+                     |videoobject|audioobject
+                    |textobject)[@role = 'fo']"/>
+       </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="select.mediaobject">
+         <xsl:with-param name="olist"
+                 select="imageobject|imageobjectco
+                     |videoobject|audioobject
+                    |textobject"/>
+       </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:apply-templates select="caption"/>
   </fo:block>
 </xsl:template>

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 0f456ffe901e367e4afffb98daa3375eb0d3d44a..e5a4dafaef1a5237bd11553fb0825f96e3ceb84c 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -96,6 +96,7 @@
 <!ENTITY part.autolabel SYSTEM "../params/part.autolabel.xml">
 <!ENTITY passivetex.extensions SYSTEM "../params/passivetex.extensions.xml">
 <!ENTITY preface.autolabel SYSTEM "../params/preface.autolabel.xml">
+<!ENTITY preferred.mediaobject.role SYSTEM "../params/preferred.mediaobject.role.xml">
 <!ENTITY process.empty.source.toc SYSTEM "../params/process.empty.source.toc.xml">
 <!ENTITY process.source.toc SYSTEM "../params/process.source.toc.xml">
 <!ENTITY profile.arch SYSTEM "../params/profile.arch.xml">
@@ -149,6 +150,7 @@
 <!ENTITY use.extensions SYSTEM "../params/use.extensions.xml">
 <!ENTITY use.local.olink.style SYSTEM "../params/use.local.olink.style.xml">
 <!ENTITY use.role.as.xrefstyle SYSTEM "../params/use.role.as.xrefstyle.xml">
+<!ENTITY use.role.for.mediaobject SYSTEM "../params/use.role.for.mediaobject.xml">
 <!ENTITY use.svg SYSTEM "../params/use.svg.xml">
 <!ENTITY variablelist.as.blocks SYSTEM "../params/variablelist.as.blocks.xml">
 <!ENTITY verbatim.properties SYSTEM "../params/verbatim.properties.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index ae85e3b48eb4186fcb341eec0e97a87179a30f50..192961651835d671f093adf22f6e3c748370dabc 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -217,6 +217,8 @@ generate.section.toc.level;
 <reference><title>Graphics</title>
 &graphic.default.extension;
 &default.image.width;
+&preferred.mediaobject.role;
+&use.role.for.mediaobject;
 </reference>
 
 <reference><title>Pagination and General Styles</title>