Fix bug in dbfo-need for admonitions, and get dbfo-need

working properly in FOP1.1.

diff --git a/xsl/fo/pi.xsl b/xsl/fo/pi.xsl
index 28c0de3e0b45b72d6e4baffe260a81b9a716cd82..cf00666e3f01173df94c748bf3e48d5051eada31 100644 (file)
--- a/xsl/fo/pi.xsl
+++ b/xsl/fo/pi.xsl
@@ -993,12 +993,16 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$fop1.extensions != 0">
-      <!-- Doesn't work in fop -->
-    </xsl:when>
     <xsl:when test="$fop.extensions != 0">
       <!-- Doesn't work in fop -->
     </xsl:when>
+    <xsl:when test="$fop1.extensions != 0">
+      <!-- fop1 does not need space adjustment because
+           space-after.precedence="force" does not work -->
+      <fo:block space-after="0pt" space-before="0em">
+        <xsl:copy-of select="$spacer"/>
+      </fo:block>
+    </xsl:when>
     <xsl:when test="$pi-before != '' and
       not(following-sibling::listitem) and
       not(following-sibling::step)">
@@ -1012,6 +1016,26 @@
         <xsl:copy-of select="$spacer"/>
       </fo:block>
     </xsl:when>
+    <xsl:when test="following-sibling::note or
+      following-sibling::warning or
+      following-sibling::caution or
+      following-sibling::important or
+      following-sibling::tip">
+      <xsl:choose>
+        <xsl:when test="$admon.graphics = 0">
+          <fo:block space-after="0pt" 
+            xsl:use-attribute-sets="nongraphical.admonition.properties">
+            <xsl:copy-of select="$spacer"/>
+          </fo:block>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block space-after="0pt" 
+            xsl:use-attribute-sets="graphical.admonition.properties">
+            <xsl:copy-of select="$spacer"/>
+          </fo:block>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
     <xsl:when test="following-sibling::table or
       following-sibling::figure or
       following-sibling::example or
@@ -1070,9 +1094,6 @@
   </xsl:choose>
 
   <xsl:choose>
-    <xsl:when test="$fop1.extensions != 0">
-      <!-- Doesn't work in fop -->
-    </xsl:when>
     <xsl:when test="$fop.extensions != 0">
       <!-- Doesn't work in fop -->
     </xsl:when>