From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 7 Apr 2005 21:24:52 +0000 (+0000)
Subject: Make sure all keep-together and keep-with-* have either .within-column
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff2ab4a0dd6e7eadf8f9e931eefafb6b02d06da2;p=docbook-dsssl

Make sure all keep-together and keep-with-* have either .within-column
or .within-line so no unintentional keeps.
---

diff --git a/xsl/fo/admon.xsl b/xsl/fo/admon.xsl
index 8769865de..bcfae98ed 100644
--- a/xsl/fo/admon.xsl
+++ b/xsl/fo/admon.xsl
@@ -105,7 +105,7 @@
   <fo:block id="{$id}"
             xsl:use-attribute-sets="nongraphical.admonition.properties">
     <xsl:if test="$admon.textlabel != 0 or title">
-      <fo:block keep-with-next='always'
+      <fo:block keep-with-next.within-column='always'
                 xsl:use-attribute-sets="admonition.title.properties">
          <xsl:apply-templates select="." mode="object.title.markup"/>
       </fo:block>
diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 5c879ffc8..37aa88505 100644
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -546,7 +546,7 @@
     <xsl:if test=".//footnote">
       <fo:block font-family="{$body.fontset}"
                 font-size="{$footnote.font.size}"
-                keep-with-previous="always">
+                keep-with-previous.within-column="always">
         <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
       </fo:block>
     </xsl:if>
@@ -690,7 +690,7 @@
     <xsl:if test=".//footnote">
       <fo:block font-family="{$body.fontset}"
                 font-size="{$footnote.font.size}"
-                keep-with-previous="always">
+                keep-with-previous.within-column="always">
         <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
       </fo:block>
     </xsl:if>
diff --git a/xsl/fo/htmltbl.xsl b/xsl/fo/htmltbl.xsl
index b839a5d44..bc438af62 100644
--- a/xsl/fo/htmltbl.xsl
+++ b/xsl/fo/htmltbl.xsl
@@ -40,7 +40,7 @@
     <xsl:if test=".//footnote">
       <fo:block font-family="{$body.fontset}"
                 font-size="{$footnote.font.size}"
-                keep-with-previous="always">
+                keep-with-previous.within-column="always">
         <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
       </fo:block>
     </xsl:if>
diff --git a/xsl/fo/titlepage.templates.xml b/xsl/fo/titlepage.templates.xml
index 0d26a89f8..b7ca4d003 100644
--- a/xsl/fo/titlepage.templates.xml
+++ b/xsl/fo/titlepage.templates.xml
@@ -37,7 +37,7 @@
 
     <title t:named-template="component.title"
 	   param:node="ancestor-or-self::article[1]"
-	   keep-with-next="always"
+	   keep-with-next.within-column="always"
 	   font-size="&hsize5;"
 	   font-weight="bold"/>
 
@@ -139,12 +139,12 @@
 		space-before="&hsize4space;"
 		font-family="{$title.fontset}"/>
       <corpauthor font-size="&hsize3;"
-		  keep-with-next="always"
+		  keep-with-next.within-column="always"
 		  space-before="2in"/>
       <authorgroup space-before="2in"/>
       <author font-size="&hsize3;"
 	      space-before="&hsize2space;"
-	      keep-with-next="always"/>
+	      keep-with-next.within-column="always"/>
     </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
diff --git a/xsl/fo/titlepage.xsl b/xsl/fo/titlepage.xsl
index 37c2ddb44..b7a4f1a3b 100644
--- a/xsl/fo/titlepage.xsl
+++ b/xsl/fo/titlepage.xsl
@@ -83,12 +83,12 @@
 <xsl:attribute-set name="colophon.titlepage.verso.style"/>
 
 <xsl:attribute-set name="section.titlepage.recto.style">
-  <xsl:attribute name="keep-together">always</xsl:attribute>
+  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
 </xsl:attribute-set>
 
 <xsl:attribute-set name="section.titlepage.verso.style">
-  <xsl:attribute name="keep-together">always</xsl:attribute>
-  <xsl:attribute name="keep-with-next">always</xsl:attribute>
+  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
 </xsl:attribute-set>
 
 <xsl:attribute-set name="sect1.titlepage.recto.style"