Changeset 3756


Ignore:
Timestamp:
Sep 20, 2007, 9:12:12 AM (14 years ago)
Author:
Nicklas Nordborg
Message:

Allow 'entrytbl' tags to have a 'frame' attribute in the same way as 'table'.

Location:
trunk/lib/docbook
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/docbook/docbook/xsl/html/table.xsl

    r3283 r3756  
    172172  </xsl:variable>
    173173
     174  <xsl:variable name="frame">
     175    <xsl:choose>
     176      <xsl:when test="local-name(.) = 'entrytbl' and @frame">
     177        <xsl:value-of select="@frame"/>
     178      </xsl:when>
     179      <xsl:when test="../@frame">
     180        <xsl:value-of select="../@frame"/>
     181      </xsl:when>
     182      <xsl:otherwise>
     183        <xsl:value-of select="$default.table.frame"/>
     184      </xsl:otherwise>
     185    </xsl:choose>
     186  </xsl:variable>
     187
    174188  <table>
    175189    <xsl:choose>
     
    234248        <xsl:attribute name="border">0</xsl:attribute>
    235249        <xsl:choose>
    236           <xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')">
     250          <xsl:when test="$frame='all'">
    237251            <xsl:attribute name="style">
    238252              <xsl:text>border-collapse: collapse;</xsl:text>
     
    263277            </xsl:attribute>
    264278          </xsl:when>
    265           <xsl:when test="../@frame='topbot' or (not(../@frame) and $default.table.frame='topbot')">
     279          <xsl:when test="$frame='topbot'">
    266280            <xsl:attribute name="style">
    267281              <xsl:text>border-collapse: collapse;</xsl:text>
     
    280294            </xsl:attribute>
    281295          </xsl:when>
    282           <xsl:when test="../@frame='top' or (not(../@frame) and $default.table.frame='top')">
     296          <xsl:when test="$frame='top'">
    283297            <xsl:attribute name="style">
    284298              <xsl:text>border-collapse: collapse;</xsl:text>
     
    291305            </xsl:attribute>
    292306          </xsl:when>
    293           <xsl:when test="../@frame='bottom' or (not(../@frame) and $default.table.frame='bottom')">
     307          <xsl:when test="$frame='bottom'">
    294308            <xsl:attribute name="style">
    295309              <xsl:text>border-collapse: collapse;</xsl:text>
     
    302316            </xsl:attribute>
    303317          </xsl:when>
    304           <xsl:when test="../@frame='sides' or (not(../@frame) and $default.table.frame='sides')">
     318          <xsl:when test="$frame='sides'">
    305319            <xsl:attribute name="style">
    306320              <xsl:text>border-collapse: collapse;</xsl:text>
     
    326340        </xsl:choose>
    327341      </xsl:when>
    328       <xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'">
     342      <xsl:when test="$frame='none' or local-name(.) = 'entrytbl'">
    329343        <xsl:attribute name="border">0</xsl:attribute>
    330344      </xsl:when>
  • trunk/lib/docbook/preprocess/dweiss-docbook-extensions.dtd

    r3394 r3756  
    5555<!ATTLIST sect1 chunked (0|1) "0" >
    5656
     57<!ATTLIST entrytbl frame (%tbl.frame.attval;) #IMPLIED >
     58
    5759<!-- do not chunk sections in appendixes by default -->
    5860<!ATTLIST appendix chunked (0|1) "0" >
Note: See TracChangeset for help on using the changeset viewer.