Support column gap adjustments

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 50b7290f3a20bf34d8c22df3f00641c7f4071936..b5f2f27de7a7654ca93fbc602edbade01716c0ea 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -50,6 +50,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.titlepage}"
                       column-count="{$column.count.titlepage}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
@@ -69,6 +70,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.titlepage}"
                       column-count="{$column.count.titlepage}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
@@ -88,6 +90,7 @@
                            margin-left="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.titlepage}"
                       column-count="{$column.count.titlepage}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
@@ -108,6 +111,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.lot}"
                       column-count="{$column.count.lot}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
@@ -127,6 +131,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.lot}"
                       column-count="{$column.count.lot}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
@@ -146,6 +151,7 @@
                            margin-left="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.lot}"
                       column-count="{$column.count.lot}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
@@ -166,6 +172,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.front}"
                       column-count="{$column.count.front}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
@@ -185,6 +192,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.front}"
                       column-count="{$column.count.front}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
@@ -204,6 +212,7 @@
                            margin-left="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.front}"
                       column-count="{$column.count.front}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
@@ -224,6 +233,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.body}"
                       column-count="{$column.count.body}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
@@ -243,6 +253,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.body}"
                       column-count="{$column.count.body}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
@@ -262,6 +273,7 @@
                            margin-left="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.body}"
                       column-count="{$column.count.body}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
@@ -282,6 +294,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.back}"
                       column-count="{$column.count.back}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
@@ -301,6 +314,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.back}"
                       column-count="{$column.count.back}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
@@ -320,6 +334,7 @@
                            margin-left="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.back}"
                       column-count="{$column.count.back}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
@@ -340,6 +355,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.index}"
                       column-count="{$column.count.index}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
@@ -359,6 +375,7 @@
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.index}"
                       column-count="{$column.count.index}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
@@ -378,6 +395,7 @@
                            margin-left="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
+                      column-gap="{$column.gap.index}"
                       column-count="{$column.count.index}">
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
@@ -430,6 +448,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.titlepage}"
                         column-count="{$column.count.titlepage}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -461,6 +480,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.titlepage}"
                         column-count="{$column.count.titlepage}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -492,6 +512,7 @@
                              margin-left="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.titlepage}"
                         column-count="{$column.count.titlepage}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -524,6 +545,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.lot}"
                         column-count="{$column.count.lot}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -555,6 +577,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.lot}"
                         column-count="{$column.count.lot}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -586,6 +609,7 @@
                              margin-left="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.lot}"
                         column-count="{$column.count.lot}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -618,6 +642,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.front}"
                         column-count="{$column.count.front}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -649,6 +674,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.front}"
                         column-count="{$column.count.front}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -680,6 +706,7 @@
                              margin-left="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.front}"
                         column-count="{$column.count.front}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -712,6 +739,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.body}"
                         column-count="{$column.count.body}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -743,6 +771,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.body}"
                         column-count="{$column.count.body}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -774,6 +803,7 @@
                              margin-left="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.body}"
                         column-count="{$column.count.body}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -806,6 +836,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.back}"
                         column-count="{$column.count.back}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -837,6 +868,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.back}"
                         column-count="{$column.count.back}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -868,6 +900,7 @@
                              margin-left="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.back}"
                         column-count="{$column.count.back}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -900,6 +933,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.index}"
                         column-count="{$column.count.index}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -931,6 +965,7 @@
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.index}"
                         column-count="{$column.count.index}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">
@@ -962,6 +997,7 @@
                              margin-left="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
+                        column-gap="{$column.gap.index}"
                         column-count="{$column.count.index}">
           <xsl:if test="$draft.watermark.image != ''
                         and $fop.extensions = 0">

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 2b5860297639bc29f57640528a65ff30f3dddfdc..ed3f479689962350e7ba15f74e4db8e53c48d7e3 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -201,3 +201,9 @@
 <!ENTITY ebnf.assignment SYSTEM "../params/ebnf.assignment.xml">
 <!ENTITY ebnf.statement.terminator SYSTEM "../params/ebnf.statement.terminator.xml">
 <!ENTITY root.properties SYSTEM "../params/root.properties.xml">
+<!ENTITY column.gap.back SYSTEM "../params/column.gap.back.xml">
+<!ENTITY column.gap.body SYSTEM "../params/column.gap.body.xml">
+<!ENTITY column.gap.front SYSTEM "../params/column.gap.front.xml">
+<!ENTITY column.gap.index SYSTEM "../params/column.gap.index.xml">
+<!ENTITY column.gap.lot SYSTEM "../params/column.gap.lot.xml">
+<!ENTITY column.gap.titlepage SYSTEM "../params/column.gap.titlepage.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index ac99f2a9c756e4dcd2f75bca29038ca54bf6b48c..a036831cb23c8e0b74e66b7799cfaf03d67b6533 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -324,6 +324,12 @@ zero by default, so this is simply the page-master region-left.
 &column.count.index;
 &column.count.lot;
 &column.count.titlepage;
+&column.gap.back;
+&column.gap.body;
+&column.gap.front;
+&column.gap.index;
+&column.gap.lot;
+&column.gap.titlepage;
 &region.after.extent;
 &region.before.extent;
 &default.units;
@@ -484,6 +490,12 @@ around all these parameters.</para>
 <src:fragref linkend="column.count.index.frag"/>
 <src:fragref linkend="column.count.lot.frag"/>
 <src:fragref linkend="column.count.titlepage.frag"/>
+<src:fragref linkend="column.gap.back.frag"/>
+<src:fragref linkend="column.gap.body.frag"/>
+<src:fragref linkend="column.gap.front.frag"/>
+<src:fragref linkend="column.gap.index.frag"/>
+<src:fragref linkend="column.gap.lot.frag"/>
+<src:fragref linkend="column.gap.titlepage.frag"/>
 <src:fragref linkend="compact.list.item.spacing.frag"/>
 <src:fragref linkend="current.docid.frag"/>
 <src:fragref linkend="default.float.class.frag"/>

diff --git a/xsl/params/column.gap.back.xml b/xsl/params/column.gap.back.xml
new file mode 100644 (file)
index 0000000..0515481
--- /dev/null
+++ b/xsl/params/column.gap.back.xml
@@ -0,0 +1,23 @@
+<refentry id="column.gap.back">
+<refmeta>
+<refentrytitle>column.gap.back</refentrytitle>
+<refmiscinfo role="type">length</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>column.gap.back</refname>
+<refpurpose>Gap between columns in back matter</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='column.gap.back.frag'>
+<xsl:param name="column.gap.back" select="'12pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies the gap between columns in back matter (if
+<parameter>column.count.back</parameter> is greater than one).</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/column.gap.body.xml b/xsl/params/column.gap.body.xml
new file mode 100644 (file)
index 0000000..4a7bd10
--- /dev/null
+++ b/xsl/params/column.gap.body.xml
@@ -0,0 +1,23 @@
+<refentry id="column.gap.body">
+<refmeta>
+<refentrytitle>column.gap.body</refentrytitle>
+<refmiscinfo role="type">length</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>column.gap.body</refname>
+<refpurpose>Gap between columns in the body</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='column.gap.body.frag'>
+<xsl:param name="column.gap.body" select="'12pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies the gap between columns in body matter (if
+<parameter>column.count.body</parameter> is greater than one).</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/column.gap.front.xml b/xsl/params/column.gap.front.xml
new file mode 100644 (file)
index 0000000..9a7f19d
--- /dev/null
+++ b/xsl/params/column.gap.front.xml
@@ -0,0 +1,23 @@
+<refentry id="column.gap.front">
+<refmeta>
+<refentrytitle>column.gap.front</refentrytitle>
+<refmiscinfo role="type">length</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>column.gap.front</refname>
+<refpurpose>Gap between columns in the front matter</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='column.gap.front.frag'>
+<xsl:param name="column.gap.front" select="'12pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies the gap between columns in front matter (if
+<parameter>column.count.front</parameter> is greater than one).</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/column.gap.index.xml b/xsl/params/column.gap.index.xml
new file mode 100644 (file)
index 0000000..f21221e
--- /dev/null
+++ b/xsl/params/column.gap.index.xml
@@ -0,0 +1,23 @@
+<refentry id="column.gap.index">
+<refmeta>
+<refentrytitle>column.gap.index</refentrytitle>
+<refmiscinfo role="type">length</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>column.gap.index</refname>
+<refpurpose>Gap between columns in the index</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='column.gap.index.frag'>
+<xsl:param name="column.gap.index" select="'12pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies the gap between columns in indexes (if
+<parameter>column.count.index</parameter> is greater than one).</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/column.gap.lot.xml b/xsl/params/column.gap.lot.xml
new file mode 100644 (file)
index 0000000..a620e75
--- /dev/null
+++ b/xsl/params/column.gap.lot.xml
@@ -0,0 +1,23 @@
+<refentry id="column.gap.lot">
+<refmeta>
+<refentrytitle>column.gap.lot</refentrytitle>
+<refmiscinfo role="type">length</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>column.gap.lot</refname>
+<refpurpose>Gap between columns on a 'List-of-Titles' page</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='column.gap.lot.frag'>
+<xsl:param name="column.gap.lot" select="'12pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies the gap between columns on 'List-of-Titles' pages (if
+<parameter>column.count.lot</parameter> is greater than one).</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/column.gap.titlepage.xml b/xsl/params/column.gap.titlepage.xml
new file mode 100644 (file)
index 0000000..f379020
--- /dev/null
+++ b/xsl/params/column.gap.titlepage.xml
@@ -0,0 +1,24 @@
+<refentry id="column.gap.titlepage">
+<refmeta>
+<refentrytitle>column.gap.titlepage</refentrytitle>
+<refmiscinfo role="type">length</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>column.gap.titlepage</refname>
+<refpurpose>Gap between columns on title pages</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='column.gap.titlepage.frag'>
+<xsl:param name="column.gap.titlepage" select="'12pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies the gap between columns on title pages (if
+<parameter>column.count.titlepage</parameter> is greater than one).</para>
+
+
+</refsect1>
+</refentry>