4 files changed, 17 insertions, 10 deletions
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index b59ca65..21cdd28 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -4977,6 +4977,11 @@ The last row of the table is rendered as a footer.
 |header |docbook, xhtml11, html4 |table|
 The first row of the table is rendered as a header.
 
+|autowidth |xhtml11,html4 |table|
+The column widths are determined by the browser, not the AsciiDoc
+'cols' atribute. If there is no 'width' attribute the table width is
+also left up to the browser.
+
 |breakable, unbreakable |docbook (XSL/FO) |table|
 The 'breakable' options allows the table to break across page
 boundaries (the default behavior); 'unbreakable' attempts to keep the
diff --git a/docbook.conf b/docbook.conf
index 480bb17..0b6fae1 100644
--- a/docbook.conf
+++ b/docbook.conf
@@ -493,7 +493,7 @@ template::[header-declarations]
 # include it as the document history, otherwise use current revision.
 {revisionhistory#}{include:{docdir}/{docname}-revhistory.xml}
 {revisionhistory%}<revhistory><revision><revnumber>{revision}</revnumber><date>{date}</date>{authorinitials?<authorinitials>{authorinitials}</authorinitials>}{revremark?<revremark>{revremark}</revremark>}</revision></revhistory>
-    # DEPRECTED: Use corpname in preference to companyname.
+# DEPRECTED: Use corpname in preference to companyname.
     <corpname>{companyname}</corpname>
     <corpname>{corpname}</corpname>
 {doctitle#}</articleinfo>
diff --git a/html4.conf b/html4.conf
index 7e3ed29..546f0c6 100644
--- a/html4.conf
+++ b/html4.conf
@@ -282,9 +282,9 @@ template::[quoteblock]
 # Tables.
 [tabletags-default]
 bodyrow=<tr>|</tr>
-headdata=<th align="{colalign}" width="{colpcwidth}%">|</th>
-footdata=<td align="{colalign}" width="{colpcwidth}%" style="font-weight:bold">|</td>
-bodydata=<td align="{colalign}" width="{colpcwidth}%" valign="{valign=top}">|</td>
+headdata=<th align="{colalign}"{autowidth-option! width="{colpcwidth}%"}>|</th>
+footdata=<td align="{colalign}"{autowidth-option! width="{colpcwidth}%"} style="font-weight:bold">|</td>
+bodydata=<td align="{colalign}"{autowidth-option! width="{colpcwidth}%"} valign="{valign=top}">|</td>
 paragraph=<p>|</p>
 
 [tabletags-emphasis]
@@ -297,22 +297,23 @@ paragraph=<p><strong>|</strong></p>
 paragraph=<p><tt>|</tt></p>
 
 [tabletags-verse]
-bodydata=<td align="{colalign}" width="{colpcwidth}%" valign="{valign=top}"><pre style="font-family: inherit;">|</pre></td>
+bodydata=<td align="{colalign}"{autowidth-option! width="{colpcwidth}%"} valign="{valign=top}"><pre style="font-family: inherit;">|</pre></td>
 paragraph=
 
 [tabletags-literal]
-bodydata=<td align="{colalign}" width="{colpcwidth}%" valign="{valign=top}"><pre><tt>|</tt></pre></td>
+bodydata=<td align="{colalign}"{autowidth-option! width="{colpcwidth}%"} valign="{valign=top}"><pre><tt>|</tt></pre></td>
 paragraph=
 
 [tabletags-asciidoc]
-bodydata=<td align="{colalign}" width="{colpcwidth}%" valign="{valign=top}"><div>|</div></td>
+bodydata=<td align="{colalign}"{autowidth-option! width="{colpcwidth}%"} valign="{valign=top}"><div>|</div></td>
 paragraph=
 
 [table]
 <p><b>{caption={table_caption}}</b>{title}</p>
 <a name="{id}"></a>
 <table rules="{grid=all}"
-width="{tablepcwidth}%"
+{autowidth-option%}width="{tablepcwidth}%"
+{autowidth-option#}{width#width="{tablepcwidth}%"}
 frame="{frame%border}"
 frame="{frame@topbot:hsides}{frame@all:border}{frame@none:void}{frame@sides:vsides}"
 cellspacing="0" cellpadding="4">
diff --git a/xhtml11.conf b/xhtml11.conf
index dcd2758..8a066b0 100644
--- a/xhtml11.conf
+++ b/xhtml11.conf
@@ -326,7 +326,7 @@ template::[quoteblock]
 # Tables.
 [tabletags-default]
 # {colalign} should be in <col> but Firefox 2 & 3 require it in <td>.
-colspec=<col width="{colpcwidth}%" />
+colspec=<col{autowidth-option! width="{colpcwidth}%"} />
 bodyrow=<tr>|</tr>
 headdata=<th align="{colalign}">|</th>
 bodydata=<td align="{colalign}">|</td>
@@ -356,7 +356,8 @@ paragraph=
 [table]
 <div class="tableblock"{id? id="{id}"}>
 <table rules="{grid=all}"
-width="{tablepcwidth}%"
+{autowidth-option%}width="{tablepcwidth}%"
+{autowidth-option#}{width#width="{tablepcwidth}%"}
 frame="{frame%border}"
 frame="{frame@topbot:hsides}{frame@all:border}{frame@none:void}{frame@sides:vsides}"
 cellspacing="0" cellpadding="4">