FooBarWidget-mizuho 0.9.1 → 0.9.2

data/asciidoc/doc/source-highlight-filter.txt

@@ -83,8 +83,8 @@ def sub_word(mo):
         return word
 ---------------------------------------------------------------------
 
-Numbered source code listing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Numbered source code listing with callouts
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This source-highlight filtered block:
 
 ---------------------------------------------------------------------
@@ -108,19 +108,23 @@ This source-highlight filtered block:
 
  end
 
- if $0 == __FILE__
+ if $0 == __FILE__                                 \<1>
    # Array#cycle test
    # true => 0
    # false => 1
    # true => 2
    # false => 3
    # true => 4
-   puts 'Array#cycle test'
+   puts 'Array#cycle test'                         \<2>
    [true, false].cycle([0, 1, 2, 3, 4]) do |a, b|
      puts "#{a.inspect} => #{b.inspect}"
    end
  end
  ---------------------------------------------------------------------
+
+ \<1> First callout.
+ \<2> Second callout.
+
 ---------------------------------------------------------------------
 
 Renders this highlighted source code:
@@ -145,29 +149,54 @@ class Array
 
 end
 
-if $0 == __FILE__
+if $0 == __FILE__                                 <1>
   # Array#cycle test
   # true => 0
   # false => 1
   # true => 2
   # false => 3
   # true => 4
-  puts 'Array#cycle test'
+  puts 'Array#cycle test'                         <2>
   [true, false].cycle([0, 1, 2, 3, 4]) do |a, b|
     puts "#{a.inspect} => #{b.inspect}"
   end
 end
 ---------------------------------------------------------------------
 
+<1> First callout.
+<2> Second callout.
+
 
 Installation
 ------------
-If you want to syntax highlight AsciiDoc HTML outputs you need to
+HTML
+~~~~
+If you want to syntax highlight AsciiDoc HTML outputs (`html4` and
+`xhtml11` backends) you need to
 install http://www.gnu.org/software/src-highlite/[GNU
-source-highlight] (most distributions have this package). It's not
-required if you are generating DocBook output (DocBook syntax
-highlighting is handled by the DocBook toolchain).
+source-highlight] (most distributions have this package).
+
+DocBook
+~~~~~~~
+AsciiDoc encloses the source code in a DocBook 'programlisting'
+element and leaves source code highlighting to the DocBook toolchain
+(dblatex has a particularly nice programlisting highlighter). The
+DocBook programlisting element is assigned two attributes:
+
+. The 'language' attribute is set to the AsciiDoc 'language'
+  attribute.
+. The 'linenumbering' attribute is set to the AsciiDoc 'src_numbered'
+  attribute ('numbered' or 'unnumbered').
+
+If you use `a2x(1)` to generate PDF you need to include the
+`--no-xmllint` option to suppress `xmllint(1)` checking -- the
+programlisting 'language' attribute (required by the dblatex source
+highlighter) is not part of the DocBook 4 specification (but it is in
+the newer DocBook 5 specification).
+
 
+Testing
+~~~~~~~
 Test the filter by converting the test file to HTML with AsciiDoc:
 
    $ asciidoc -v ./filters/source-highlight-filter-test.txt

data/asciidoc/docbook-xsl/asciidoc-docbook-xsl.txt

@@ -5,7 +5,7 @@ PDF generation from AsciiDoc generated DocBook using FOP plus DocBook XSL
 Stylesheets.
 
 - FOP 0.95beta.
-- DocBook XSL Stylesheets version 1.72.0.
+- DocBook XSL Stylesheets version 1.74.0.
 
 Output file customisation is achieved by tweaking the DocBook XSL
 stylesheets.  I've tried to keep customization to a minimum and
@@ -41,31 +41,3 @@ wait for the Debian `docbook-xsl` package:
   $ cd /etc/xml/
   $ sudo cp -p docbook-xsl.xml docbook-xsl.xml.ORIG
   $ sudo vi docbook-xsl.xml
-
-- Apply optional patches (see below).
-
-
-Patches to DocBook XSL Stylesheets
-----------------------------------
-NOTE: You'll find the patch files in the AsciiDoc distribution archive
-`./docbook-xsl/` directory.
-
-Shade Literal Block Patch
-~~~~~~~~~~~~~~~~~~~~~~~~~
-The processing expectation for AsciiDoc LiteralBlocks and
-LiteralParagraphs is that they are not shaded. The
-`shaded-literallayout.patch` was devised to allow AciiDoc Listing
-blocks to be shaded while leaving Literal paragraphs and Literal
-blocks unshaded (the default DocBook XSL Stylesheets behavior is to
-shade all verbatim elements).
-
-The patch implements a `shade.literallayout` XSL parameter so that
-shading in literal elements could be disabled while other verbatim
-elements are left shaded (by setting the XSL `shade.verbatim`
-parameter).
-
-The relevant patch file is `shaded-literallayout.patch` and it can be
-applied from the DocBook XSL Stylesheets directory:
-
-  $ cd /usr/share/xml/docbook/stylesheet/docbook-xsl-1.72.0
-  $ sudo patch -p0 < /tmp/shaded-literallayout.patch

data/asciidoc/docbook-xsl/fo.xsl

@@ -10,7 +10,9 @@
   stylesheets. This means you don't need to edit the <xsl:import> elements on
   a machine by machine basis.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format">
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
 <xsl:import href="common.xsl"/>
 
@@ -38,6 +40,23 @@
 <!-- Default fetches image from Internet (long timeouts) -->
 <xsl:param name="draft.watermark.image" select="''"/>
 
+<!-- Line break -->
+<xsl:template match="processing-instruction('asciidoc-br')">
+  <fo:block/>
+</xsl:template>
+
+<!-- Horizontal ruler -->
+<xsl:template match="processing-instruction('asciidoc-hr')">
+  <fo:block space-after="1em">
+    <fo:leader leader-pattern="rule" rule-thickness="0.5pt"  rule-style="solid" leader-length.minimum="100%"/>
+  </fo:block>
+</xsl:template>
+
+<!-- Hard page break -->
+<xsl:template match="processing-instruction('asciidoc-pagebreak')">
+   <fo:block break-after='page'/>
+</xsl:template>
+
 <!-- Sets title to body text indent -->
 <xsl:param name="body.start.indent">
   <xsl:choose>
@@ -108,10 +127,23 @@
 
 <xsl:param name="callout.graphics" select="'1'"/>
 
-<xsl:param name="shade.literallayout" select="0"/>
+<!-- Only shade programlisting and screen verbatim elements -->
 <xsl:param name="shade.verbatim" select="1"/>
 <xsl:attribute-set name="shade.verbatim.style">
-  <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+  <xsl:attribute name="background-color">
+    <xsl:choose>
+      <xsl:when test="self::programlisting|self::screen">#E0E0E0</xsl:when>
+      <xsl:otherwise>inherit</xsl:otherwise>
+    </xsl:choose>
+  </xsl:attribute>
+</xsl:attribute-set>
+
+<!--
+  Force XSL Stylesheets 1.72 default table breaks to be the same as the current
+  version (1.74) default which (for tables) is keep-together="auto".
+-->
+<xsl:attribute-set name="table.properties">
+  <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
 </xsl:attribute-set>
 
 </xsl:stylesheet>

data/asciidoc/docbook-xsl/manpage.xsl

@@ -21,6 +21,9 @@
 </xsl:template>
 
 <!-- Don't automatically generate the REFERENCES section -->
+<xsl:template name="endnotes.list">
+</xsl:template>
+<!-- Next entry for backward compatibility with old docbook-xsl versions -->
 <xsl:template name="format.links.list">
 </xsl:template>
 

data/asciidoc/docbook-xsl/text.xsl

@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+  docbook-xsl/text.xsl
+  Used by AsciiDoc a2x(1) for w3m(1) based text generation.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+  <xsl:import
+    href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
+
+  <!-- parameters for optimal text output -->
+  <xsl:param name="callout.graphics" select="0"/>
+  <xsl:param name="callout.unicode" select="0"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="generate.toc">
+  appendix  title
+  article/appendix  nop
+  article   toc,title
+  book      toc,title,figure,table,example,equation
+  chapter   title
+  part      toc,title
+  preface   toc,title
+  qandadiv  toc
+  qandaset  toc
+  reference toc,title
+  section   toc
+  set       toc,title
+  </xsl:param>
+
+  <xsl:template match="book/bookinfo/title | article/articleinfo/title" mode="titlepage.mode">
+      <hr />
+        <xsl:apply-imports/>
+      <hr />
+  </xsl:template>
+
+  <xsl:template match="book/*/title | article/*/title" mode="titlepage.mode">
+      <br /><hr />
+        <xsl:apply-imports/>
+      <hr />
+  </xsl:template>
+
+  <xsl:template match="book/chapter/*/title | article/section/*/title" mode="titlepage.mode">
+      <br />
+        <xsl:apply-imports/>
+      <hr width="100" align="left" />
+  </xsl:template>
+
+
+</xsl:stylesheet>

data/asciidoc/docbook.conf

@@ -8,7 +8,7 @@
 [miscellaneous]
 outfilesuffix=.xml
 # Printable page width in pts.
-pagewidth=380
+pagewidth=425
 pageunits=pt
 
 [attributes]
@@ -16,8 +16,8 @@ basebackend=docbook
 basebackend-docbook=
 
 [replacements]
-# Line break markup is dropped (there is no DocBook line break tag).
-(?m)^(.*)\s\+$=\1
+# Line break markup. Custom processing instruction in fo.xsl.
+(?m)^(.*)\s\+$=\1<?asciidoc-br?>
 ifdef::asciidoc7compatible[]
 # Superscripts.
 \^(.+?)\^=<superscript>\1</superscript>
@@ -26,7 +26,40 @@ ifdef::asciidoc7compatible[]
 endif::asciidoc7compatible[]
 
 [ruler-blockmacro]
-# Only applies to HTML so don't output anything.
+# Uses a custom processing instruction in fo.xsl.
+<?asciidoc-hr?>
+
+[pagebreak-blockmacro]
+# Uses a custom processing instruction in fo.xsl.
+<?asciidoc-pagebreak?>
+
+[blockdef-pass]
+latexmath-style=template="latexmathblock",subs=[]
+
+[macros]
+# math macros.
+(?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[]
+(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[]
+
+[latexmath-inlinemacro]
+<inlineequation>
+<alt><![CDATA[{passtext}]]></alt>
+<inlinemediaobject><textobject><phrase></phrase></textobject></inlinemediaobject>
+</inlineequation>
+
+[latexmath-blockmacro]
+<informalequation>
+<alt><![CDATA[{passtext}]]></alt>
+<mediaobject><textobject><phrase></phrase></textobject></mediaobject>
+</informalequation>
+
+[latexmathblock]
+<equation{id? id="{id}"}><title>{title}</title>
+{title%}<informalequation{id? id="{id}"}>
+<alt><![CDATA[|]]></alt>
+<mediaobject><textobject><phrase></phrase></textobject></mediaobject>
+{title#}</equation>
+{title%}</informalequation>
 
 [image-inlinemacro]
 <inlinemediaobject>
@@ -37,8 +70,8 @@ endif::asciidoc7compatible[]
 </inlinemediaobject>
 
 [image-blockmacro]
-<figure{id? id="{id}"}><title>{title}</title>
-{title%}<informalfigure{id? id="{id}"}>
+<figure{id? id="{id}"}{pgwide-option? pgwide="1"}><title>{title}</title>
+{title%}<informalfigure{id? id="{id}"}>{pgwide-option?<?dbfo pgwide="1"?>}
 <mediaobject>
   <imageobject>
   <imagedata fileref="{imagesdir=}{target}"{width? contentwidth="{width}"}{height? contentdepth="{height}"}{scaledwidth? width="{scaledwidth}" scalefit="1"}{align? align="{align}"}/>
@@ -49,7 +82,7 @@ endif::asciidoc7compatible[]
 {title%}</informalfigure>
 
 [indexterm-inlinemacro]
-# Inline index term.
+# Index term.
 # Generate separate index entries for primary, secondary and tertiary
 # descriptions.
 # Primary only.
@@ -75,77 +108,95 @@ endif::asciidoc7compatible[]
 {3#}</indexterm>
 
 [indexterm2-inlinemacro]
-# Inline index term.
+# Index term.
 # Single entry index term that is visible in the primary text flow.
-<indexterm>
-  <primary>{1}</primary>
-</indexterm>
-{1}
+<indexterm><primary>{1}</primary></indexterm>{1}
 
 [footnote-inlinemacro]
-# Inline footnote.
+# Footnote.
 <footnote><simpara>{0}</simpara></footnote>
 
+[footnoteref-inlinemacro]
+# Footnote reference.
+{2#}<footnote id="{1}"><simpara>{2}</simpara></footnote>
+{2%}<footnoteref linkend="{1}" />
+
 [callout-inlinemacro]
-# Inline callout.
+# Callout.
 <co id="{coid}"/>
 
-[tags]
-# Bulleted, numbered and labeled list tags.
-ilist=<itemizedlist{id? id="{id}"}>{title?<title>{title}</title>}|</itemizedlist>
-ilistitem=<listitem>|</listitem>
-ilisttext=<simpara>|</simpara>
-olist=<orderedlist{id? id="{id}"}>{title?<title>{title}</title>}|</orderedlist>
-olist2=<orderedlist{id? id="{id}"} numeration="loweralpha">|</orderedlist>
-olistitem=<listitem>|</listitem>
-olisttext=<simpara>|</simpara>
-vlist=<variablelist{id? id="{id}"}>{title?<title>{title}</title>}|</variablelist>
-vlistentry=<varlistentry>|</varlistentry>
-vlistterm=<term>|</term>
-vlisttext=<simpara>|</simpara>
-vlistitem=<listitem>|</listitem>
+# List tags.
+[listtags-bulleted]
+list=<itemizedlist{id? id="{id}"}{compact-option? spacing="compact"}>{title?<title>{title}</title>}|</itemizedlist>
+item=<listitem>|</listitem>
+text=<simpara>|</simpara>
+
+[listtags-numbered]
+list=<orderedlist{id? id="{id}"}{compact-option? spacing="compact"}>{title?<title>{title}</title>}|</orderedlist>
+item=<listitem>|</listitem>
+text=<simpara>|</simpara>
+
+[listtags-numbered2]
+list=<orderedlist{id? id="{id}"} numeration="loweralpha"{compact-option? spacing="compact"}>|</orderedlist>
+item=<listitem>|</listitem>
+text=<simpara>|</simpara>
+
+[listtags-labeled]
+list=<variablelist{id? id="{id}"}>{title?<title>{title}</title>}|</variablelist>
+entry=<varlistentry>|</varlistentry>
+label=
+term=<term>|</term>
+item=<listitem>|</listitem>
+text=<simpara>|</simpara>
+
+[listtags-horizontal]
 # Horizontal labeled list (implemented with two column table).
 # Hardwired column widths to 30%,70% because the current crop of PDF
 # generators do not auto calculate column widths.
-hlist=<{title?table}{title!informaltable}{id? id="{id}"} tabstyle="{style=hlabeledlist}" pgwide="0" frame="none" colsep="0" rowsep="0">{title?<title>{title}</title>}<tgroup cols="2"><colspec colwidth="{1=3}*"/><colspec colwidth="{2=7}*"/><tbody valign="top">|</tbody></tgroup><{title?/table}{title!/informaltable}>
-hlistentry=<row>|</row>
-hlisttext=<simpara>|</simpara>
-hlistterm=<entry><simpara>|</simpara></entry>
-hlistitem=<entry>|</entry>
-
-# Question and Answer list.
-qlist=<qandaset{id? id="{id}"}>{title?<title>{title}</title>}|</qandaset>
-qlistentry=<qandaentry>|</qandaentry>
-qlistterm=<question><simpara>|</simpara></question>
-qlistitem=<answer>|</answer>
-qlisttext=<simpara>|</simpara>
-# Bibliography list.
-blist=|
-blistitem=<bibliomixed>|</bibliomixed>
-blisttext=<bibliomisc>|</bibliomisc>
-# Glossary list.
-glist=|
-glistentry=<glossentry>|</glossentry>
-glistterm=<glossterm>|</glossterm>
-glistitem=<glossdef>|</glossdef>
-glisttext=<simpara>|</simpara>
-# Callout list.
-colist=<calloutlist{id? id="{id}"}>{title?<title>{title}</title>}|</calloutlist>
-colistitem=<callout arearefs="{coids}">|</callout>
-colisttext=<simpara>|</simpara>
+ list=<{title?table}{title!informaltable}{id? id="{id}"}{style? tabstyle="{style}"}{pgwide-option? pgwide="1"} frame="none" colsep="0" rowsep="0">{title?<title>{title}</title>}<tgroup cols="2"><colspec colwidth="{labelwidth=15}*"/><colspec colwidth="{itemwidth=85}*"/><tbody valign="top">|</tbody></tgroup><{title?/table}{title!/informaltable}>
+entry=<row>|</row>
+label=<entry>|</entry>
+term=<simpara>|</simpara>
+item=<entry>|</entry>
+text=<simpara>|</simpara>
+
+[listtags-callout]
+list=<calloutlist{id? id="{id}"}>{title?<title>{title}</title>}|</calloutlist>
+item=<callout arearefs="{coids}">|</callout>
+text=<simpara>|</simpara>
+
+[listtags-qanda]
+list=<qandaset{id? id="{id}"}>{title?<title>{title}</title>}|</qandaset>
+entry=<qandaentry>|</qandaentry>
+label=<question>|</question>
+term=<simpara>|</simpara>
+item=<answer>|</answer>
+text=<simpara>|</simpara>
+
+[listtags-bibliography]
+list=
+item=<bibliomixed>|</bibliomixed>
+text=<bibliomisc>|</bibliomisc>
+
+[listtags-glossary]
+list=
+entry=<glossentry>|</glossentry>
+label=
+term=<glossterm>|</glossterm>
+item=<glossdef>|</glossdef>
+text=<simpara>|</simpara>
 
+[tags]
 # Quoted text
 emphasis=<emphasis>|</emphasis>
 strong=<emphasis role="strong">|</emphasis>
 monospaced=<literal>|</literal>
-quoted={amp}#8220;|{amp}#8221;
-unquoted=|
+singlequoted={amp}#8216;|{amp}#8217;
+doublequoted={amp}#8220;|{amp}#8221;
+unquoted=
 subscript=<subscript>|</subscript>
 superscript=<superscript>|</superscript>
 
-# $$ inline passthrough.
-$$passthrough=|
-
 # Inline macros
 [http-inlinemacro]
 <ulink url="{name}:{target}">{0={name}:{target}}</ulink>
@@ -155,6 +206,8 @@ $$passthrough=|
 <ulink url="{name}:{target}">{0={name}:{target}}</ulink>
 [file-inlinemacro]
 <ulink url="{name}:{target}">{0={name}:{target}}</ulink>
+[irc-inlinemacro]
+<ulink url="{name}:{target}">{0={name}:{target}}</ulink>
 [mailto-inlinemacro]
 <ulink url="mailto:{target}">{0={target}}</ulink>
 [callto-inlinemacro]
@@ -190,8 +243,8 @@ $$passthrough=|
 
 # Paragraph substitution.
 [paragraph]
-<formalpara{id? id="{id}"}><title>{title}</title><para>
-{title%}<simpara{id? id="{id}"}>
+<formalpara{style? role="{style}"}{id? id="{id}"}><title>{title}</title><para>
+{title%}<simpara{style? role="{style}"}{id? id="{id}"}>
 |
 {title%}</simpara>
 {title#}</para></formalpara>
@@ -209,15 +262,17 @@ template::[verseblock]
 
 # Delimited blocks.
 [literalblock]
-<example><title>{title}</title>
-<literallayout{id? id="{id}"} class="{font=monospaced}">
+<example{id? id="{id}"}><title>{title}</title>
+{title#}<literallayout class="monospaced">
+{title%}<literallayout{id? id="{id}"} class="monospaced">
 |
 </literallayout>
 {title#}</example>
 
 [listingblock]
-<example><title>{title}</title>
-<screen>
+<example{id? id="{id}"}><title>{title}</title>
+{title#}<screen>
+{title%}<screen{id? id="{id}"}>
 |
 </screen>
 {title#}</example>
@@ -228,9 +283,6 @@ template::[verseblock]
 |
 </sidebar>
 
-[passthroughblock]
-|
-
 [quoteblock]
 <blockquote{id? id="{id}"}>
 <title>{title}</title>
@@ -272,13 +324,67 @@ template::[verseblock]
 </{name}>
 
 # Tables.
-[tabledef-default]
-template=table		
-colspec=<colspec colwidth="{colwidth}{pageunits}" align="{colalign}"/>
+[tabletags-default]
+colspec=<colspec colwidth="{width!{colpcwidth}*}{width?{colabswidth}{pageunits}}" align="{colalign}"/>
 bodyrow=<row>|</row>
+headdata=<entry>|</entry>
 bodydata=<entry>|</entry>
+paragraph=<simpara>|</simpara>
+
+[tabletags-emphasis]
+paragraph=<simpara><emphasis>|</emphasis></simpara>
+
+[tabletags-strong]
+paragraph=<simpara><emphasis role="strong">|</emphasis></simpara>
+
+[tabletags-monospaced]
+paragraph=<simpara><literal>|</literal></simpara>
+
+[tabletags-verse]
+bodydata=<entry><literallayout>|</literallayout></entry>
+paragraph=
+
+[tabletags-literal]
+bodydata=<entry><literallayout class="monospaced">|</literallayout></entry>
+paragraph=
+
+[tabletags-asciidoc]
+paragraph=
 
 [table]
+<{title?table}{title!informaltable}{id? id="{id}"}{pgwide-option? pgwide="1"}
+frame="{frame=all}"
+{grid%rowsep="1" colsep="1"}
+rowsep="{grid@none|cols:0:1}" colsep="{grid@none|rows:0:1}"
+>
+<title>{title}</title>
+<?dbfo keep-together="{breakable-option#auto}"?>
+<?dbfo keep-together="{unbreakable-option#always}"?>
+<tgroup cols="{colcount}">
+{colspecs}
+{headrows#}<thead valign="{valign=top}">
+{headrows}
+{headrows#}</thead>
+{footrows#}<tfoot valign="{valign=top}">
+{footrows}
+{footrows#}</tfoot>
+<tbody valign="{valign=top}">
+{bodyrows}
+</tbody>
+</tgroup>
+</{title?table}{title!informaltable}>
+
+#--------------------------------------------------------------------
+# Deprecated old table definitions.
+#
+
+[old_tabledef-default]
+template=old_table
+colspec=<colspec colwidth="{colwidth}{pageunits}" align="{colalign}"/>
+bodyrow=<row>|</row>
+bodydata=<entry>|</entry>
+
+[old_table]
 <{title?table}{title!informaltable}{id? id="{id}"} pgwide="0"
 frame="{frame=topbot}"
 {grid%rowsep="0" colsep="0"}
@@ -299,6 +405,9 @@ rowsep="{grid@none|cols:0:1}" colsep="{grid@none|rows:0:1}"
 </tgroup>
 </{title?table}{title!informaltable}>
 
+# End of deprecated old table definitions.
+#--------------------------------------------------------------------
+
 [specialsections]
 ifdef::doctype-article[]
 ^Abstract$=sect-abstract
@@ -504,7 +613,7 @@ template::[header-declarations]
 </book>
 
 [preamble]
-# Preamble is not allowed in DocBook book so wrap it in a preface. 
+# Preamble is not allowed in DocBook book so wrap it in a preface.
 <preface{id? id="{id}"}>
 <title>Preface</title>
 |
@@ -567,7 +676,7 @@ outfilesuffix=.sgml
 <!DOCTYPE {doctype-article?article}{doctype-book?book}{doctype-manpage?refentry} PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
 [tabledef-default]
-colspec=<colspec colwidth="{colwidth}{pageunits}" align="{colalign}">
+colspec=<colspec colwidth="{colabswidth}{pageunits}" align="{colalign}">
 
 [image-inlinemacro]
 <inlinemediaobject>