Bump version number and update release docs.8.5.3

10 files changed, 101 insertions, 36 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index de15f88..1754cf6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,41 @@ AsciiDoc ChangeLog
 

 :replacements.\bweb:: http://www.methods.co.nz/asciidoc/

 

+Version 8.5.3 (2010-01-18)

+--------------------------

+.Additions and changes

+- a2x: Added a2x configuration file options ASCIIDOC_OPTS,

+  DBLATEX_OPTS, FOP_OPTS, XSLTPROC_OPTS (appended to same-named

+  command-line options). See

+  http://groups.google.com/group/asciidoc/browse_frm/thread/ac4b9bfa2116db28

+- Dropped `.hgignore` from the repository. See

+  http://groups.google.com/group/asciidoc/browse_frm/thread/c17abd175778f5ea

+- Don't pass verbose options to asciidoc table filter so that

+  asciidocapi messages are not discarded. See:

+  http://groups.google.com/group/asciidoc/browse_frm/thread/c17abd175778f5ea

+- Added `./tests/data/lang-pt-BR-test.txt` file to the repository.

+- xhtml11: Verse block and verse paragraph content enveloped in a

+  'pre' tag (instead of a 'div') so it renders better in text-only

+  browsers. See:

+  http://groups.google.com/group/asciidoc/browse_frm/thread/1b6b66adb24e710

+- User Guide: Clarified Passthrough Blocks (suggested by Simon

+  Ruderich).

+- FAQ: 'How can I include lines of dashes inside a listing block?'

+- FAQ errata and updates (submitted by Simon Ruderich).

+- User Guide errata.

+- Simplified 'asciidoc-toc' processing instruction and included lists

+  of figures, tables, examples and equations in books (i.e. revert to

+  pre-8.5.0 behavior).

+- Attempted to have dblatex recognise the 'asciidoc-toc' processing

+  instruction but couldn't get it to work.

+- Added 'notitle' attribute to allow the document title to be hidden.

+

+

+.Bug fixes

+- *FIXED*: Regression: system attribute escaping did not work.

+- *FIXED*: Website: broken image links in chunked User Guide.

+

+

 Version 8.5.2 (2009-12-07)

 --------------------------

 .Additions and changes

diff --git a/README.txt b/README.txt
index 9ad9d65..8f76a5c 100644
--- a/README.txt
+++ b/README.txt
@@ -29,6 +29,6 @@ Current AsciiDoc version tested on Xubuntu Linux 8.04 with:
 

 COPYING

 -------

-Copyright (C) 2002-2009 Stuart Rackham. Free use of this software

+Copyright (C) 2002-2010 Stuart Rackham. Free use of this software

 is granted under the terms of the GNU General Public License (GPL).

 

diff --git a/a2x.py b/a2x.py
index eb305d1..186ccdf 100755
--- a/a2x.py
+++ b/a2x.py
@@ -32,8 +32,9 @@ CONF_DIR = '/etc/asciidoc'
 # Default configuration file parameters.
 ######################################################################
 
-# Optional environment variable dictionary passed to executing programs.
-# If set to None the existing environment is used.
+# Optional environment variable dictionary passed to
+# executing programs. If set to None the existing
+# environment is used.
 ENV = None
 
 # External executables.
@@ -45,6 +46,7 @@ W3M = 'w3m'                 # text generation.
 LYNX = 'lynx'               # text generation (if no w3m).
 XMLLINT = 'xmllint'         # Set to '' to disable.
 EPUBCHECK = 'epubcheck'     # Set to '' to disable.
+# External executable default options.
 ASCIIDOC_OPTS = ''
 DBLATEX_OPTS = ''
 FOP_OPTS = ''
diff --git a/asciidoc.py b/asciidoc.py
index 941a516..28a4606 100755
--- a/asciidoc.py
+++ b/asciidoc.py
@@ -2,14 +2,14 @@
 """
 asciidoc - converts an AsciiDoc text file to DocBook, HTML or LinuxDoc
 
-Copyright (C) 2002-2009 Stuart Rackham. Free use of this software is granted
+Copyright (C) 2002-2010 Stuart Rackham. Free use of this software is granted
 under the terms of the GNU General Public License (GPL).
 """
 
 import sys, os, re, time, traceback, tempfile, subprocess, codecs, locale
 
 ### Used by asciidocapi.py ###
-VERSION = '8.5.2'           # See CHANGLOG file for version history.
+VERSION = '8.5.3'           # See CHANGLOG file for version history.
 
 MIN_PYTHON_VERSION = 2.4    # Require this version of Python or better.
 
diff --git a/common.aap b/common.aap
index 1809f11..e0ba5c4 100644
--- a/common.aap
+++ b/common.aap
@@ -2,8 +2,8 @@
 # Executed by all main.aap's before anything else.
 #
 
-_parent.VERS = 8.5.2
-_parent.DATE = 7 December 2009
+_parent.VERS = 8.5.3
+_parent.DATE = 18 January 2010
 
 all:
     :pass
diff --git a/doc/a2x.1.txt b/doc/a2x.1.txt
index bf052f9..1fab2ba 100644
--- a/doc/a2x.1.txt
+++ b/doc/a2x.1.txt
@@ -178,6 +178,30 @@ files are loaded in the following order:
 . `a2x.conf` from the directory containing 'a2x.py'.
 . The 'CONF_FILE' specified in the '--conf-file' option.
 
+Here are the default configuration file option values:
+
+---------------------------------------------------------------------
+# Optional environment variable dictionary passed to
+# executing programs. If set to None the existing
+# environment is used.
+ENV = None
+
+# External executables.
+ASCIIDOC = 'asciidoc'
+XSLTPROC = 'xsltproc'
+DBLATEX = 'dblatex'         # pdf generation.
+FOP = 'fop'                 # pdf generation (--fop option).
+W3M = 'w3m'                 # text generation.
+LYNX = 'lynx'               # text generation (if no w3m).
+XMLLINT = 'xmllint'         # Set to '' to disable.
+EPUBCHECK = 'epubcheck'     # Set to '' to disable.
+# External executable default options.
+ASCIIDOC_OPTS = ''
+DBLATEX_OPTS = ''
+FOP_OPTS = ''
+XSLTPROC_OPTS = ''
+---------------------------------------------------------------------
+
 
 BUGS
 ----
@@ -198,6 +222,6 @@ Main web site: http://www.methods.co.nz/asciidoc/
 
 COPYING
 -------
-Copyright \(C) 2002-2009 Stuart Rackham. Free use of this software is
+Copyright \(C) 2002-2010 Stuart Rackham. Free use of this software is
 granted under the terms of the MIT license.
 
diff --git a/doc/asciidoc.1.txt b/doc/asciidoc.1.txt
index 2c988e3..f91376c 100644
--- a/doc/asciidoc.1.txt
+++ b/doc/asciidoc.1.txt
@@ -117,6 +117,6 @@ Main web site: <http://www.methods.co.nz/asciidoc/>
 

 COPYING

 -------

-Copyright \(C) 2002-2009 Stuart Rackham. Free use of this software is

+Copyright \(C) 2002-2010 Stuart Rackham. Free use of this software is

 granted under the terms of the GNU General Public License (GPL).

 

diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict
index 56d4c7d..dd1cda0 100644
--- a/doc/asciidoc.dict
+++ b/doc/asciidoc.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 838 
+personal_ws-1.1 en 847 
 mandoc
 colspecs
 API
@@ -26,8 +26,8 @@ LiteralParagraph
 BOM
 Bon
 ungenerated
-cmd
 des
+cmd
 ListItems
 dev
 vulputate
@@ -64,11 +64,13 @@ Graphviz
 toclevel
 hyperlinks
 dsv
+ENV
 dvi
 stderr
 SimpleSection
 gif
 prepend
+RevisionNumber
 CommentBlocks
 consequat
 fmt
@@ -81,9 +83,10 @@ hhc
 Chai
 strongwords
 setlocal
-listingblock
 ListingBlock
+listingblock
 exe
+AuthorInfo
 vsides
 rewriteSystem
 taoup
@@ -92,8 +95,8 @@ listelement
 AttributeLists
 magna
 xreflabel
-PDFs
 PDF's
+PDFs
 MSIE
 permalinks
 Daly
@@ -106,8 +109,8 @@ ListContinuation
 apos
 ShareSource
 hoc
-Maier
 ispum
+Maier
 TableFooter
 blog
 passthroughs
@@ -216,9 +219,9 @@ BlockId
 png
 lobortis
 Bowlin
-ASCIIMathML
-AsciiMathML
 asciimathml
+AsciiMathML
+ASCIIMathML
 conf
 RCS
 CalloutList
@@ -232,6 +235,7 @@ pre
 tzname
 ListParagraph
 Windtrainer
+hgignore
 eget
 sed
 userguide
@@ -261,10 +265,11 @@ qui
 SJR
 biggy
 pgwide
+RevisionDate
 crlf
 tex
-Bolido
 Bólido
+Bolido
 tabsize
 colpcwidth
 onload
@@ -277,8 +282,8 @@ listdef
 Tsawassen
 postsubs
 src
-lastname
 LastName
+lastname
 toc
 tmp
 Knisley
@@ -318,13 +323,13 @@ revisionhistory
 params
 undefines
 Andrés
-HTMLHelp
 htmlhelp
+HTMLHelp
 cellspacing
 Citeaux
 srackham
-Lulea
 Luleå
+Lulea
 Ubuntu
 xml
 XSLTLib
@@ -357,8 +362,8 @@ gq
 refactored
 sgml
 backcolor
-asciidoc
 AsciiDoc
+asciidoc
 subslist
 hs
 hu
@@ -447,6 +452,7 @@ linux
 commodo
 Fernandes
 Pretium
+notitle
 manvolnum
 homero
 listindex
@@ -516,6 +522,7 @@ smallnew
 linkcss
 colspan
 localtime
+Ruderich
 noincsearch
 Stas
 colspec
@@ -620,6 +627,7 @@ QuoteBlock
 chmod
 posattrs
 subdirectories
+RevisionRemark
 TableHeader
 Mihai
 KeyboardInterrupt
@@ -728,6 +736,7 @@ BONAP
 ItemContinuation
 tyger
 upperroman
+RevisionInfo
 Berglunds
 nabc
 symlinked
@@ -815,8 +824,8 @@ Redhat
 datadir
 Kumar
 IndentedParagraphs
-Berguvsvägen
 Berguvsvagen
+Berguvsvägen
 executables
 tabledef
 ftdetect
@@ -834,6 +843,6 @@ Firefox
 JavaHelp
 unescaped
 mydoc
-MiddleName
 middlename
+MiddleName
 Jimmac's
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index 8d15d42..4e506f0 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -25,7 +25,7 @@ source files in the distribution `doc` directory.
 Plain text is the most universal electronic document format,
 regardless of your computing environment you can always read and write
 plain text documentation. But for many applications plain text is not
-the prefered presentation format -- HTML and PDF formats are widely
+the preferred presentation format -- HTML and PDF formats are widely
 used as is the roff man page format.  DocBook is a popular
 documentation markup format which can be translated to HTML, PDF and
 other presentation formats.
@@ -92,7 +92,7 @@ AsciiDoc Document Types
 -----------------------
 There are three types of AsciiDoc documents: article, book and
 manpage. All document types share the same AsciiDoc format with some
-minor variations. If you are familar with DocBook you will have
+minor variations. If you are familiar with DocBook you will have
 noticed that AsciiDoc document types correspond to the same-named
 DocBook document types).
 
@@ -1006,7 +1006,7 @@ NOTE: Because <<X64,lists>> can be indented it's possible for your
 indented paragraph to be misinterpreted as a list -- in situations
 like this apply the 'literal' style to a normal paragraph.
 
-Instead of using a paragraph indent you could applie the 'literal'
+Instead of using a paragraph indent you could apply the 'literal'
 style explicitly, for example:
 
 ---------------------------------------------------------------------
@@ -1054,7 +1054,7 @@ paragraph. For example:
   NOTE: This is an example note.
 
 Alternatively, you can specify the paragraph admonition style
-explicity using an <<X79,AttributeList element>>. For example:
+explicitly using an <<X79,AttributeList element>>. For example:
 
   [NOTE]
   This is an example note.
@@ -2253,7 +2253,7 @@ The block `image` macro has the same <<X55,macro attributes>> as it's
 
 Block images can be titled by preceding the 'image' macro with a
 'BlockTitle'.  DocBook toolchains normally number titled block images
-and optionally list them in an automatically gnerated 'List of
+and optionally list them in an automatically generated 'List of
 Figures' backmatter section.
 
 This example:
@@ -4375,7 +4375,7 @@ If the filter command does not specify a directory path then
 asciidoc(1) searches for the command:
 
 - First it looks in the user's `$HOME/.asciidoc/filters` directory.
-- Next the global filters directory (ususally `/etc/asciidoc/filters`
+- Next the global filters directory (usually `/etc/asciidoc/filters`
   or `/usr/local/etc/asciidoc`) directory is searched.
 - Then it looks in the asciidoc(1) `./filters` directory.
 - Finally it relies on the executing shell to search the environment
diff --git a/examples/website/index.txt b/examples/website/index.txt
index f1d0d7f..3d7ae21 100644
--- a/examples/website/index.txt
+++ b/examples/website/index.txt
@@ -3,13 +3,8 @@ AsciiDoc Home Page
 

 .{revdate}: AsciiDoc {revnumber} Released

 ************************************************************************

-In addition to Vim syntax highlighter improvements this release

-contains quite a few (fairly minor) improvements plus a few bug fixes.

-

-Although it does not involve anything new, it is now recommended that

-special sections be specified using the explicit section name syntax

-rather than special section titles (see  the 'Special section titles

-vs. explicit template names' sidebar in the AsciiDoc 'User Guide').

+This release contains a few improvements, a couple of bug fixes and

+documentation updates.

 

 Read the link:CHANGELOG.html[CHANGELOG] for a full list of all

 additions, changes and bug fixes. Changes are documented in the