Added new parameter default.table.frame that controls table framing if there is no...

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index c42256b02978df5269e2e8ad68d275298f549a1a..4f7b7cd1456f21944f93ec51f7fde22ac6692a92 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -41,6 +41,7 @@
 <!ENTITY css.decoration SYSTEM "../params/css.decoration.xml">
 <!ENTITY current.docid SYSTEM "../params/current.docid.xml">
 <!ENTITY default.table.width SYSTEM "../params/default.table.width.xml">
+<!ENTITY default.table.frame SYSTEM "../params/default.table.frame.xml">
 <!ENTITY draft.mode SYSTEM "../params/draft.mode.xml">
 <!ENTITY draft.watermark.image SYSTEM "../params/draft.watermark.image.xml">
 <!ENTITY ebnf.table.bgcolor SYSTEM "../params/ebnf.table.bgcolor.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index ee7d2078e76ffac4b32d92cd94ab9d8f1187d23f..9cf99d26cb8d073f958b0f51894528da45241d2a 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -196,6 +196,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &table.frame.border.style;
 &table.frame.border.thickness;
 &table.frame.border.color;
+&default.table.frame;
 &html.cellspacing;
 &html.cellpadding;
 </reference>
@@ -468,6 +469,7 @@ around all these parameters.</para>
 <src:fragref linkend="default.float.class.frag"/>
 <src:fragref linkend="default.image.width.frag"/>
 <src:fragref linkend="default.table.width.frag"/>
+<src:fragref linkend="default.table.frame.frag"/>
 <src:fragref linkend="draft.mode.frag"/>
 <src:fragref linkend="draft.watermark.image.frag"/>
 <src:fragref linkend="ebnf.table.bgcolor.frag"/>

diff --git a/xsl/html/table.xsl b/xsl/html/table.xsl
index ddc0070e7b0bcc945305fe6052687f6eaa1ea4f5..770a4726450d7440b15daa4deffcc27371531453 100644 (file)
--- a/xsl/html/table.xsl
+++ b/xsl/html/table.xsl
@@ -233,7 +233,7 @@
       <xsl:when test="$table.borders.with.css != 0">
         <xsl:attribute name="border">0</xsl:attribute>
         <xsl:choose>
-          <xsl:when test="../@frame='all'">
+          <xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -262,7 +262,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='topbot'">
+          <xsl:when test="../@frame='topbot' or (not(../@frame) and $default.table.frame='topbot')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -279,7 +279,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='top'">
+          <xsl:when test="../@frame='top' or (not(../@frame) and $default.table.frame='top')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -290,7 +290,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='bottom'">
+          <xsl:when test="../@frame='bottom' or (not(../@frame) and $default.table.frame='bottom')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -301,7 +301,7 @@
               </xsl:call-template>
             </xsl:attribute>
           </xsl:when>
-          <xsl:when test="../@frame='sides'">
+          <xsl:when test="../@frame='sides' or (not(../@frame) and $default.table.frame='sides')">
             <xsl:attribute name="style">
               <xsl:text>border-collapse: collapse;</xsl:text>
               <xsl:call-template name="border">
@@ -325,7 +325,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <xsl:when test="../@frame='none' or local-name(.) = 'entrytbl'">
+      <xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'">
         <xsl:attribute name="border">0</xsl:attribute>
       </xsl:when>
       <xsl:otherwise>