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 8769865de09432d9d23ed215f773031ac1f382b5..bcfae98ed5d06deed6f8a68091e24de47d413437 100644 (file)
--- 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 5c879ffc80a71cd6e606a461e6caec36fb032249..37aa885056bc6a2cb15060ca49ae5edfa31a04bf 100644 (file)
--- 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 b839a5d44c322fd9a16625363d074e123c7dd524..bc438af626f0d6fbd5e6aa0dc5b5faeaba046009 100644 (file)
--- 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 0d26a89f81eabeee5f38701f3837506343121316..b7ca4d003cb3ad7d2d977ee90cca3ea501faac8c 100644 (file)
--- 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 37c2ddb4438a235f1ada261c5cd4cdcdbc808171..b7a4f1a3bdd415e684a72e1c9af7a8a8608eb5cc 100644 (file)
--- 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"