From 20f35e8b3df5443c2fb2425148cd6dec8b66044a Mon Sep 17 00:00:00 2001
From: Tony Graham <tgraham@antenna.co.jp>
Date: Mon, 23 Dec 2019 10:15:24 +0000
Subject: [PATCH 1/4] Add attribute set for Unicode character callouts

---
 xsl/fo/callout.xsl | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/xsl/fo/callout.xsl b/xsl/fo/callout.xsl
index 2f6b70211..8df10d19d 100644
--- a/xsl/fo/callout.xsl
+++ b/xsl/fo/callout.xsl
@@ -280,16 +280,14 @@
         </xsl:choose>
       </xsl:variable>
 
-      <xsl:choose>
-        <xsl:when test="$callout.unicode.font != ''">
-          <fo:inline font-family="{$callout.unicode.font}">
-            <xsl:copy-of select="$comarkup"/>
-          </fo:inline>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$comarkup"/>
-        </xsl:otherwise>
-      </xsl:choose>
+      <fo:inline xsl:use-attribute-sets="callout.unicode.properties">
+        <xsl:if test="$callout.unicode.font != ''">
+          <xsl:attribute name="font-family">
+            <xsl:value-of select="$callout.unicode.font"/>
+          </xsl:attribute>
+        </xsl:if>
+        <xsl:copy-of select="$comarkup"/>
+      </fo:inline>
     </xsl:when>
 
     <!-- Most safe: draw a dark gray square with a white number inside -->

From 33ad81adb7617e4014338a55cdee0a7d5b26f873 Mon Sep 17 00:00:00 2001
From: Tony Graham <tgraham@antenna.co.jp>
Date: Mon, 23 Dec 2019 10:19:55 +0000
Subject: [PATCH 2/4] Add 'callout.unicode.properties'

---
 xsl/fo/param.ent | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index b402cb811..90a488c63 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -29,6 +29,7 @@
 <!ENTITY callout.unicode SYSTEM "../params/callout.unicode.xml">
 <!ENTITY callout.unicode.font SYSTEM "../params/callout.unicode.font.xml">
 <!ENTITY callout.unicode.number.limit SYSTEM "../params/callout.unicode.number.limit.xml">
+<!ENTITY callout.unicode.properties SYSTEM "../params/callout.unicode.properties.xml">
 <!ENTITY callout.unicode.start.character SYSTEM "../params/callout.unicode.start.character.xml">
 <!ENTITY callouts.extension SYSTEM "../params/callouts.extension.xml">
 <!ENTITY chapter.autolabel SYSTEM "../params/chapter.autolabel.xml">

From 8ac15ab0834a8f8174c9638e4e0e5706144d345f Mon Sep 17 00:00:00 2001
From: Tony Graham <tgraham@antenna.co.jp>
Date: Mon, 23 Dec 2019 10:24:27 +0000
Subject: [PATCH 3/4] Faked a refentry for 'callout.unicode.properties'

---
 xsl/params/callout.unicode.properties.xml | 24 +++++++++++++++++
 xsl/params/calloutlist.properties.xml     | 32 -----------------------
 2 files changed, 24 insertions(+), 32 deletions(-)
 create mode 100644 xsl/params/callout.unicode.properties.xml
 delete mode 100644 xsl/params/calloutlist.properties.xml

diff --git a/xsl/params/callout.unicode.properties.xml b/xsl/params/callout.unicode.properties.xml
new file mode 100644
index 000000000..d4cc795e1
--- /dev/null
+++ b/xsl/params/callout.unicode.properties.xml
@@ -0,0 +1,24 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+          xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          version="5.0" xml:id="callout.unicode.properties">
+<refmeta>
+<refentrytitle>callout.unicode.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>callout.unicode.properties</refname>
+<refpurpose>Properties that apply to callout labels formatted as Unicode characters.</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment xml:id="callout.unicode.properties.frag"><xsl:attribute-set name="callout.unicode.properties">
+</xsl:attribute-set></src:fragment>
+</refsynopsisdiv>
+<refsection><info><title>Description</title></info>
+<para>Properties that apply to callout labels formatted as Unicode characters.
+Typically used to set the color of the callout labels.</para>
+</refsection>
+</refentry>
diff --git a/xsl/params/calloutlist.properties.xml b/xsl/params/calloutlist.properties.xml
deleted file mode 100644
index 18976bd3a..000000000
--- a/xsl/params/calloutlist.properties.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
-          xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-          version="5.0" xml:id="calloutlist.properties">
-<refmeta>
-<refentrytitle>calloutlist.properties</refentrytitle>
-<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>calloutlist.properties</refname>
-<refpurpose>Properties that apply to each list-block generated by calloutlist.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<src:fragment xml:id="calloutlist.properties.frag"><xsl:attribute-set name="calloutlist.properties">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="provisional-distance-between-starts">2.2em</xsl:attribute>
-  <xsl:attribute name="provisional-label-separation">0.2em</xsl:attribute>
-</xsl:attribute-set></src:fragment>
-</refsynopsisdiv>
-<refsection><info><title>Description</title></info>
-<para>Properties that apply to the fo:list-block generated by calloutlist.
-Typically used to adjust spacing or margins of the entire list.
-Change the <literal>provisional-distance-between-starts</literal> attribute to
-change the indent of the list paragraphs relative to the
-callout numbers.</para>
-</refsection>
-</refentry>

From 2b1541a733c6833319c0a64d2a6424e723732b11 Mon Sep 17 00:00:00 2001
From: Tony Graham <tgraham@antenna.co.jp>
Date: Tue, 2 Jun 2020 21:32:51 +0100
Subject: [PATCH 4/4] Refentry and 'params.xweb' changes for
 'callout.unicode.properties'.

---
 xsl/fo/param.xweb                         |  2 ++
 xsl/params/callout.unicode.properties.xml | 24 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 xsl/params/callout.unicode.properties.xml

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 7af5ad0ab..f7af3fc23 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -61,6 +61,7 @@
 &callout.unicode;
 &callout.unicode.font;
 &callout.unicode.number.limit;
+&callout.unicode.properties;
 &callout.unicode.start.character;
 &callouts.extension;
 </reference>
@@ -621,6 +622,7 @@ around all these parameters.</para>
 <src:fragref linkend="callout.unicode.font.frag"/>
 <src:fragref linkend="callout.unicode.frag"/>
 <src:fragref linkend="callout.unicode.number.limit.frag"/>
+<src:fragref linkend="callout.unicode.properties.frag"/>
 <src:fragref linkend="callout.unicode.start.character.frag"/>
 <src:fragref linkend="callouts.extension.frag"/>
 <src:fragref linkend="chapter.autolabel.frag"/>
diff --git a/xsl/params/callout.unicode.properties.xml b/xsl/params/callout.unicode.properties.xml
new file mode 100644
index 000000000..d4cc795e1
--- /dev/null
+++ b/xsl/params/callout.unicode.properties.xml
@@ -0,0 +1,24 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+          xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          version="5.0" xml:id="callout.unicode.properties">
+<refmeta>
+<refentrytitle>callout.unicode.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>callout.unicode.properties</refname>
+<refpurpose>Properties that apply to callout labels formatted as Unicode characters.</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment xml:id="callout.unicode.properties.frag"><xsl:attribute-set name="callout.unicode.properties">
+</xsl:attribute-set></src:fragment>
+</refsynopsisdiv>
+<refsection><info><title>Description</title></info>
+<para>Properties that apply to callout labels formatted as Unicode characters.
+Typically used to set the color of the callout labels.</para>
+</refsection>
+</refentry>