From f38aa003ed74d38a4acdfdb8f677cc5932f3f639 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Fri, 4 Oct 2002 14:43:37 +0000
Subject: [PATCH] Made separate parameters for table frame and table cell
 border properties

---
 xsl/fo/formal.xsl                             | 95 ++++++++++++++-----
 xsl/fo/param.ent                              |  9 +-
 xsl/fo/param.xweb                             | 18 ++--
 xsl/fo/table.xsl                              | 13 ++-
 xsl/html/param.ent                            |  9 +-
 xsl/html/param.xweb                           | 18 ++--
 xsl/html/table.xsl                            | 63 +++++++++---
 xsl/params/table.border.color.xml             | 23 -----
 xsl/params/table.border.style.xml             | 22 -----
 xsl/params/table.border.thickness.xml         | 22 -----
 xsl/params/table.cell.border.color.xml        | 23 +++++
 ...adding.xml => table.cell.border.style.xml} | 10 +-
 xsl/params/table.cell.border.thickness.xml    | 22 +++++
 xsl/params/table.frame.border.color.xml       | 23 +++++
 xsl/params/table.frame.border.style.xml       | 22 +++++
 xsl/params/table.frame.border.thickness.xml   | 22 +++++
 16 files changed, 280 insertions(+), 134 deletions(-)
 delete mode 100644 xsl/params/table.border.color.xml
 delete mode 100644 xsl/params/table.border.style.xml
 delete mode 100644 xsl/params/table.border.thickness.xml
 create mode 100644 xsl/params/table.cell.border.color.xml
 rename xsl/params/{table.border.padding.xml => table.cell.border.style.xml} (50%)
 create mode 100644 xsl/params/table.cell.border.thickness.xml
 create mode 100644 xsl/params/table.frame.border.color.xml
 create mode 100644 xsl/params/table.frame.border.style.xml
 create mode 100644 xsl/params/table.frame.border.thickness.xml

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 9af65fbd0..110bee471 100644
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -163,63 +163,113 @@
 
   <xsl:choose>
     <xsl:when test="$frame='all'">
-      <xsl:attribute name="border-left-style">solid</xsl:attribute>
-      <xsl:attribute name="border-right-style">solid</xsl:attribute>
-      <xsl:attribute name="border-top-style">solid</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
+      <xsl:attribute name="border-left-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-right-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-top-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-bottom-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
       <xsl:attribute name="border-left-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
       </xsl:attribute>
       <xsl:attribute name="border-right-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
       </xsl:attribute>
       <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
       </xsl:attribute>
       <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-left-color">
+        <xsl:value-of select="$table.frame.border.color"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-right-color">
+        <xsl:value-of select="$table.frame.border.color"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-top-color">
+        <xsl:value-of select="$table.frame.border.color"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-bottom-color">
+        <xsl:value-of select="$table.frame.border.color"/>
       </xsl:attribute>
     </xsl:when>
     <xsl:when test="$frame='bottom'">
       <xsl:attribute name="border-left-style">none</xsl:attribute>
       <xsl:attribute name="border-right-style">none</xsl:attribute>
       <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
+      <xsl:attribute name="border-bottom-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
       <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-bottom-color">
+        <xsl:value-of select="$table.frame.border.color"/>
       </xsl:attribute>
     </xsl:when>
     <xsl:when test="$frame='sides'">
-      <xsl:attribute name="border-left-style">solid</xsl:attribute>
-      <xsl:attribute name="border-right-style">solid</xsl:attribute>
+      <xsl:attribute name="border-left-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-right-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
       <xsl:attribute name="border-top-style">none</xsl:attribute>
       <xsl:attribute name="border-bottom-style">none</xsl:attribute>
       <xsl:attribute name="border-left-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
       </xsl:attribute>
       <xsl:attribute name="border-right-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-left-color">
+        <xsl:value-of select="$table.frame.border.color"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-right-color">
+        <xsl:value-of select="$table.frame.border.color"/>
       </xsl:attribute>
     </xsl:when>
     <xsl:when test="$frame='top'">
       <xsl:attribute name="border-left-style">none</xsl:attribute>
       <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">solid</xsl:attribute>
+      <xsl:attribute name="border-top-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
       <xsl:attribute name="border-bottom-style">none</xsl:attribute>
       <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-top-color">
+        <xsl:value-of select="$table.frame.border.color"/>
       </xsl:attribute>
     </xsl:when>
     <xsl:when test="$frame='topbot'">
       <xsl:attribute name="border-left-style">none</xsl:attribute>
       <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">solid</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
+      <xsl:attribute name="border-top-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-bottom-style">
+        <xsl:value-of select="$table.frame.border.style"/>
+      </xsl:attribute>
       <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
       </xsl:attribute>
       <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$table.frame.border.thickness"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-top-color">
+        <xsl:value-of select="$table.frame.border.color"/>
+      </xsl:attribute>
+      <xsl:attribute name="border-bottom-color">
+        <xsl:value-of select="$table.frame.border.color"/>
       </xsl:attribute>
     </xsl:when>
     <xsl:when test="$frame='none'">
@@ -267,8 +317,7 @@
 
   <xsl:variable name="table.content">
     <fo:block id="{$id}"
-              xsl:use-attribute-sets="formal.object.properties"
-              keep-together.within-column="1">
+              xsl:use-attribute-sets="formal.object.properties">
 
       <xsl:if test="$placement = 'before'">
         <xsl:call-template name="formal.object.heading">
@@ -296,7 +345,6 @@
     <xsl:if test="tgroup//footnote">
       <fo:block font-family="{$body.font.family}"
                 font-size="{$footnote.font.size}"
-                keep-together.within-column="1"
                 keep-with-previous="always">
         <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>
       </fo:block>
@@ -392,7 +440,6 @@
     <xsl:if test="tgroup//footnote">
       <fo:block font-family="{$body.font.family}"
                 font-size="{$footnote.font.size}"
-                keep-together.within-column="1"
                 keep-with-previous="always">
         <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>
       </fo:block>
diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index eac2e602c..efbfc984d 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -132,9 +132,6 @@
 <!ENTITY shade.verbatim SYSTEM "../params/shade.verbatim.xml">
 <!ENTITY shade.verbatim.style SYSTEM "../params/shade.verbatim.style.xml">
 <!ENTITY show.comments SYSTEM "../params/show.comments.xml">
-<!ENTITY table.border.color SYSTEM "../params/table.border.color.xml">
-<!ENTITY table.border.style SYSTEM "../params/table.border.style.xml">
-<!ENTITY table.border.thickness SYSTEM "../params/table.border.thickness.xml">
 <!ENTITY table.cell.padding SYSTEM "../params/table.cell.padding.xml">
 <!ENTITY tablecolumns.extension SYSTEM "../params/tablecolumns.extension.xml">
 <!ENTITY target.database.document SYSTEM "../params/target.database.document.xml">
@@ -176,3 +173,9 @@
 <!ENTITY default.float.class SYSTEM "../params/default.float.class.xml">
 <!ENTITY bridgehead.in.toc SYSTEM "../params/bridgehead.in.toc.xml">
 <!ENTITY generate.section.toc.level SYSTEM "../params/generate.section.toc.level.xml">
+<!ENTITY table.cell.border.color SYSTEM "../params/table.cell.border.color.xml">
+<!ENTITY table.cell.border.style SYSTEM "../params/table.cell.border.style.xml">
+<!ENTITY table.cell.border.thickness SYSTEM "../params/table.cell.border.thickness.xml">
+<!ENTITY table.frame.border.color SYSTEM "../params/table.frame.border.color.xml">
+<!ENTITY table.frame.border.style SYSTEM "../params/table.frame.border.style.xml">
+<!ENTITY table.frame.border.thickness SYSTEM "../params/table.frame.border.thickness.xml">
\ No newline at end of file
diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 2ade73774..a59f266e9 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -155,10 +155,13 @@ generate.section.toc.level;
 <reference><title>Tables</title>
 &default.table.width;
 &nominal.table.width;
-&table.border.thickness;
 &table.cell.padding;
-&table.border.style;
-&table.border.color;
+&table.frame.border.thickness;
+&table.frame.border.style;
+&table.frame.border.color;
+&table.cell.border.thickness;
+&table.cell.border.style;
+&table.cell.border.color;
 </reference>
 
 <reference><title>Linking</title>
@@ -570,9 +573,12 @@ around all these parameters.</para>
 <src:fragref linkend="shade.verbatim.style.frag"/>
 <src:fragref linkend="show.comments.frag"/>
 <src:fragref linkend="sidebar.properties.frag"/>
-<src:fragref linkend="table.border.color.frag"/>
-<src:fragref linkend="table.border.style.frag"/>
-<src:fragref linkend="table.border.thickness.frag"/>
+<src:fragref linkend="table.cell.border.color.frag"/>
+<src:fragref linkend="table.cell.border.style.frag"/>
+<src:fragref linkend="table.cell.border.thickness.frag"/>
+<src:fragref linkend="table.frame.border.color.frag"/>
+<src:fragref linkend="table.frame.border.style.frag"/>
+<src:fragref linkend="table.frame.border.thickness.frag"/>
 <src:fragref linkend="table.cell.padding.frag"/>
 <src:fragref linkend="tablecolumns.extension.frag"/>
 <src:fragref linkend="target.database.document.frag"/>
diff --git a/xsl/fo/table.xsl b/xsl/fo/table.xsl
index e23d7e122..7bdca54a6 100644
--- a/xsl/fo/table.xsl
+++ b/xsl/fo/table.xsl
@@ -92,13 +92,14 @@ to be incomplete. Don't forget to read the source, too :-)</para>
       </xsl:call-template>
     </xsl:if>
 
-    <xsl:if test="$colsep &gt; 0">
+    <xsl:if test="$colsep &gt; 0 and $colnum &lt; ancestor::tgroup/@cols">
       <xsl:call-template name="border">
         <xsl:with-param name="side" select="'right'"/>
       </xsl:call-template>
     </xsl:if>
 
     <!-- fo:table-cell should not be empty -->
+    <fo:block>colnum: <xsl:value-of select="$colnum"/></fo:block>
     <fo:block/>
   </fo:table-cell>
 </xsl:template>
@@ -109,13 +110,13 @@ to be incomplete. Don't forget to read the source, too :-)</para>
   <xsl:param name="side" select="'left'"/>
 
   <xsl:attribute name="border-{$side}-width">
-    <xsl:value-of select="$table.border.thickness"/>
+    <xsl:value-of select="$table.cell.border.thickness"/>
   </xsl:attribute>
   <xsl:attribute name="border-{$side}-style">
-    <xsl:value-of select="$table.border.style"/>
+    <xsl:value-of select="$table.cell.border.style"/>
   </xsl:attribute>
   <xsl:attribute name="border-{$side}-color">
-    <xsl:value-of select="$table.border.color"/>
+    <xsl:value-of select="$table.cell.border.color"/>
   </xsl:attribute>
 </xsl:template>
 
@@ -485,7 +486,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
           </xsl:call-template>
         </xsl:if>
 
-        <xsl:if test="$colsep &gt; 0">
+        <xsl:if test="$colsep &gt; 0 and $col &lt; ancestor::tgroup/@cols">
           <xsl:call-template name="border">
             <xsl:with-param name="side" select="'right'"/>
           </xsl:call-template>
@@ -541,6 +542,8 @@ to be incomplete. Don't forget to read the source, too :-)</para>
         </xsl:if>
 -->
 
+        <fo:block>colnum: <xsl:value-of select="$col"/></fo:block>
+
         <xsl:choose>
           <xsl:when test="$xep.extensions != 0 and $orientation != ''">
             <fo:block-container reference-orientation="{$orientation}">
diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 927135777..23bcfc969 100644
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -183,9 +183,6 @@
 <!ENTITY suppress.footer.navigation SYSTEM "../params/suppress.footer.navigation.xml">
 <!ENTITY suppress.header.navigation SYSTEM "../params/suppress.header.navigation.xml">
 <!ENTITY suppress.navigation SYSTEM "../params/suppress.navigation.xml">
-<!ENTITY table.border.color SYSTEM "../params/table.border.color.xml">
-<!ENTITY table.border.style SYSTEM "../params/table.border.style.xml">
-<!ENTITY table.border.thickness SYSTEM "../params/table.border.thickness.xml">
 <!ENTITY table.borders.with.css SYSTEM "../params/table.borders.with.css.xml">
 <!ENTITY tablecolumns.extension SYSTEM "../params/tablecolumns.extension.xml">
 <!ENTITY targets.filename SYSTEM "../params/targets.filename.xml">
@@ -218,3 +215,9 @@
 <!ENTITY default.image.width SYSTEM "../params/default.image.width.xml">
 <!ENTITY default.float.class SYSTEM "../params/default.float.class.xml">
 <!ENTITY funcsynopsis.tabular.threshold SYSTEM "../params/funcsynopsis.tabular.threshold.xml">
+<!ENTITY table.cell.border.color SYSTEM "../params/table.cell.border.color.xml">
+<!ENTITY table.cell.border.style SYSTEM "../params/table.cell.border.style.xml">
+<!ENTITY table.cell.border.thickness SYSTEM "../params/table.cell.border.thickness.xml">
+<!ENTITY table.frame.border.color SYSTEM "../params/table.frame.border.color.xml">
+<!ENTITY table.frame.border.style SYSTEM "../params/table.frame.border.style.xml">
+<!ENTITY table.frame.border.thickness SYSTEM "../params/table.frame.border.thickness.xml">
diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index a85a9d2ae..eb346129d 100644
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -178,9 +178,12 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &default.table.width;
 &nominal.table.width;
 &table.borders.with.css;
-&table.border.style;
-&table.border.thickness;
-&table.border.color;
+&table.cell.border.style;
+&table.cell.border.thickness;
+&table.cell.border.color;
+&table.frame.border.style;
+&table.frame.border.thickness;
+&table.frame.border.color;
 &html.cellspacing;
 &html.cellpadding;
 </reference>
@@ -566,9 +569,12 @@ around all these parameters.</para>
 <src:fragref linkend="suppress.footer.navigation.frag"/>
 <src:fragref linkend="suppress.header.navigation.frag"/>
 <src:fragref linkend="suppress.navigation.frag"/>
-<src:fragref linkend="table.border.color.frag"/>
-<src:fragref linkend="table.border.style.frag"/>
-<src:fragref linkend="table.border.thickness.frag"/>
+<src:fragref linkend="table.cell.border.color.frag"/>
+<src:fragref linkend="table.cell.border.style.frag"/>
+<src:fragref linkend="table.cell.border.thickness.frag"/>
+<src:fragref linkend="table.frame.border.color.frag"/>
+<src:fragref linkend="table.frame.border.style.frag"/>
+<src:fragref linkend="table.frame.border.thickness.frag"/>
 <src:fragref linkend="table.borders.with.css.frag"/>
 <src:fragref linkend="tablecolumns.extension.frag"/>
 <src:fragref linkend="target.database.document.frag"/>
diff --git a/xsl/html/table.xsl b/xsl/html/table.xsl
index 082c8a3cb..89eb2b99a 100644
--- a/xsl/html/table.xsl
+++ b/xsl/html/table.xsl
@@ -68,51 +68,54 @@
 <xsl:template name="border">
   <xsl:param name="side" select="'left'"/>
   <xsl:param name="padding" select="0"/>
+  <xsl:param name="style" select="$table.cell.border.style"/>
+  <xsl:param name="color" select="$table.cell.border.color"/>
+  <xsl:param name="thickness" select="$table.cell.border.thickness"/>
 
   <!-- Note: Some browsers (mozilla) require at least a width and style. -->
 
   <xsl:choose>
-    <xsl:when test="($table.border.thickness != ''
-                     and $table.border.style != ''
-                     and $table.border.color != '')
-                    or ($table.border.thickness != ''
-                        and $table.border.style != '')
-                    or ($table.border.thickness != '')">
+    <xsl:when test="($thickness != ''
+                     and $style != ''
+                     and $color != '')
+                    or ($thickness != ''
+                        and $style != '')
+                    or ($thickness != '')">
       <!-- use the compound property if we can: -->
       <!-- it saves space and probably works more reliably -->
       <xsl:text>border-</xsl:text>
       <xsl:value-of select="$side"/>
       <xsl:text>: </xsl:text>
-      <xsl:value-of select="$table.border.thickness"/>
+      <xsl:value-of select="$thickness"/>
       <xsl:text> </xsl:text>
-      <xsl:value-of select="$table.border.style"/>
+      <xsl:value-of select="$style"/>
       <xsl:text> </xsl:text>
-      <xsl:value-of select="$table.border.color"/>
+      <xsl:value-of select="$color"/>
       <xsl:text>; </xsl:text>
     </xsl:when>
     <xsl:otherwise>
       <!-- we need to specify the styles individually -->
-      <xsl:if test="$table.border.thickness != ''">
+      <xsl:if test="$thickness != ''">
         <xsl:text>border-</xsl:text>
         <xsl:value-of select="$side"/>
         <xsl:text>-width: </xsl:text>
-        <xsl:value-of select="$table.border.thickness"/>
+        <xsl:value-of select="$thickness"/>
         <xsl:text>; </xsl:text>
       </xsl:if>
 
-      <xsl:if test="$table.border.style != ''">
+      <xsl:if test="$style != ''">
         <xsl:text>border-</xsl:text>
         <xsl:value-of select="$side"/>
         <xsl:text>-style: </xsl:text>
-        <xsl:value-of select="$table.border.style"/>
+        <xsl:value-of select="$style"/>
         <xsl:text>; </xsl:text>
       </xsl:if>
 
-      <xsl:if test="$table.border.color != ''">
+      <xsl:if test="$color != ''">
         <xsl:text>border-</xsl:text>
         <xsl:value-of select="$side"/>
         <xsl:text>-color: </xsl:text>
-        <xsl:value-of select="$table.border.color"/>
+        <xsl:value-of select="$color"/>
         <xsl:text>; </xsl:text>
       </xsl:if>
     </xsl:otherwise>
@@ -213,15 +216,27 @@
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'top'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'bottom'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'left'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'right'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
@@ -230,9 +245,15 @@
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'top'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'bottom'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
@@ -241,6 +262,9 @@
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'top'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
@@ -249,6 +273,9 @@
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'bottom'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
@@ -257,9 +284,15 @@
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'left'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
               <xsl:call-template name="border">
                 <xsl:with-param name="side" select="'right'"/>
+                <xsl:with-param name="style" select="$table.frame.border.style"/>
+                <xsl:with-param name="color" select="$table.frame.border.color"/>
+                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
diff --git a/xsl/params/table.border.color.xml b/xsl/params/table.border.color.xml
deleted file mode 100644
index 9c3f28fcc..000000000
--- a/xsl/params/table.border.color.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<refentry id="table.border.color">
-<refmeta>
-<refentrytitle>table.border.color</refentrytitle>
-<refmiscinfo role="type"></refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>table.border.color</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<src:fragment id='table.border.color.frag'>
-<xsl:param condition="html" name="table.border.color" select="''"/>
-<xsl:param condition="fo" name="table.border.color" select="'black'"/>
-</src:fragment>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-
-<para>FIXME:</para>
-
-</refsect1>
-</refentry>
diff --git a/xsl/params/table.border.style.xml b/xsl/params/table.border.style.xml
deleted file mode 100644
index 4f7e0259b..000000000
--- a/xsl/params/table.border.style.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<refentry id="table.border.style">
-<refmeta>
-<refentrytitle>table.border.style</refentrytitle>
-<refmiscinfo role="type"></refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>table.border.style</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<src:fragment id='table.border.style.frag'>
-<xsl:param name="table.border.style" select="'solid'"/>
-</src:fragment>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-
-<para>FIXME:</para>
-
-</refsect1>
-</refentry>
diff --git a/xsl/params/table.border.thickness.xml b/xsl/params/table.border.thickness.xml
deleted file mode 100644
index 953c418a8..000000000
--- a/xsl/params/table.border.thickness.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<refentry id="table.border.thickness">
-<refmeta>
-<refentrytitle>table.border.thickness</refentrytitle>
-<refmiscinfo role="type"></refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>table.border.thickness</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<src:fragment id='table.border.thickness.frag'>
-<xsl:param name="table.border.thickness" select="'0.5pt'"/>
-</src:fragment>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-
-<para>FIXME:</para>
-
-</refsect1>
-</refentry>
diff --git a/xsl/params/table.cell.border.color.xml b/xsl/params/table.cell.border.color.xml
new file mode 100644
index 000000000..1299a9e6e
--- /dev/null
+++ b/xsl/params/table.cell.border.color.xml
@@ -0,0 +1,23 @@
+<refentry id="table.cell.border.color">
+<refmeta>
+<refentrytitle>table.cell.border.color</refentrytitle>
+<refmiscinfo role="type"></refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>table.cell.border.color</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='table.cell.border.color.frag'>
+<xsl:param condition="html" name="table.cell.border.color" select="''"/>
+<xsl:param condition="fo" name="table.cell.border.color" select="'black'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>FIXME:</para>
+
+</refsect1>
+</refentry>
diff --git a/xsl/params/table.border.padding.xml b/xsl/params/table.cell.border.style.xml
similarity index 50%
rename from xsl/params/table.border.padding.xml
rename to xsl/params/table.cell.border.style.xml
index 0fc829b35..26b416d8d 100644
--- a/xsl/params/table.border.padding.xml
+++ b/xsl/params/table.cell.border.style.xml
@@ -1,16 +1,16 @@
-<refentry id="table.border.padding">
+<refentry id="table.cell.border.style">
 <refmeta>
-<refentrytitle>table.border.padding</refentrytitle>
+<refentrytitle>table.cell.border.style</refentrytitle>
 <refmiscinfo role="type"></refmiscinfo>
 </refmeta>
 <refnamediv>
-<refname>table.border.padding</refname>
+<refname>table.cell.border.style</refname>
 <refpurpose></refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='table.border.padding.frag'>
-<xsl:param name="table.border.padding" select="'2pt'"/>
+<src:fragment id='table.cell.border.style.frag'>
+<xsl:param name="table.cell.border.style" select="'solid'"/>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xsl/params/table.cell.border.thickness.xml b/xsl/params/table.cell.border.thickness.xml
new file mode 100644
index 000000000..9c2c8ea9a
--- /dev/null
+++ b/xsl/params/table.cell.border.thickness.xml
@@ -0,0 +1,22 @@
+<refentry id="table.cell.border.thickness">
+<refmeta>
+<refentrytitle>table.cell.border.thickness</refentrytitle>
+<refmiscinfo role="type"></refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>table.cell.border.thickness</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='table.cell.border.thickness.frag'>
+<xsl:param name="table.cell.border.thickness" select="'0.5pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>FIXME:</para>
+
+</refsect1>
+</refentry>
diff --git a/xsl/params/table.frame.border.color.xml b/xsl/params/table.frame.border.color.xml
new file mode 100644
index 000000000..b0e229fcf
--- /dev/null
+++ b/xsl/params/table.frame.border.color.xml
@@ -0,0 +1,23 @@
+<refentry id="table.frame.border.color">
+<refmeta>
+<refentrytitle>table.frame.border.color</refentrytitle>
+<refmiscinfo role="type"></refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>table.frame.border.color</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='table.frame.border.color.frag'>
+<xsl:param condition="html" name="table.frame.border.color" select="''"/>
+<xsl:param condition="fo" name="table.frame.border.color" select="'black'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>FIXME:</para>
+
+</refsect1>
+</refentry>
diff --git a/xsl/params/table.frame.border.style.xml b/xsl/params/table.frame.border.style.xml
new file mode 100644
index 000000000..5a15e06fe
--- /dev/null
+++ b/xsl/params/table.frame.border.style.xml
@@ -0,0 +1,22 @@
+<refentry id="table.frame.border.style">
+<refmeta>
+<refentrytitle>table.frame.border.style</refentrytitle>
+<refmiscinfo role="type"></refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>table.frame.border.style</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='table.frame.border.style.frag'>
+<xsl:param name="table.frame.border.style" select="'solid'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>FIXME:</para>
+
+</refsect1>
+</refentry>
diff --git a/xsl/params/table.frame.border.thickness.xml b/xsl/params/table.frame.border.thickness.xml
new file mode 100644
index 000000000..e91ea7ddb
--- /dev/null
+++ b/xsl/params/table.frame.border.thickness.xml
@@ -0,0 +1,22 @@
+<refentry id="table.frame.border.thickness">
+<refmeta>
+<refentrytitle>table.frame.border.thickness</refentrytitle>
+<refmiscinfo role="type"></refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>table.frame.border.thickness</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='table.frame.border.thickness.frag'>
+<xsl:param name="table.frame.border.thickness" select="'0.5pt'"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>FIXME:</para>
+
+</refsect1>
+</refentry>
-- 
2.50.1