- Updated CHANGELOG.

- Documented xhtml11, html5 text decoration CSS classes.
- Typos.
- Added test for text decoration roles.

5 files changed, 149 insertions, 42 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f83c9a8..97fec7a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,86 @@ AsciiDoc ChangeLog
 :website: http://www.methods.co.nz/asciidoc/
 
 
+Version 8.6.5 (2011-05-08)
+--------------------------
+.Additions and changes
+- Added HTML 5 article with 'toc2' table of contents to the example on
+  the AsciiDoc website home page.
+- Added 'filters' and 'topics' help topics.
+  Fixed documentation errors in help text.  Patch submitted by Lionel
+  Orry, see:
+  http://groups.google.com/group/asciidoc/browse_thread/thread/9da9d48a6461ff14
+- Pass parent configuration files, command-line attributes and header
+  attributes to table asciidoc filters. Based on patch submitted by
+  Simon Ruderich, see:
+  http://groups.google.com/group/asciidoc/browse_thread/thread/5c792cbb395b753b
+- Allow a 'title' attribute entry in the document header so that HTML
+  backends can set the 'title' element separately from the displayed
+  document title (the 'doctitle' attribute).
+- Pass 'lang' attribute to 'asciidoc' table style filter. Patch
+  submitted by Simon Ruderich, see:
+  http://groups.google.com/group/asciidoc/browse_thread/thread/e2100b7cb29283ce
+- xhtml11,html5: Added 'toc2' attribute which generates a scrollable
+  table of contents in the left hand margin. Based on customized CSS
+  written by Suraj Kurapati, see
+  http://groups.google.com/group/asciidoc/browse_thread/thread/c5e30ee5555877f5
+- Added 'asciidoc-confdir' intrinsic attribute which expands to the
+  global conf directory.
+- Documented that you can specify multiple CSS files with the a2x(1)
+  `--stylesheet` command option. See:
+  http://groups.google.com/group/asciidoc/browse_thread/thread/baf3218551d05a05
+- Improved xhtml11 backend's table of contents generation latency.
+  Patch submitted by Hongli Lai. See:
+  http://groups.google.com/group/asciidoc/browse_thread/thread/5a7fe64fbfd65ad
+- Added html5 backend.
+- For consistency converted all DOS formatted configuration and text
+  files to UNIX format.
+- html4: Added ability to use 'role' attribute with most block
+  elements. Patch contributed by Simon Ruderich.  See
+  http://groups.google.com/group/asciidoc/browse_thread/thread/5620ba634fdb030a
+- Added Dutch language configuration file and accompanying test file
+  (contributed by Dag Wieers, see
+  http://groups.google.com/group/asciidoc/browse_thread/thread/f969b9ce987d7f5d).
+- Configuration files are loaded in two passes when the -e
+  command-line option is used (the same behavior as when the -e option
+  is not used). Patch submitted by haad. See
+  http://groups.google.com/group/asciidoc/browse_thread/thread/cd0f47495fd04181
+  and
+  http://code.google.com/p/asciidoc/issues/detail?id=6&q=label%3APriority-Medium
+- Documented how to include embedded fonts in an EPUB document.
+- a2x: Added `.<ext>=<mimetype>` resource specifier syntax.
+- a2x: Enable admonition icons in example EPUBs.
+- a2x: allow environment variables and tilde home directories in
+  resource manifest files.
+- a2x: don't process non-existent resource directories.
+- a2x: assume resource option is a directory if the name ends with a
+  directory separator.
+- a2x: Added a new syntax to the `--resource` option specifier which
+  allows the destination path to be specified.
+- a2x: Copy resources referenced in the OPF and resources referenced by
+  the generated HTML (in theory DocBook XSL should ensure they are
+  identical but this is not always the case e.g.
+  http://sourceforge.net/tracker/?func=detail&atid=373747&aid=2854075&group_id=21935).
+- Drop border from callout list image links.
+- html4: Moved manpage NAME section out of header so that the name
+  section is rendered when the asciidoc(1) `--no-header-footer` option
+  is specified (so that manpages processed blogpost include the NAME
+  section).
+- Vim syntax highlighter: TODO markers now appear in list items and
+  literal paragraphs and blocks.
+- Constrained quotes can now be bounded on the left by a } character.
+  See:
+  http://groups.google.com/group/asciidoc/browse_thread/thread/b24cc3362f35b801
+- Added text-decoration roles (underline, overline, line-through,
+  blink) for xhtml11 and html5 outputs.
+
+.Bug fixes
+- *FIXED*: epubcheck 1.1 previously issued a warning for files not
+  registered in the manifest (epubcheck 1.0.5 did not). This resulted
+  in a problem compiling the adventures-of-sherlock-holmes.txt example
+  (the `underline.png` resource was not in the manifest).
+
+
 Version 8.6.4 (2011-02-20)
 --------------------------
 .Additions and changes
diff --git a/doc/a2x.1.txt b/doc/a2x.1.txt
index f7b7d96..ecf0fb8 100644
--- a/doc/a2x.1.txt
+++ b/doc/a2x.1.txt
@@ -78,7 +78,7 @@ OPTIONS
   Do not do anything just print what would have been done.
 
 *-r, --resource*='RESOURCE_SPEC'::
-  Specify a resouce.  This option may be specified more than once.
+  Specify a resource.  This option may be specified more than once.
   See the <<X3,*RESOURCES*>> section for more details.
 
 *-m, --resource-manifest*='FILE'::
@@ -192,7 +192,7 @@ There are two distinct mechanisms for specifying additional resources:
 
 . A resource directory which will be searched recursively for missing
   resource files.
-. A resouce file which will be copied to the output destination
+. A resource file which will be copied to the output destination
   directory.
 
 Resources are specified by *--resource* option values and can be one
@@ -232,7 +232,7 @@ Resource specifier examples:
   doc/README.txt=README.txt
   ~/images/tiger.png=images/tiger.png
 
-When adding resources to EPUB files the mimetype is infered from the
+When adding resources to EPUB files the mimetype is inferred from the
 `<destination file>` extension, if the mimetype cannot be guessed an
 error occurs. The `.<ext>=<mimetype>` resource syntax can be used to
 explicitly set mimetypes, for example:
diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict
index 97d8ed2..47ec88a 100644
--- a/doc/asciidoc.dict
+++ b/doc/asciidoc.dict
@@ -1,11 +1,11 @@
-personal_ws-1.1 en 1029 
+personal_ws-1.1 en 1054 
 mandoc
 colspecs
 API
 testcases
 BSBEV
-dblatex
 dapibus
+dblatex
 attributelist
 AttributeList
 Blondel
@@ -32,8 +32,8 @@ BOM
 Bon
 ungenerated
 zipP
-des
 cmd
+des
 ListItems
 dev
 vulputate
@@ -73,6 +73,7 @@ Gao
 nullam
 Moolenaar
 Habitasse
+mimetypes
 dtb
 doctime
 CVS
@@ -123,8 +124,8 @@ xreflabel
 PDF's
 PDFs
 pygmentize
-MSIE
 pede
+MSIE
 permalinks
 Boscombe
 Daly
@@ -136,11 +137,14 @@ listcontinuation
 ListContinuation
 apos
 ShareSource
+epubtest
 projectname
 hoc
-ispum
 Maier
+ispum
+args
 TableFooter
+LiberationSerif
 blog
 passthroughs
 gui
@@ -159,6 +163,7 @@ Makefile
 munere
 Raggett's
 citetitle
+Lai
 guimenuitem
 IRC
 plugin
@@ -195,6 +200,7 @@ JavaScript
 nam
 OEBPS
 symlinks
+confdir
 optionname
 sollicitudin
 companyname
@@ -216,6 +222,7 @@ ItemTerm
 backquotes
 subscripted
 lpr
+autoplay
 Delikatessen
 mydocument
 odf
@@ -224,24 +231,27 @@ tabletags
 morerows
 ListItem
 coids
+nocontrols
 shiftwidth
 nulla
 endDocument
 odt
 Cygwin
+ogg
 ultrices
-indentedparagraph
 IndentedParagraph
+indentedparagraph
 ltr
 doctests
-AsciiDocAPI
 asciidocapi
+AsciiDocAPI
 itemtag
 Dvips
 Jython
 tincidunt
 Solaris
 pdf
+ogv
 authorgroup
 manpages
 ItemText
@@ -275,9 +285,9 @@ lobortis
 Broberg
 Bowlin
 navPoint
-asciimathml
-AsciiMathML
 ASCIIMathML
+AsciiMathML
+asciimathml
 conf
 RCS
 UnicodeDecodeError
@@ -320,6 +330,7 @@ feugiat
 colend
 sprintf
 pyc
+EPUBs
 Zullinger
 AuthorLine
 specialsections
@@ -333,14 +344,15 @@ pgwide
 RevisionDate
 crlf
 tex
-Bólido
 Bolido
+Bólido
 tabsize
 colpcwidth
 Orry
 Nascetur
 onload
 RTF
+Suraj
 quickstart
 fillchar
 bloggs
@@ -350,8 +362,8 @@ Tsawassen
 Aenean
 postsubs
 src
-LastName
 lastname
+LastName
 OpenBlocks
 toc
 tmp
@@ -366,6 +378,7 @@ SVN
 Tps
 vih
 prepended
+ttf
 resx
 startup
 admonitionblock
@@ -392,6 +405,7 @@ Hausmann
 TitleBlock
 txt
 lsquo
+addEventListener
 elit
 Efros's
 sectiontitle
@@ -419,13 +433,14 @@ xml
 XSLTLib
 headrow
 enim
+haad
 staticfree
 Morbi
 Blauer
 footdata
-al
-bg
 cb
+bg
+al
 cd
 xsl
 backmatter
@@ -433,6 +448,7 @@ ar
 fils
 linenumbering
 de
+backend's
 backends
 eb
 br
@@ -442,16 +458,16 @@ fb
 fermentum
 fi
 cellcount
-et
 fo
+et
 eu
 hg
 guimenu
 fugiat
 toclevels
 xzf
-gq
 JB
+gq
 refactored
 sgml
 backcolor
@@ -468,14 +484,14 @@ lf
 defacto
 mb
 IndentedBlocks
-md
 js
+md
 erat
 blogpost
 xsltproc
 jw
-ln
 nd
+ln
 ne
 oa
 Terje
@@ -498,18 +514,20 @@ sb
 ps
 runtime
 tcqn
+ePub
 epub
-px
 td
+px
 vivamus
 py
+getElementById
 addon
 th
 ru
 docname
 ifeval
-su
 uk
+su
 expandtab
 autolabel
 LinuxDoc
@@ -518,8 +536,8 @@ tt
 VM
 Frédérique
 SidebarBlock
-wj
 ut
+wj
 Efros
 param
 Movet
@@ -655,6 +673,7 @@ noincsearch
 Stas
 colspec
 uriStartString
+Hongli
 infile
 suspendisse
 TOCs
@@ -690,6 +709,7 @@ Cerrito
 DocBook's
 fprintf
 mediaobject
+gizmo
 outdir
 getvalue
 callouts
@@ -715,14 +735,17 @@ bibliodiv
 Bushuev
 Inguaggiato
 SectionClose
+overline
 paradef
 QuoteBlocks
 undefine
 docdate
+Kurapati
 Zolochevskiy
 lacus
 felis
 backend
+webm
 ListBlock
 LiteralBlock
 literalblock
@@ -734,8 +757,8 @@ pagebreak
 VariableList
 LiteralBlocks
 Donec
-BLONP
 dbook
+BLONP
 asciimath
 interesset
 pellentesque
@@ -768,8 +791,8 @@ emacs
 consetetur
 JIMI
 newtables
-docbook
 DocBook
+docbook
 callout
 fileextension
 programlisting
@@ -785,11 +808,11 @@ Mihai
 KeyboardInterrupt
 justo
 hexdump
-SectionBody
 sectionbody
+SectionBody
 nnoremap
-verbatimblock
 VerbatimBlock
+verbatimblock
 BulletedList
 html
 unchunked
@@ -817,8 +840,8 @@ basebackend
 urna
 rowsep
 checksums
-BlockMacro
 blockmacro
+BlockMacro
 mailto
 Sagittis
 plugins
@@ -861,18 +884,19 @@ Wieers
 Artem
 startDocument
 ifdef
+Shanahan's
 manmanual
 Konqueror
-FirstName
 firstname
-LaTeXMathML
+FirstName
 latexmathml
+LaTeXMathML
 sectnum
 BlockMacros
 cceeff
 unfloat
-snabbköp
 snabbkop
+snabbköp
 NumberedList
 everti
 multi
@@ -943,8 +967,8 @@ cellpadding
 entrytbl
 Ornare
 authorinitials
-javascripts
 JavaScripts
+javascripts
 undefining
 leveloffset
 CustomBlock
@@ -966,6 +990,7 @@ FilterBlocks
 Julien
 tempor
 WINNT
+boolean
 TableData
 pagefile
 docfile
@@ -1003,8 +1028,8 @@ Redhat
 datadir
 Kumar
 IndentedParagraphs
-Berguvsvagen
 Berguvsvägen
+Berguvsvagen
 executables
 tabledef
 ftdetect
@@ -1025,6 +1050,6 @@ lectus
 JavaHelp
 unescaped
 mydoc
-middlename
 MiddleName
+middlename
 Jimmac's
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index 1237a73..c456f4e 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -744,6 +744,11 @@ is rendered as:
 
 [red]#Obvious# and [big red yellow-background]*very obvious*.
 
+Similarly, CSS rules for text decoration is also included. Examples:
+
+[underline]#Underline text#, [overline]#overline text#,
+[line-through]#line-through text# and [blink]#blink text#.
+
 [[X52]]
 Constrained and Unconstrained Quotes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -2672,7 +2677,7 @@ AsciiDoc block macro syntax `<name>::<target>[<attrlist>]` where:
 [horizontal]
 `<name>`:: 'audio' or 'video'.
 `<target>`:: The URL or file name of the video or audio file.
-`<attrlist>`:: A list of named attritubutes (see below).
+`<attrlist>`:: A list of named attributes (see below).
 
 .Audio macro attributes
 [options="header",cols="1,5",width="50%",frame="topbot"]
@@ -5725,7 +5730,7 @@ header or from the command-line with an `--attribute toc!` option.
 Adds a scrollable table of contents in the left hand margin of an
 article or book document. Use the 'max-width' attribute to change the
 content width. In all other respects behaves the same as the 'toc'
-attibute.
+attribute.
 
 |toc-title |html5, xhtml11 |
 Sets the table of contents title (defaults to 'Table of Contents').
diff --git a/tests/data/testcases.txt b/tests/data/testcases.txt
index 5d16824..8dad760 100644
--- a/tests/data/testcases.txt
+++ b/tests/data/testcases.txt
@@ -96,13 +96,10 @@ A=*_X_*, (`_X_`), _`X`_, [*_X_*] +_X_+ _X_
 
 [foo]+++fun with text+++.
 
-[red]#obvious#
-[big red yellowback]*very obvious*
+[red]#Obvious# and [big red yellow-background]*very obvious*.
 
-[red]#obvious#
-[big red
-yellowback]*very
-obvious*
+[underline]#Underline text#, [overline]#overline text#,
+[line-through]#line-through text# and [blink]#blink text#.
 
 [firstletter]##T##esting 123 ...