Fix handling of mediatypes for video and audio files, mostly for HTML5 and EPUB3...

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index 10c89cef74c2c4fad5f5cd1c436a68ef7541e6dc..accb343447875a1f77bf4a062f8b9e8e622e933c 100644 (file)
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -1,4 +1,8 @@
 <?xml version='1.0'?>
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
+<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
+ ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
                 xmlns:dyn="http://exslt.org/dynamic"
@@ -2045,4 +2049,48 @@ engine does not support it.
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
+
+
+<doc:template name="graphic.format.content-type" xmlns="">
+  <refpurpose>Returns mimetype for media format</refpurpose>
+  <refdescription id="graphic.format.content-type-desc">
+    <para>This takes as input a 'format' param and returns
+    a mimetype string.  It uses an xsl:choose after first
+    converting the input to all uppercase.</para>
+  </refdescription>
+</doc:template>
+<xsl:template name="graphic.format.content-type">
+  <xsl:param name="format"/>
+  <xsl:variable name="upperformat" select="translate($format,&lowercase;,&uppercase;)"/>
+  <xsl:choose>
+    <xsl:when test="$upperformat = ''"></xsl:when>
+    <xsl:when test="$upperformat = 'linespecific'"></xsl:when>
+    <xsl:when test="$upperformat = 'PS'">application/postscript</xsl:when>
+    <xsl:when test="$upperformat = 'PDF'">application/pdf</xsl:when>
+    <xsl:when test="$upperformat = 'PNG'">image/png</xsl:when>
+    <xsl:when test="$upperformat = 'SVG'">image/svg+xml</xsl:when>
+    <xsl:when test="$upperformat = 'JPG'">image/jpeg</xsl:when>
+    <xsl:when test="$upperformat = 'JPEG'">image/jpeg</xsl:when>
+    <xsl:when test="$upperformat = 'GIF'">image/gif</xsl:when>
+    <xsl:when test="$upperformat = 'GIF87A'">image/gif</xsl:when>
+    <xsl:when test="$upperformat = 'GIF89A'">image/gif</xsl:when>
+    <xsl:when test="$upperformat = 'ACC'">audio/acc</xsl:when>
+    <xsl:when test="$upperformat = 'MPG'">audio/mpeg</xsl:when>
+    <xsl:when test="$upperformat = 'MP1'">audio/mpeg</xsl:when>
+    <xsl:when test="$upperformat = 'MP2'">audio/mpeg</xsl:when>
+    <xsl:when test="$upperformat = 'MP3'">audio/mpeg</xsl:when>
+    <xsl:when test="$upperformat = 'M4A'">audio/mp4</xsl:when>
+    <xsl:when test="$upperformat = 'MPEG'">audio/mpeg</xsl:when>
+    <xsl:when test="$upperformat = 'WAV'">audio/wav</xsl:when>
+    <xsl:when test="$upperformat = 'MP4'">video/mp4</xsl:when>
+    <xsl:when test="$upperformat = 'M4V'">video/mp4</xsl:when>
+    <xsl:when test="$upperformat = 'OGV'">video/ogg</xsl:when>
+    <xsl:when test="$upperformat = 'OGG'">video/ogg</xsl:when>
+    <xsl:when test="$upperformat = 'WEBM'">video/webm</xsl:when>
+    <xsl:otherwise>
+        <xsl:value-of select="concat('image/', $upperformat)"/> 
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>

diff --git a/xsl/epub3/epub3-element-mods.xsl b/xsl/epub3/epub3-element-mods.xsl
index 0246399ce9023ace799c9abb0f9c816a6f98cb0e..0c7707cea40cdbf976f34efd9ef7136b1a02370c 100644 (file)
--- a/xsl/epub3/epub3-element-mods.xsl
+++ b/xsl/epub3/epub3-element-mods.xsl
@@ -1156,25 +1156,6 @@ article  toc,title,figure,table,example,equation
   </xsl:if>
 </xsl:template>
 
-<xsl:template name="graphic.format.content-type">
-  <xsl:param name="format" select="''"/>
-  <xsl:choose>
-    <xsl:when test="$format = ''"></xsl:when>
-    <xsl:when test="$format = 'linespecific'"></xsl:when>
-    <xsl:when test="$format = 'PS'">application/postscript</xsl:when>
-    <xsl:when test="$format = 'PDF'">application/pdf</xsl:when>
-    <xsl:when test="$format = 'PNG'">image/png</xsl:when>
-    <xsl:when test="$format = 'SVG'">image/svg+xml</xsl:when>
-    <xsl:when test="$format = 'JPG'">image/jpeg</xsl:when>
-    <xsl:when test="$format = 'GIF87a'">image/gif</xsl:when>
-    <xsl:when test="$format = 'GIF89a'">image/gif</xsl:when>
-    <xsl:otherwise>
-        <xsl:value-of select="concat('image/', 
-          translate($format, &uppercase;, &lowercase;))"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
 <xsl:template name="manifest.toc">
   <xsl:variable name="toc.params">
     <xsl:call-template name="find.path.params">
@@ -1433,9 +1414,12 @@ article  toc,title,figure,table,example,equation
 
 <xsl:template match="mediaobject|inlinemediaobject" mode="enumerate-images">
 
-  <xsl:variable name="olist" select="imageobject|imageobjectco|
-                     videoobject|audioobject|
-                     textobject"/>
+  <xsl:variable name="olist" 
+                select="imageobject[not(@role = 'poster')] 
+                       |imageobjectco
+                       |videoobject
+                       |audioobject
+                       |textobject"/>
  
   <xsl:variable name="object.index">
     <xsl:call-template name="select.mediaobject.index">
@@ -1446,6 +1430,16 @@ article  toc,title,figure,table,example,equation
   
   <xsl:variable name="object" select="$olist[position() = $object.index]"/>
 
+  <xsl:apply-templates select="$object" mode="enumerate-images"/>
+
+  <!-- also include a poster image if present -->
+  <xsl:apply-templates select="imageobject[@role = 'poster']" mode="enumerate-images"/>
+
+</xsl:template>
+
+<xsl:template match="imageobject|videoobject|audioobject" mode="enumerate-images">
+  <xsl:param name="object" select="."/>
+
   <xsl:if test="$object">
     <xsl:variable name="image.filename">
       <xsl:call-template name="mediaobject.filename">
@@ -1477,7 +1471,7 @@ article  toc,title,figure,table,example,equation
 
   </xsl:if>
 </xsl:template>
-
+ 
 <!-- Add in the generated images -->
 <xsl:template match="note|caution|warning|important|tip" mode="enumerate-images">
   <xsl:if test="$admon.graphics != 0">

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index 1d7f734180a058393538ec45c557384fee7c1fec..4bde8165d52bcae46dbe5dec65076f8d1f4a1fc2 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -93,32 +93,6 @@
                          concat(' ', $lcext, ' '))">1</xsl:if>
 </xsl:template>
 
-<xsl:template name="graphic.format.content-type">
-  <xsl:param name="format"/>
-  <xsl:variable name="is.graphic.format">
-    <xsl:call-template name="is.graphic.format">
-      <xsl:with-param name="format" select="$format"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$is.graphic.format">
-    <xsl:choose>
-      <xsl:when test="$format = ''"></xsl:when>
-      <xsl:when test="$format = 'linespecific'"></xsl:when>
-      <xsl:when test="$format = 'PS'">application/postscript</xsl:when>
-      <xsl:when test="$format = 'PDF'">application/pdf</xsl:when>
-      <xsl:when test="$format = 'PNG'">image/png</xsl:when>
-      <xsl:when test="$format = 'SVG'">image/svg+xml</xsl:when>
-      <xsl:when test="$format = 'JPG'">image/jpeg</xsl:when>
-      <xsl:when test="$format = 'GIF87a'">image/gif</xsl:when>
-      <xsl:when test="$format = 'GIF89a'">image/gif</xsl:when>
-      <xsl:otherwise>
-          <xsl:value-of select="concat('image/', 
-            translate($format, &uppercase;, &lowercase;))"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
 
 <!-- ==================================================================== -->
 

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 68e9dd6de4a24efe9e4642f6bcef525fc3523da6..cf957c549e742b37fc38b5323991b34ee13855a8 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -53,9 +53,21 @@
              or $lcext = 'jpg'
              or $lcext = 'avi'
              or $lcext = 'mpg'
+             or $lcext = 'mp4'
              or $lcext = 'mpeg'
              or $lcext = 'qt'
              or $lcext = 'gif'
+             or $lcext = 'acc'
+             or $lcext = 'mp1'
+             or $lcext = 'mp2'
+             or $lcext = 'mp3'
+             or $lcext = 'mp4'
+             or $lcext = 'm4v'
+             or $lcext = 'm4a'
+             or $lcext = 'wav'
+             or $lcext = 'ogv'
+             or $lcext = 'ogg'
+             or $lcext = 'webm'
              or $lcext = 'bmp'">1</xsl:if>
 </xsl:template>