Implemented the new graphical.admonition.properties and nongraphical.admonition.prope...

diff --git a/xsl/fo/admon.xsl b/xsl/fo/admon.xsl
index 48fa24d6d4d4535fffd60300c5d8a28070205c9e..8769865de09432d9d23ed215f773031ac1f382b5 100644 (file)
--- a/xsl/fo/admon.xsl
+++ b/xsl/fo/admon.xsl
@@ -67,15 +67,15 @@
      <xsl:apply-templates select="." mode="admon.graphic.width"/>
   </xsl:variable>
 
-  <fo:block id="{$id}">
+  <fo:block id="{$id}"
+            xsl:use-attribute-sets="graphical.admonition.properties">
     <fo:list-block provisional-distance-between-starts="{$graphic.width} + 18pt"
-               provisional-label-separation="18pt"
-               xsl:use-attribute-sets="list.block.spacing">
+                    provisional-label-separation="18pt">
       <fo:list-item>
           <fo:list-item-label end-indent="label-end()">
             <fo:block>
               <fo:external-graphic width="auto" height="auto"
-                                  content-width="{$graphic.width}" >
+                                         content-width="{$graphic.width}" >
                 <xsl:attribute name="src">
                   <xsl:call-template name="admon.graphic"/>
                 </xsl:attribute>
@@ -102,7 +102,8 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fo:block id="{$id}">
+  <fo:block id="{$id}"
+            xsl:use-attribute-sets="nongraphical.admonition.properties">
     <xsl:if test="$admon.textlabel != 0 or title">
       <fo:block keep-with-next='always'
                 xsl:use-attribute-sets="admonition.title.properties">