DocBook

Revision: 8949
          http://docbook.svn.sourceforge.net/docbook/?rev=8949&view=rev
Author:   mzjn
Date:     2010-12-17 18:18:19 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
Added condition to prevent "Failed to interpret image" messages (SVG is not supported 
by the graphic size extension).

Modified Paths:
--------------
    trunk/xsl/html/graphics.xsl

Modified: trunk/xsl/html/graphics.xsl
===================================================================
--- trunk/xsl/html/graphics.xsl	2010-12-09 15:49:43 UTC (rev 8948)
+++ trunk/xsl/html/graphics.xsl	2010-12-17 18:18:19 UTC (rev 8949)
@@ -274,7 +274,8 @@
   <xsl:variable name="realintrinsicwidth">
     <!-- This funny compound test works around a bug in XSLTC -->
     <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
+      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0
+                      and not(@format='SVG')">
         <xsl:choose>
           <xsl:when test="function-available('simg:getWidth')">
             <xsl:value-of select="simg:getWidth(simg:new($filename.for.graphicsize),
@@ -309,7 +310,8 @@
   <xsl:variable name="intrinsicdepth">
     <!-- This funny compound test works around a bug in XSLTC -->
     <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
+      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0
+                      and not(@format='SVG')">
         <xsl:choose>
           <xsl:when test="function-available('simg:getDepth')">
             <xsl:value-of select="simg:getDepth(simg:new($filename.for.graphicsize),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9246
          http://docbook.svn.sourceforge.net/docbook/?rev=9246&view=rev
Author:   bobstayton
Date:     2012-03-19 17:29:30 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
Turn off img longdesc attribute because not supported by browsers.

Modified Paths:
--------------
    trunk/xsl/html/graphics.xsl

Modified: trunk/xsl/html/graphics.xsl
===================================================================
--- trunk/xsl/html/graphics.xsl	2012-03-17 21:43:54 UTC (rev 9245)
+++ trunk/xsl/html/graphics.xsl	2012-03-19 17:29:30 UTC (rev 9246)
@@ -1019,11 +1019,13 @@
     </xsl:attribute>
   </xsl:if>
 
+  <!-- Turn off longdesc attribute since not supported by browsers
   <xsl:if test="$longdesc != ''">
     <xsl:attribute name="longdesc">
       <xsl:value-of select="$longdesc"/>
     </xsl:attribute>
   </xsl:if>
+  -->
 
   <xsl:if test="@align and $viewport = 0">
     <xsl:attribute name="align">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9367
          http://docbook.svn.sourceforge.net/docbook/?rev=9367&view=rev
Author:   bobstayton
Date:     2012-05-12 23:46:35 +0000 (Sat, 12 May 2012)
Log Message:
-----------
Make viewport layout table compatible with html5.

Modified Paths:
--------------
    trunk/xsl/html/graphics.xsl

Modified: trunk/xsl/html/graphics.xsl
===================================================================
--- trunk/xsl/html/graphics.xsl	2012-05-12 23:44:25 UTC (rev 9366)
+++ trunk/xsl/html/graphics.xsl	2012-05-12 23:46:35 UTC (rev 9367)
@@ -690,8 +690,13 @@
 
   <xsl:choose>
     <xsl:when test="$use.viewport">
-      <table border="0" summary="manufactured viewport for HTML img"
-             cellspacing="0" cellpadding="0">
+      <table border="{$table.border.off}">
+        <xsl:if test="$div.element != 'section'">
+          <xsl:attribute name="summary">manufactured viewport for HTML img</xsl:attribute>
+        </xsl:if>
+        <xsl:if test="$css.decoration != ''">
+          <xsl:attribute name="style">cellpadding: 0; cellspacing: 0;</xsl:attribute>
+        </xsl:if>
         <xsl:if test="$html.width != ''">
           <xsl:attribute name="width">
             <xsl:value-of select="$html.width"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9611
          http://docbook.svn.sourceforge.net/docbook/?rev=9611&view=rev
Author:   stefan
Date:     2012-10-13 19:09:11 +0000 (Sat, 13 Oct 2012)
Log Message:
-----------
Add hook for customization.

Modified Paths:
--------------
    trunk/xsl/html/graphics.xsl

Modified: trunk/xsl/html/graphics.xsl
===================================================================
--- trunk/xsl/html/graphics.xsl	2012-10-13 17:38:50 UTC (rev 9610)
+++ trunk/xsl/html/graphics.xsl	2012-10-13 19:09:11 UTC (rev 9611)
@@ -1062,8 +1062,12 @@
       </xsl:choose>
     </xsl:attribute>
   </xsl:if>
+
+  <xsl:call-template name="extension.process.image.attributes"/>
 </xsl:template>
 
+<xsl:template name="extension.process.image.attributes"/>
+
 <!-- ==================================================================== -->
 
 <xsl:template match="graphic">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9660
          http://docbook.svn.sourceforge.net/docbook/?rev=9660&view=rev
Author:   bobstayton
Date:     2012-11-02 17:44:31 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
Add support for mediaobject/alt, with precedence over
mediaobject/textobject/phrase.

Modified Paths:
--------------
    trunk/xsl/html/graphics.xsl

Modified: trunk/xsl/html/graphics.xsl
===================================================================
--- trunk/xsl/html/graphics.xsl	2012-10-29 23:18:22 UTC (rev 9659)
+++ trunk/xsl/html/graphics.xsl	2012-11-02 17:44:31 UTC (rev 9660)
@@ -664,7 +664,10 @@
                   <xsl:copy-of select="$alt"/>
                 </xsl:when>
                 <xsl:when test="ancestor::figure">
-                  <xsl:value-of select="normalize-space(ancestor::figure/title)"/>
+                  <xsl:variable name="fig.title">
+                    <xsl:apply-templates select="ancestor::figure/title/node()"/>
+                  </xsl:variable>
+                  <xsl:value-of select="normalize-space($fig.title)"/>
                 </xsl:when>
               </xsl:choose>
             </xsl:with-param>
@@ -1284,7 +1287,14 @@
 
       <xsl:call-template name="process.image">
         <xsl:with-param name="alt">
-          <xsl:apply-templates select="$phrases[not(@role) or @role!='tex'][1]"/>
+          <xsl:choose>
+            <xsl:when test="ancestor::mediaobject/alt">
+              <xsl:apply-templates select="ancestor::mediaobject/alt"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:apply-templates select="$phrases[not(@role) or @role!='tex'][1]"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:with-param>
         <xsl:with-param name="longdesc">
           <xsl:call-template name="write.longdesc">
@@ -1427,6 +1437,10 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template match="mediaobject/alt">
+  <xsl:apply-templates/>
+</xsl:template>
+
 <xsl:template match="videoobject">
   <xsl:apply-templates select="videodata"/>
 </xsl:template>
@@ -1435,7 +1449,14 @@
   <xsl:call-template name="process.image">
     <xsl:with-param name="tag" select="'embed'"/>
     <xsl:with-param name="alt">
-      <xsl:apply-templates select="(../../textobject/phrase)[1]"/>
+      <xsl:choose>
+        <xsl:when test="ancestor::mediaobject/alt">
+          <xsl:apply-templates select="ancestor::mediaobject/alt"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="(ancestor::mediaobject/textobject/phrase)[1]"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:with-param>
   </xsl:call-template>
 </xsl:template>
@@ -1450,7 +1471,14 @@
   <xsl:call-template name="process.image">
     <xsl:with-param name="tag" select="'embed'"/>
     <xsl:with-param name="alt">
-      <xsl:apply-templates select="(../../textobject/phrase)[1]"/>
+      <xsl:choose>
+        <xsl:when test="ancestor::mediaobject/alt">
+          <xsl:apply-templates select="ancestor::mediaobject/alt"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="(ancestor::mediaobject/textobject/phrase)[1]"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:with-param>
   </xsl:call-template>
 </xsl:template>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9710
          http://docbook.svn.sourceforge.net/docbook/?rev=9710&view=rev
Author:   bobstayton
Date:     2013-01-22 19:34:18 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Add round() function when pixel counts are used for image width and height.

Modified Paths:
--------------
    trunk/xsl/html/graphics.xsl

Modified: trunk/xsl/html/graphics.xsl
===================================================================
--- trunk/xsl/html/graphics.xsl	2013-01-22 18:56:09 UTC (rev 9709)
+++ trunk/xsl/html/graphics.xsl	2013-01-22 19:34:18 UTC (rev 9710)
@@ -395,7 +395,7 @@
           <xsl:with-param name="em.size" select="$points.per.em"/>
         </xsl:call-template>
       </xsl:variable>
-      <xsl:value-of select="$cwidth.in.points div 72.0 * $pixels.per.inch * $scale"/>
+      <xsl:value-of select="round($cwidth.in.points div 72.0 * $pixels.per.inch * $scale)"/>
     </xsl:if>
   </xsl:variable>
 
@@ -462,7 +462,7 @@
           <xsl:with-param name="em.size" select="$points.per.em"/>
         </xsl:call-template>
       </xsl:variable>
-      <xsl:value-of select="$cdepth.in.points div 72.0 * $pixels.per.inch * $scale"/>
+      <xsl:value-of select="round($cdepth.in.points div 72.0 * $pixels.per.inch * $scale)"/>
     </xsl:if>
   </xsl:variable>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.