From 1f9f25987453333a16c731faef0b1d0e53f22fae Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 5 Oct 2011 20:12:49 +0000
Subject: [PATCH] Add new attribute-sets calloutlist.properties and
 callout.properties to  better support customization of calloutlists, fixing
 bug 3160341.

---
 xsl/fo/lists.xsl  | 10 +++-------
 xsl/fo/param.ent  |  2 ++
 xsl/fo/param.xweb |  4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/xsl/fo/lists.xsl b/xsl/fo/lists.xsl
index 6b30df8f5..8f7b47137 100644
--- 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 3ac2da343..7b316ce08 100644
--- 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 d2b8ebb77..7564a586c 100644
--- 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"/>
-- 
2.50.1