Fixed bug #442160. Parameter graphic.default.extension is now used also for <graphic...

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index a844dacd976cce9682b4958b5c0fdce97305ae7a..ba52ea17eb0e7a821fc6a1ee9bc1c36b1d01f5f4 100644 (file)
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -854,7 +854,8 @@ object is recognized as a graphic.</para>
 
   <xsl:variable name="data" select="$object/videodata
                                     |$object/imagedata
-                                    |$object/audiodata"/>
+                                    |$object/audiodata
+                                    |$object"/>
 
   <xsl:variable name="filename">
     <xsl:choose>

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index c767326c6a9952c2cb7252d3efeb1956a2773cc8..b3c0c1b61aa7d6a323672aa7ab51462e85236b9a 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -77,20 +77,10 @@
     <xsl:choose>
       <xsl:when test="local-name(.) = 'graphic'
                       or local-name(.) = 'inlinegraphic'">
-        <xsl:choose>
-          <xsl:when test="@fileref">
-            <xsl:value-of select="@fileref"/>
-          </xsl:when>
-          <xsl:when test="@entityref">
-            <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>A fileref or entityref is required on </xsl:text>
-              <xsl:value-of select="local-name(.)"/>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
+        <!-- handle legacy graphic and inlinegraphic by new template --> 
+        <xsl:call-template name="mediaobject.filename">
+          <xsl:with-param name="object" select="."/>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <!-- imagedata, videodata, audiodata -->