Fix dup. template bug with is.graphic.*

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index 53d283c21290db3c314f699fb3877e7d4212207c..b9901a680b700048b146f376afca1244044551b6 100644 (file)
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -849,31 +849,6 @@ object is recognized as a graphic.</para>
   </xsl:choose>
 </xsl:template>
 
-<xsl:template name="is.graphic.format">
-  <xsl:param name="format"></xsl:param>
-  <xsl:if test="$format = 'PNG'
-                or $format = 'JPG'
-                or $format = 'JPEG'
-                or $format = 'linespecific'
-                or $format = 'GIF'
-                or $format = 'GIF87a'
-                or $format = 'GIF89a'
-                or $format = 'BMP'">1</xsl:if>
-</xsl:template>
-
-<xsl:template name="is.graphic.extension">
-  <xsl:param name="ext"></xsl:param>
-  <xsl:if test="$ext = 'png'
-                or $ext = 'jpeg'
-                or $ext = 'jpg'
-                or $ext = 'avi'
-                or $ext = 'mpg'
-                or $ext = 'mpeg'
-                or $ext = 'qt'
-                or $ext = 'gif'
-                or $ext = 'bmp'">1</xsl:if>
-</xsl:template>
-
 <xsl:template name="mediaobject.filename">
   <xsl:param name="object"></xsl:param>
 

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index b6d05ed3c67d5f560786b02e85af669c376dc1a4..d7cad7a82f9483992923f75fa59e7b37e9e0e77e 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -22,17 +22,8 @@
 
      ******************************************************************** -->
 
-<xsl:template match="screenshot">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="screeninfo">
-</xsl:template>
-
 <!-- ==================================================================== -->
-<!-- Override these templates for FO -->
+<!-- Graphic format tests for the FO backend -->
 
 <!--
 FIXME: make is.graphic.* work correctly depending on the backend!
@@ -65,6 +56,19 @@ FIXME: make is.graphic.* work correctly depending on the backend!
 
 <!-- ==================================================================== -->
 
+<xsl:template match="screenshot">
+  <fo:block>
+    <xsl:apply-templates/>
+  </fo:block>
+</xsl:template>
+
+<xsl:template match="screeninfo">
+</xsl:template>
+
+<!-- ==================================================================== -->
+<!-- Override these templates for FO -->
+<!-- ==================================================================== -->
+
 <xsl:template name="process.image">
   <!-- When this template is called, the current node should be  -->
   <!-- a graphic, inlinegraphic, imagedata, or videodata. All    -->

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index d7b4e009ab5975c23fcc35ec83c7238dcac0ebe4..44428674098149a475674ee8cb43bc8965dcfb86 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -24,6 +24,34 @@
 <lxslt:component prefix="xtext"
                  elements="insertfile"/>
 
+<!-- ==================================================================== -->
+<!-- Graphic format tests for the HTML backend -->
+
+<xsl:template name="is.graphic.format">
+  <xsl:param name="format"></xsl:param>
+  <xsl:if test="$format = 'PNG'
+                or $format = 'JPG'
+                or $format = 'JPEG'
+                or $format = 'linespecific'
+                or $format = 'GIF'
+                or $format = 'GIF87a'
+                or $format = 'GIF89a'
+                or $format = 'BMP'">1</xsl:if>
+</xsl:template>
+
+<xsl:template name="is.graphic.extension">
+  <xsl:param name="ext"></xsl:param>
+  <xsl:if test="$ext = 'png'
+                or $ext = 'jpeg'
+                or $ext = 'jpg'
+                or $ext = 'avi'
+                or $ext = 'mpg'
+                or $ext = 'mpeg'
+                or $ext = 'qt'
+                or $ext = 'gif'
+                or $ext = 'bmp'">1</xsl:if>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 <xsl:template match="screenshot">