diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/docbook.xsl

--- docbook-xsl-1.74.0.orig/html/docbook.xsl	2008-06-01 23:36:39.000000000 +0200

+++ docbook-xsl-1.74.0/html/docbook.xsl	2008-08-06 13:37:35.000000000 +0200

@@ -26,6 +26,7 @@

 <xsl:include href="../VERSION.xsl"/>

 <xsl:include href="param.xsl"/>

 <xsl:include href="../lib/lib.xsl"/>

+<xsl:include href="../lib/dumpfragment.xsl"/>

 <xsl:include href="../common/l10n.xsl"/>

 <xsl:include href="../common/common.xsl"/>

 <xsl:include href="../common/utility.xsl"/>

@@ -44,6 +45,7 @@

 <xsl:include href="graphics.xsl"/>

 <xsl:include href="xref.xsl"/>

 <xsl:include href="formal.xsl"/>

+<xsl:include href="dtbl.xsl"/>

 <xsl:include href="table.xsl"/>

 <xsl:include href="htmltbl.xsl"/>

 <xsl:include href="sections.xsl"/>

diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtbl.xsl

--- docbook-xsl-1.74.0.orig/html/dtbl.xsl	1970-01-01 01:00:00.000000000 +0100

+++ docbook-xsl-1.74.0/html/dtbl.xsl	2008-08-06 13:37:35.000000000 +0200

@@ -0,0 +1,293 @@

+

+

+                xmlns:exsl="http://exslt.org/common"

+                xmlns:func="http://exslt.org/functions"

+                xmlns:dtbl="http://docbook.sourceforge.net/dtbl"

+                extension-element-prefixes="func"

+                exclude-result-prefixes="exsl func dtbl"

+                version="1.0">

+

+<func:function name="dtbl:convertLength">

+  <xsl:param name="arbitrary.length"/>

+

+  <xsl:variable name="pixels.per.inch" select="96"/>

+

+  

+                select="translate($arbitrary.length, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ', '')"/>

+

+  

+                select="translate($arbitrary.length,'+-0123456789. ', '')"/>

+

+  <xsl:variable name="scaled.length">

+    <xsl:choose>

+      <xsl:when test="$units='in'">

+        <xsl:value-of select="$unscaled.length * $pixels.per.inch"/>

+      </xsl:when>

+      <xsl:when test="$units='cm'">

+        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 2.54)"/>

+      </xsl:when>

+      <xsl:when test="$units='mm'">

+        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 25.4)"/>

+      </xsl:when>

+      <xsl:when test="$units='pc'">

+        <xsl:value-of select="$unscaled.length * (($pixels.per.inch div 72) * 12)"/>

+      </xsl:when>

+      <xsl:when test="$units='pt'">

+        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 72)"/>

+      </xsl:when>

+      <xsl:when test="$units='px' or $units=''">

+        <xsl:value-of select="$unscaled.length"/>

+      </xsl:when>

+      <xsl:otherwise>

+        <xsl:message terminate="no">

+          <xsl:text>"</xsl:text>

+          <xsl:value-of select="$units"/>

+          <xsl:text>" is not a known unit.  Applying scaling factor of 1 instead.</xsl:text>

+        </xsl:message>

+        <xsl:value-of select="$unscaled.length"/>

+      </xsl:otherwise>

+    </xsl:choose>

+  </xsl:variable>

+

+  <func:result select="round($scaled.length)"/>

+</func:function>

+

+<func:function name="dtbl:adjustColumnWidths">

+  <xsl:param name="colgroup"/>

+

+  <xsl:if test="$adjustColumnWidths.debug">

+    <xsl:message>

+      <xsl:text>entering adjustColumnWidths(</xsl:text>

+      <xsl:call-template name="dump-fragment">

+        <xsl:with-param name="fragment" select="$colgroup"/>

+      </xsl:call-template>

+      <xsl:text>)</xsl:text>

+    </xsl:message>

+  </xsl:if>

+

+  <xsl:variable name="expanded.colgroup">

+    <xsl:apply-templates select="exsl:node-set($colgroup)/*" mode="dtbl-split-widths"/>

+  </xsl:variable>

+

+  <xsl:variable name="absolute.widths.total">

+    <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@abswidth)"/>

+  </xsl:variable>

+

+  <xsl:variable name="relative.widths.total">

+    <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@relwidth)"/>

+  </xsl:variable>

+

+  <xsl:if test="$adjustColumnWidths.debug">

+    <xsl:message>

+      <xsl:text>total relative widths = (</xsl:text>

+      <xsl:value-of select="$relative.widths.total"/>

+      <xsl:text>)</xsl:text>

+    </xsl:message>

+    <xsl:message>

+      <xsl:text>total absolute widths = (</xsl:text>

+      <xsl:value-of select="$absolute.widths.total"/>

+      <xsl:text>)</xsl:text>

+    </xsl:message>

+  </xsl:if>

+

+  <xsl:variable name="adjusted.colgroup">

+    <xsl:choose>

+      <xsl:when test="$relative.widths.total = 0">

+        <xsl:if test="$adjustColumnWidths.debug">

+          <xsl:message>all widths are absolute</xsl:message>

+        </xsl:if>

+        

+                             mode="dtbl-use-absolute-widths"/>

+      </xsl:when>

+      <xsl:when test="$absolute.widths.total = 0">

+        <xsl:if test="$adjustColumnWidths.debug">

+          <xsl:message>all widths are relative</xsl:message>

+        </xsl:if>

+        

+                             mode="dtbl-use-relative-widths">

+          

+                          select="$relative.widths.total"/>

+        </xsl:apply-templates>

+      </xsl:when>

+    </xsl:choose>

+  </xsl:variable>

+

+  <xsl:variable name="corrected.adjusted.colgroup">

+    <xsl:choose>

+      <xsl:when test="$relative.widths.total = 0">

+        <xsl:copy-of select="$adjusted.colgroup"/>

+      </xsl:when>

+      <xsl:otherwise>

+        

+                      select="sum(exsl:node-set($adjusted.colgroup)//col/@width)"/>

+        

+                      select="count(exsl:node-set($adjusted.colgroup)//col)"/>

+        

+                      select="100 - $widths.total"/>

+        

+                      select="($n.columns - $error) + 1"/>

+        

+                             mode="dtbl-correct-rounding-error">

+          

+                          select="$first.bad.column"/>

+        </xsl:apply-templates>

+      </xsl:otherwise>

+    </xsl:choose>

+  </xsl:variable>

+

+  <xsl:if test="$adjustColumnWidths.debug">

+    <xsl:message>

+      <xsl:text>result = (</xsl:text>

+      <xsl:call-template name="dump-fragment">

+        <xsl:with-param name="fragment" select="$corrected.adjusted.colgroup"/>

+      </xsl:call-template>

+      <xsl:text>)</xsl:text>

+    </xsl:message>

+  </xsl:if>

+

+  <func:result select="$corrected.adjusted.colgroup"/>

+</func:function>

+

+<xsl:template match="colgroup" mode="dtbl-correct-rounding-error">

+  <xsl:param name="first.bad.column"/>

+

+  <xsl:if test="$adjustColumnWidths.debug">

+    <xsl:message>

+      <xsl:text>first.bad.column = (</xsl:text>

+      <xsl:value-of select="$first.bad.column"/>

+      <xsl:text>)</xsl:text>

+    </xsl:message>

+  </xsl:if>

+

+  

+    <xsl:for-each select="col[position() < $first.bad.column]">

+      <xsl:element name="col">

+        <xsl:attribute name="width">

+          <xsl:value-of select="concat(@width, '%')"/>

+        </xsl:attribute>

+      </xsl:element>

+    </xsl:for-each>

+    <xsl:for-each select="col[position() >= $first.bad.column]">

+      <xsl:element name="col">

+        <xsl:attribute name="width">

+          <xsl:value-of select="concat(@width + 1, '%')"/>

+        </xsl:attribute>

+      </xsl:element>

+    </xsl:for-each>

+  

+</xsl:template>

+

+<xsl:template match="col" mode="dtbl-correct-rounding-error">

+  <xsl:param name="relative.widths.total"/>

+  <xsl:param name="error"/>

+

+  <xsl:element name="col">

+    <xsl:attribute name="width">

+      <xsl:value-of select="concat('', round((@relwidth div $relative.widths.total) * 100))"/>

+    </xsl:attribute>

+    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>

+  </xsl:element>

+</xsl:template>

+

+<xsl:template match="colgroup" mode="dtbl-use-relative-widths">

+  <xsl:param name="relative.widths.total"/>

+

+  

+    <xsl:apply-templates mode="dtbl-use-relative-widths">

+      

+                      select="$relative.widths.total"/>

+    </xsl:apply-templates>

+  

+</xsl:template>

+

+<xsl:template match="col" mode="dtbl-use-relative-widths">

+  <xsl:param name="relative.widths.total"/>

+

+  <xsl:element name="col">

+    <xsl:attribute name="width">

+      <xsl:value-of select="round((@relwidth div $relative.widths.total) * 100)"/>

+    </xsl:attribute>

+    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>

+  </xsl:element>

+</xsl:template>

+

+<xsl:template match="colgroup" mode="dtbl-use-absolute-widths">

+  

+    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>

+  

+</xsl:template>

+

+<xsl:template match="col" mode="dtbl-use-absolute-widths">

+  <xsl:element name="col">

+    <xsl:attribute name="width">

+      <xsl:value-of select="@abswidth"/>

+    </xsl:attribute>

+    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>

+  </xsl:element>

+</xsl:template>

+

+<xsl:template match="colgroup" mode="dtbl-split-widths">

+  

+    <xsl:apply-templates mode="dtbl-split-widths"/>

+  

+</xsl:template>

+

+<xsl:template match="col" mode="dtbl-split-widths">

+

+  

+  <xsl:variable name="width">

+    <xsl:choose>

+      <xsl:when test="@width != ''">

+        <xsl:value-of select="@width"/>

+      </xsl:when>

+      <xsl:otherwise>

+        <xsl:text>1*</xsl:text>

+      </xsl:otherwise>

+    </xsl:choose>

+  </xsl:variable>

+

+  

+  <xsl:variable name="absolute.width">

+    <xsl:choose>

+      <xsl:when test="contains($width, '*')">

+        <xsl:value-of select="substring-after($width, '*')"/>

+      </xsl:when>

+      <xsl:otherwise>

+        <xsl:value-of select="$width"/>

+      </xsl:otherwise>

+    </xsl:choose>

+  </xsl:variable>

+

+  <xsl:variable name="converted.absolute.width">

+    <xsl:choose>

+      <xsl:when test="$absolute.width != ''">

+        <xsl:value-of select="dtbl:convertLength($absolute.width)"/>

+      </xsl:when>

+     <xsl:otherwise>0</xsl:otherwise>

+    </xsl:choose>

+  </xsl:variable>

+

+  <xsl:variable name="relative.width">

+    <xsl:choose>

+      <xsl:when test="substring-before($width, '*') != ''">

+        <xsl:value-of select="substring-before($width, '*')"/>

+      </xsl:when>

+      <xsl:otherwise>0</xsl:otherwise>

+    </xsl:choose>

+  </xsl:variable>

+

+  <xsl:element name="col">

+    <xsl:attribute name="width">

+      <xsl:value-of select="$width"/>

+    </xsl:attribute>

+    <xsl:attribute name="relwidth">

+      <xsl:value-of select="$relative.width"/>

+    </xsl:attribute>

+    <xsl:attribute name="abswidth">

+      <xsl:value-of select="$converted.absolute.width"/>

+    </xsl:attribute>

+    <xsl:apply-templates mode="dtbl-split-widths"/>

+  </xsl:element>

+</xsl:template>

+

+</xsl:stylesheet>

diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/table.xsl

--- docbook-xsl-1.74.0.orig/html/table.xsl	2008-06-01 23:36:39.000000000 +0200

+++ docbook-xsl-1.74.0/html/table.xsl	2008-08-06 13:37:35.000000000 +0200

@@ -5,7 +5,8 @@

                 xmlns:xtbl="xalan://com.nwalsh.xalan.Table"

                 xmlns:lxslt="http://xml.apache.org/xslt"

                 xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"

-                exclude-result-prefixes="doc stbl xtbl lxslt ptbl"

+                xmlns:dtbl="http://docbook.sourceforge.net/dtbl"

+                exclude-result-prefixes="doc stbl xtbl lxslt ptbl dtbl"

                 version='1.0'>

 <xsl:include href="../common/table.xsl"/>

@@ -365,6 +366,9 @@

                           and $tablecolumns.extension != 0">

             <xsl:choose>

+              <xsl:when test="function-available('dtbl:convertLength')">

+                <xsl:value-of select="dtbl:convertLength($table.width)"/>

+              </xsl:when>

               <xsl:when test="function-available('stbl:convertLength')">

                 <xsl:value-of select="stbl:convertLength($table.width)"/>

               </xsl:when>

@@ -389,6 +393,9 @@

                       and $tablecolumns.extension != 0">

         <xsl:choose>

+          <xsl:when test="function-available('dtbl:adjustColumnWidths')">

+            <xsl:copy-of select="dtbl:adjustColumnWidths($colgroup)"/>

+          </xsl:when>

           <xsl:when test="function-available('stbl:adjustColumnWidths')">

             <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>

           </xsl:when>

diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/lib/dumpfragment.xsl

--- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl	1970-01-01 01:00:00.000000000 +0100

+++ docbook-xsl-1.74.0/lib/dumpfragment.xsl	2008-08-06 13:37:35.000000000 +0200

@@ -0,0 +1,30 @@

+

+

+                xmlns:exsl="http://exslt.org/common"

+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

+                xmlns="http://www.w3.org/1999/xhtml"

+                exclude-result-prefixes="exsl">

+

+<xsl:template name="dump-fragment">

+  <xsl:param name="fragment"/>

+  <xsl:apply-templates select="exsl:node-set($fragment)/*" mode="dump-fragment"/>

+</xsl:template>

+

+<xsl:template match="@*" mode="dump-fragment">

+  <xsl:text> </xsl:text>

+  <xsl:value-of select="local-name(.)"/>

+  <xsl:text>="</xsl:text>

+  <xsl:value-of select="."/>

+  <xsl:text>"</xsl:text>

+</xsl:template>

+

+<xsl:template match="*" mode="dump-fragment">

+  <xsl:text><</xsl:text><xsl:value-of select="local-name(.)"/>

+  <xsl:apply-templates select="@*" mode="dump-fragment"/>

+  <xsl:text>></xsl:text>

+  <xsl:apply-templates mode="dump-fragment"/>

+  <xsl:text></</xsl:text><xsl:value-of select="local-name(.)"/>

+  <xsl:text>></xsl:text>

+</xsl:template>

+

+</xsl:stylesheet>

diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/param.xsl

--- docbook-xsl-1.76.0-orig/html/param.xsl	2010-08-31 09:27:22.000000000 +0200

+++ docbook-xsl-1.76.0/html/param.xsl	2010-09-06 11:01:07.916914161 +0200

@@ -68,6 +68,7 @@ div.annotation-close { position: absolut

 http://cdn.docbook.org/release/xsl/images/annot-close.png</xsl:param>

 <xsl:param name="annotation.graphic.open">http://cdn.docbook.org/release/xsl/images/annot-open.png</xsl:param>

+<xsl:param name="adjustColumnWidths.debug" select="false()"/>

 <xsl:param name="annotation.js">

 <xsl:text>http://cdn.docbook.org/release/xsl/script/AnchorPosition.js http://cdn.docbook.org/release/xsl/script/PopupWindow.js</xsl:text></xsl:param>