Enabled selection of imageobject based on role attribute.

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 921b00079dede5bad87ee3dd852a7c25d36ca07d..81737723f876a3a43360d5d7c14988f0ed466f42 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -788,7 +788,39 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
     <xsl:if test="@id">
       <a name="{@id}"/>
     </xsl:if>
-    <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 = 'html']">
+        <xsl:call-template name="select.mediaobject">
+         <xsl:with-param name="olist"
+                 select="(imageobject|imageobjectco
+                     |videoobject|audioobject
+                    |textobject)[@role = 'html']"/>
+       </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"/>
   </div>
 </xsl:template>

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 23bcfc96946256bf9eb463d362b48eebf81719d6..74e96ebbf48b5ce966fba4fbc5b1154652387a5d 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -143,6 +143,7 @@
 <!ENTITY pixels.per.inch SYSTEM "../params/pixels.per.inch.xml">
 <!ENTITY points.per.em SYSTEM "../params/points.per.em.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">
@@ -199,6 +200,7 @@
 <!ENTITY use.id.as.filename SYSTEM "../params/use.id.as.filename.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.table SYSTEM "../params/variablelist.as.table.xml">
 <!ENTITY para.propagates.style SYSTEM "../params/para.propagates.style.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index eb346129d28c41ca59426ec79b2d399455d8e42b..7f14e6f0e95458c701abf307780d3ba5696ad79b 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -253,6 +253,8 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &nominal.image.depth;
 &use.embed.for.svg;
 &make.graphic.viewport;
+&preferred.mediaobject.role;
+&use.role.for.mediaobject;
 </reference>
 
 <reference><title>Chunking</title>