From: Norman Walsh <ndw@nwalsh.com>
Date: Fri, 6 Sep 2002 12:58:44 +0000 (+0000)
Subject: Output table summary and img alt for graphical admonitions
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4265b6205e1e39bcdc1e75380e690440b6ea6c5f;p=docbook-dsssl

Output table summary and img alt for graphical admonitions
---

diff --git a/xsl/html/admon.xsl b/xsl/html/admon.xsl
index c3f8e6010..7e0d12e24 100644
--- a/xsl/html/admon.xsl
+++ b/xsl/html/admon.xsl
@@ -32,46 +32,65 @@
   <xsl:param name="node" select="."/>
   <xsl:value-of select="$admon.graphics.path"/>
   <xsl:choose>
-    <xsl:when test="name($node)='note'">note</xsl:when>
-    <xsl:when test="name($node)='warning'">warning</xsl:when>
-    <xsl:when test="name($node)='caution'">caution</xsl:when>
-    <xsl:when test="name($node)='tip'">tip</xsl:when>
-    <xsl:when test="name($node)='important'">important</xsl:when>
+    <xsl:when test="local-name($node)='note'">note</xsl:when>
+    <xsl:when test="local-name($node)='warning'">warning</xsl:when>
+    <xsl:when test="local-name($node)='caution'">caution</xsl:when>
+    <xsl:when test="local-name($node)='tip'">tip</xsl:when>
+    <xsl:when test="local-name($node)='important'">important</xsl:when>
     <xsl:otherwise>note</xsl:otherwise>
   </xsl:choose>
   <xsl:value-of select="$admon.graphics.extension"/>
 </xsl:template>
 
 <xsl:template name="graphical.admonition">
+  <xsl:variable name="admon.type">
+    <xsl:choose>
+      <xsl:when test="local-name(.)='note'">Note</xsl:when>
+      <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
+      <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
+      <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
+      <xsl:when test="local-name(.)='important'">Important</xsl:when>
+      <xsl:otherwise>Note</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <div class="{name(.)}">
-  <xsl:if test="$admon.style != ''">
-    <xsl:attribute name="style">
-      <xsl:value-of select="$admon.style"/>
-    </xsl:attribute>
-  </xsl:if>
-  <table border="0">
-    <tr>
-      <td rowspan="2" align="center" valign="top">
-        <xsl:attribute name="width">
-          <xsl:call-template name="admon.graphic.width"/>
-        </xsl:attribute>
-        <img>
-          <xsl:attribute name="src">
-            <xsl:call-template name="admon.graphic"/>
+    <xsl:if test="$admon.style != ''">
+      <xsl:attribute name="style">
+        <xsl:value-of select="$admon.style"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <table border="0">
+      <xsl:attribute name="summary">
+        <xsl:value-of select="$admon.type"/>
+        <xsl:if test="title">
+          <xsl:text>: </xsl:text>
+          <xsl:value-of select="title"/>
+        </xsl:if>
+      </xsl:attribute>
+      <tr>
+        <td rowspan="2" align="center" valign="top">
+          <xsl:attribute name="width">
+            <xsl:call-template name="admon.graphic.width"/>
           </xsl:attribute>
-        </img>
-      </td>
-      <th>
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </th>
-    </tr>
-    <tr>
-      <td colspan="2" align="left" valign="top">
-        <xsl:apply-templates/>
-      </td>
-    </tr>
-  </table>
+          <img alt="[{$admon.type}]">
+            <xsl:attribute name="src">
+              <xsl:call-template name="admon.graphic"/>
+            </xsl:attribute>
+          </img>
+        </td>
+        <th>
+          <xsl:call-template name="anchor"/>
+          <xsl:apply-templates select="." mode="object.title.markup"/>
+        </th>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" valign="top">
+          <xsl:apply-templates/>
+        </td>
+      </tr>
+    </table>
   </div>
 </xsl:template>