Add new attribute-sets calloutlist.properties and callout.properties

to  better support customization of calloutlists, fixing bug 3160341.

diff --git a/xsl/fo/lists.xsl b/xsl/fo/lists.xsl
index 6b30df8f52d81b1ad945a32cfd6857bcc3e3e9be..8f7b47137fd868d7897e64eab61d159dd0c0dbc8 100644 (file)
--- a/xsl/fo/lists.xsl
+++ b/xsl/fo/lists.xsl
@@ -1273,14 +1273,10 @@
                    |comment()[not(preceding-sibling::callout)]
                    |processing-instruction()[not(preceding-sibling::callout)]"/>
 
-    <fo:list-block space-before.optimum="1em"
-                   space-before.minimum="0.8em"
-                   space-before.maximum="1.2em"
-                   provisional-distance-between-starts="2.2em"
-                   provisional-label-separation="0.2em">
+    <fo:list-block xsl:use-attribute-sets="calloutlist.properties">
 
       <xsl:if test="$pi-label-width != ''">
-              <xsl:attribute name="provisional-distance-between-starts">
+        <xsl:attribute name="provisional-distance-between-starts">
           <xsl:value-of select="$pi-label-width"/>
         </xsl:attribute>
       </xsl:if>
@@ -1302,7 +1298,7 @@
     <xsl:call-template name="pi.dbfo_keep-together"/>
   </xsl:variable>
 
-  <fo:list-item id="{$id}">
+  <fo:list-item id="{$id}" xsl:use-attribute-sets="callout.properties">
     <xsl:if test="$keep.together != ''">
       <xsl:attribute name="keep-together.within-column"><xsl:value-of
                       select="$keep.together"/></xsl:attribute>

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 3ac2da34364093c35e1956026b6985b9269e2bc2..7b316ce08a04ba191d77fd17db1dbf094d8c58e8 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -341,3 +341,5 @@
 <!ENTITY glossdef.block.properties SYSTEM "../params/glossdef.block.properties.xml">
 <!ENTITY glossentry.list.item.properties SYSTEM "../params/glossentry.list.item.properties.xml">
 <!ENTITY bookmarks.collapse SYSTEM "../params/bookmarks.collapse.xml">
+<!ENTITY callout.properties SYSTEM "../params/callout.properties.xml">
+<!ENTITY calloutlist.properties SYSTEM "../params/calloutlist.properties.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index d2b8ebb772869e7a292a817d51943d1ab8f10a26..7564a586c9e89b2d7c574fc02443e432b0eee75e 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -47,6 +47,8 @@ $Id$
 &nongraphical.admonition.properties;
 </reference>
 <reference xml:id="callouts"><title>Callouts</title>
+&calloutlist.properties;
+&callout.properties;
 &callout.defaultcolumn;
 &callout.graphics;
 &callout.graphics.extension;
@@ -573,6 +575,8 @@ around all these parameters.</para>
 <src:fragref linkend="body.end.indent.frag"/>
 <src:fragref linkend="bookmarks.collapse.frag"/>
 <src:fragref linkend="bridgehead.in.toc.frag"/>
+<src:fragref linkend="calloutlist.properties.frag"/>
+<src:fragref linkend="callout.properties.frag"/>
 <src:fragref linkend="callout.defaultcolumn.frag"/>
 <src:fragref linkend="callout.graphics.extension.frag"/>
 <src:fragref linkend="callout.graphics.frag"/>