- Bumped version number for forthcoming release.

- Updated CHANGELOG for forthcoming release.
- FIXED: Microsoft Windows shelled command-line truncation that caused
  shelled commands to fail e.g. the 'data-uri' attribute failure.

8 files changed, 152 insertions, 44 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 69be7c2..da27c3d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,89 @@ AsciiDoc ChangeLog
 :website: http://www.methods.co.nz/asciidoc/
 
 
+Version 8.6.7 (2012-03-17)
+--------------------------
+.All additions and changes
+- Vim sytnax highlighter: highlight entity refs in macro arguments.
+- Added files with `.asciidoc` extension to Vim file type detection.
+  http://groups.google.com/group/asciidoc/browse_thread/thread/a9762e21ec0cc244/5d3a4ebf20e6847e[Patch]
+  submitted by Dag Wiers.
+- Added 'replacement3' substitution to enable
+  http://groups.google.com/group/asciidoc/browse_thread/thread/843d7d3d671006fb/25628e14c829db3f[ODT
+  whitespace processing].
+- Added 'unbreakable' option to XHTML and HTML 5 backends.
+- Implemented toc::[] block macro and 'toc-placement' attribute for
+  HTML backends to allow the Table of Contents placement to be set
+  manually by the author.
+- Added FAQs: 'How can I control page breaks when printing HTML
+  outputs?' and ' 'Is it possible to reposition the Table of Contents
+  in HTML outputs?'.
+- Added `--backend` and `--backend-opts` options to the 'a2x' command
+  to allow 'a2x' to use backend plugin code extensions.
+  http://groups.google.com/group/asciidoc/browse_thread/thread/b8e93740b7cd0e1d/b5e0b83fe37ae31a[Patch]
+  submitted by Lex Trotman.
+- Added
+  http://groups.google.com/group/asciidoc/browse_thread/thread/3d06b0105dfbb780/8c60eb7a62f522e4[args
+  block attribute] to source highlight blocks to allow arbitrary
+  parameters to be passed to the source highlighters.
+- If the 'ascii-ids' attribute is defined then non-ascii characters in
+  auto-generated IDs
+  http://groups.google.com/group/asciidoc/browse_thread/thread/33e99b78e2472122[are
+  replaced] by their nearest ascii equivalents (to work around DocBook
+  processor limitations).
+- Added global 'blockname' attribute which is dynamically updated to
+  identify the current block.  See
+  http://groups.google.com/group/asciidoc/browse_thread/thread/8200e29815c40f72[discussion
+  list].
+- 'xhtml11', 'html5' backends: Include book part TOC entries for
+  multi-part books.  Patch submitted by Loïc Paillotin.
+- Removed code filter example from the AsciiDoc User Guide so that
+  backends implemented as external plugins can compile the manual. See
+  http://groups.google.com/group/asciidoc/browse_thread/thread/849e5ea91f43adf2[discussion
+  list].
+- If the delimited block 'skip' option is set then do not consume
+  block title and attributes. This makes it possible for the comment
+  delimited blocks to use an attribute list (previously the comment
+  delimited block was hardwired to skip preceding attributes and
+  titles). See
+  http://groups.google.com/group/asciidoc/browse_thread/thread/e92a75abcc382701[discussion
+  list].
+- Added `backend-confdir` intrinsic attribute.
+
+.Bug fixes
+- *FIXED*: slidy backend: broken 'stylesheet' attribute.
+  http://groups.google.com/group/asciidoc/browse_thread/thread/58d0843ae4345afd[Patch]
+  submitted by Micheal Hackett.
+- *FIXED*: Restored
+  http://groups.google.com/group/asciidoc/browse_thread/thread/b0e69e393b6f9f20/47a2c7586f9e40c6?lnk=gst&q=themes+tarball#47a2c7586f9e40c6[missing
+  themes] to zip file distribution archive.
+- *FIXED*: Grammatical error in error messages.
+  http://groups.google.com/group/asciidoc/browse_thread/thread/b9d705c6b6b39f59/1e120483dafca109[Patch]
+  submitted by Dag Wieers.
+- *FIXED*: Use configured normal substitution in preference to the
+  default one.
+- *FIXED*: The 'eval' block macro would execute multiple times if it
+  evaluated to 'None'.
+- *FIXED*: Duplicated entries in TOC of large document.
+  http://groups.google.com/group/asciidoc/browse_thread/thread/103445ab9d95cb0c[Patch]
+  submitted by Sebastien Helleu.
+- *FIXED*: Python 2.4 backward
+  http://code.google.com/p/asciidoc/issues/detail?id=9[incompatibility].
+- *FIXED*: 8.6.6 regression broke Jython compatibility.  See
+  http://groups.google.com/group/asciidoc/browse_thread/thread/4608b77ec289f6c4[discussion
+  list].
+- *FIXED*: Leaky file handles in a2x and music and latex filters which
+  created incompatibility problems for Jython.
+- *FIXED*: All Python filters are executed with the same Python
+  interpreter that executes the asciidoc parent (previously filters
+  were hardwired to execute the 'python' interpreter). This prevents
+  http://groups.google.com/group/asciidoc/browse_thread/thread/14e8fcb289a135b/3af3b4e57b827c78?lnk=gst&q=archlinux#3af3b4e57b827c78[Python
+  mixups].
+- *FIXED*: Microsoft Windows shelled command-line truncation that
+  caused shelled commands to fail e.g. the 'data-uri' attribute
+  failure.
+
+
 Version 8.6.6 (2011-09-04)
 --------------------------
 .Release highlights
diff --git a/a2x.py b/a2x.py
index 498d729..c0d01f1 100755
--- a/a2x.py
+++ b/a2x.py
@@ -23,7 +23,7 @@ import xml.dom.minidom
 import mimetypes
 
 PROG = os.path.basename(os.path.splitext(__file__)[0])
-VERSION = '8.6.6'
+VERSION = '8.6.7'
 
 # AsciiDoc global configuration file directory.
 # NOTE: CONF_DIR is "fixed up" by Makefile -- don't rename or change syntax.
@@ -206,9 +206,10 @@ def shell(cmd, raise_error=True):
             mo = re.match(r'^\s*(?P<arg0>[^ ]+)', cmd)
         if mo.group('arg0').endswith('.py'):
             cmd = 'python ' + cmd
-    # Remove redundant quoting -- this is not just costmetic, quoting seems to
-    # dramatically decrease the allowed command length in Windows XP.
-    cmd = re.sub(r'"([^ ]+?)"', r'\1', cmd)
+        # Remove redundant quoting -- this is not just cosmetic,
+        # quoting seems to dramatically decrease the allowed command
+        # length in Windows XP.
+        cmd = re.sub(r'"([^ ]+?)"', r'\1', cmd)
     verbose('executing: %s' % cmd)
     if OPTIONS.dry_run:
         return
diff --git a/asciidoc.py b/asciidoc.py
index 1b516be..ed520c4 100755
--- a/asciidoc.py
+++ b/asciidoc.py
@@ -9,7 +9,7 @@ under the terms of the GNU General Public License (GPL).
 import sys, os, re, time, traceback, tempfile, subprocess, codecs, locale, unicodedata, copy
 
 ### Used by asciidocapi.py ###
-VERSION = '8.6.6'           # See CHANGLOG file for version history.
+VERSION = '8.6.7'           # See CHANGLOG file for version history.
 
 MIN_PYTHON_VERSION = '2.4'  # Require this version of Python or better.
 
@@ -807,6 +807,11 @@ def filter_lines(filter_cmd, lines, attrs={}):
             filter_cmd = 'ruby ' + filter_cmd
 
     message.verbose('filtering: ' + filter_cmd)
+    if os.name == 'nt':
+        # Remove redundant quoting -- this is not just
+        # cosmetic, unnecessary quoting appears to cause
+        # command line truncation.
+        filter_cmd = re.sub(r'"([^ ]+?)"', r'\1', filter_cmd)
     try:
         p = subprocess.Popen(filter_cmd, shell=True,
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
@@ -877,9 +882,15 @@ def system(name, args, is_macro=False, attrs=None):
         os.close(fd)
         try:
             cmd = args
-            cmd = cmd + (' > %s' % tmp)
+            cmd = cmd + (' > "%s"' % tmp)
             if name == 'sys2':
                 cmd = cmd + ' 2>&1'
+            if os.name == 'nt':
+                # Remove redundant quoting -- this is not just
+                # cosmetic, unnecessary quoting appears to cause
+                # command line truncation.
+                cmd = re.sub(r'"([^ ]+?)"', r'\1', cmd)
+            message.verbose('shelling: %s' % cmd)
             if os.system(cmd):
                 message.warning('%s: non-zero exit status' % syntax)
             try:
diff --git a/common.aap b/common.aap
index 46f0993..89c0695 100644
--- a/common.aap
+++ b/common.aap
@@ -2,8 +2,8 @@
 # Executed by all main.aap's before anything else.
 #
 
-_parent.VERS = 8.6.6
-_parent.DATE = 4 September 2011
+_parent.VERS = 8.6.7
+_parent.DATE = 17 March 2012
 
 all:
     :pass
diff --git a/configure.ac b/configure.ac
index 9825c1c..4dc1776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asciidoc, 8.6.6)
+AC_INIT(asciidoc, 8.6.7)
 
 AC_CONFIG_FILES(Makefile)
 
diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict
index fb27aef..5e853e4 100644
--- a/doc/asciidoc.dict
+++ b/doc/asciidoc.dict
@@ -4,8 +4,8 @@ colspecs
 API
 testcases
 BSBEV
-dapibus
 dblatex
+dapibus
 mycss
 attributelist
 AttributeList
@@ -33,8 +33,8 @@ BOM
 Bon
 ungenerated
 zipP
-cmd
 des
+cmd
 ListItems
 dev
 vulputate
@@ -128,8 +128,8 @@ xreflabel
 PDF's
 PDFs
 pygmentize
-pede
 MSIE
+pede
 permalinks
 Boscombe
 Daly
@@ -144,8 +144,8 @@ ShareSource
 epubtest
 projectname
 hoc
-Maier
 ispum
+Maier
 args
 TableFooter
 LiberationSerif
@@ -201,8 +201,8 @@ mea
 jqs
 PassthroughBlocks
 blockdef
-javascript
 JavaScript
+javascript
 nam
 OEBPS
 symlinks
@@ -245,12 +245,12 @@ odt
 Cygwin
 ogg
 ultrices
-IndentedParagraph
 indentedparagraph
+IndentedParagraph
 ltr
 doctests
-asciidocapi
 AsciiDocAPI
+asciidocapi
 itemtag
 Dvips
 Jython
@@ -291,9 +291,9 @@ lobortis
 Broberg
 Bowlin
 navPoint
-ASCIIMathML
-AsciiMathML
 asciimathml
+AsciiMathML
+ASCIIMathML
 conf
 RCS
 UnicodeDecodeError
@@ -351,8 +351,8 @@ pgwide
 RevisionDate
 crlf
 tex
-Bolido
 Bólido
+Bolido
 tabsize
 colpcwidth
 Orry
@@ -369,8 +369,8 @@ Tsawassen
 Aenean
 postsubs
 src
-lastname
 LastName
+lastname
 OpenBlocks
 toc
 tmp
@@ -447,9 +447,9 @@ staticfree
 Morbi
 Blauer
 footdata
-cb
-bg
 al
+bg
+cb
 cd
 xsl
 backmatter
@@ -467,16 +467,16 @@ fb
 fermentum
 fi
 cellcount
-fo
 et
+fo
 eu
 hg
 guimenu
 fugiat
 toclevels
 xzf
-JB
 gq
+JB
 refactored
 sgml
 backcolor
@@ -493,14 +493,14 @@ lf
 defacto
 mb
 IndentedBlocks
-js
 md
+js
 erat
 blogpost
 xsltproc
 jw
-nd
 ln
+nd
 ne
 oa
 Terje
@@ -525,19 +525,19 @@ runtime
 tcqn
 ePub
 epub
-td
 px
+td
 vivamus
 py
 getElementById
 addon
 th
-ru
 sp
+ru
 docname
 ifeval
-uk
 su
+uk
 expandtab
 autolabel
 LinuxDoc
@@ -546,8 +546,8 @@ tt
 VM
 Frédérique
 SidebarBlock
-ut
 wj
+ut
 Efros
 param
 Movet
@@ -777,8 +777,8 @@ interesset
 pellentesque
 formatlistpat
 IMGs
-attributeentry
 AttributeEntry
+attributeentry
 Zuckschwerdt
 autoindent
 sectids
@@ -804,8 +804,8 @@ emacs
 consetetur
 JIMI
 newtables
-DocBook
 docbook
+DocBook
 callout
 fileextension
 programlisting
@@ -821,11 +821,11 @@ Mihai
 KeyboardInterrupt
 justo
 hexdump
-sectionbody
 SectionBody
+sectionbody
 nnoremap
-VerbatimBlock
 verbatimblock
+VerbatimBlock
 BulletedList
 html
 unchunked
@@ -853,8 +853,8 @@ basebackend
 urna
 rowsep
 checksums
-blockmacro
 BlockMacro
+blockmacro
 mailto
 Sagittis
 plugins
@@ -900,16 +900,16 @@ ifdef
 Shanahan's
 manmanual
 Konqueror
-firstname
 FirstName
-latexmathml
+firstname
 LaTeXMathML
+latexmathml
 sectnum
 BlockMacros
 cceeff
 unfloat
-snabbkop
 snabbköp
+snabbkop
 NumberedList
 everti
 multi
@@ -981,8 +981,8 @@ cellpadding
 entrytbl
 Ornare
 authorinitials
-JavaScripts
 javascripts
+JavaScripts
 undefining
 viewport
 leveloffset
@@ -1044,8 +1044,8 @@ Redhat
 datadir
 Kumar
 IndentedParagraphs
-Berguvsvägen
 Berguvsvagen
+Berguvsvägen
 executables
 tabledef
 ftdetect
@@ -1066,6 +1066,6 @@ lectus
 JavaHelp
 unescaped
 mydoc
-MiddleName
 middlename
+MiddleName
 Jimmac's
diff --git a/examples/website/asciidoc-website.dict b/examples/website/asciidoc-website.dict
index 7a59833..1092d0a 100644
--- a/examples/website/asciidoc-website.dict
+++ b/examples/website/asciidoc-website.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 225 
+personal_ws-1.1 en 238 
 O'Reilly
 awb
 Blogpost
@@ -69,6 +69,7 @@ Slackware
 CouchDB
 Wesnoth
 matplotlib
+adoc
 stdout
 usr
 txt
@@ -82,7 +83,9 @@ qanda
 GPL
 roff
 README
+Trotman
 xhtml
+Stylesheet
 inline
 weblog
 xmllint
@@ -97,6 +100,7 @@ asciidocapi
 Pommereau
 epub
 Iisaka's
+Hou
 doctests
 backends
 Gingras
@@ -117,6 +121,7 @@ xsl
 iOS
 arabic
 Neuburg
+Ilya
 tablewidth
 testasciidoc
 Volnitsky's
@@ -125,14 +130,17 @@ RPMs
 symlink
 newtables
 cd
+Qingping
 Calixto
 scaledwidth
 xzf
 xmlto
+Lex
 refname
 html
 online
 lim
+el
 mkdir
 Kurapati
 Solaris
@@ -148,7 +156,9 @@ Maier
 DelimitedBlocks
 Berker
 Neo
+js
 AsciiDocGen
+Portnov
 CRAN
 jw
 ln
@@ -183,20 +193,22 @@ SourceForge
 ascii
 Obenhuber's
 CHANGLOG
-docbook
 DocBook
+docbook
 fontlocking
 Rosenkraenzer
 toolchain
 slidy
 ebuild
 syntaxes
+Tomayko
 toclevels
 Eychaner
 OPF
 Yannick
 repo
 showcomments
+github
 plugins
 Xubuntu
 AsciiDoc's
@@ -221,6 +233,7 @@ passthrough
 asc
 sqrt
 TODO
+GPLv
 Cheatsheet
 manpage
 Avsajanishvili
diff --git a/examples/website/index.txt b/examples/website/index.txt
index 36aaee9..33e5691 100644
--- a/examples/website/index.txt
+++ b/examples/website/index.txt
@@ -11,7 +11,7 @@ AsciiDoc Home Page
 
 .{revdate}: AsciiDoc {revnumber} Released
 ************************************************************************
-Read the link:CHANGELOG.html[CHANGELOG] for release hightlights and a
+Read the link:CHANGELOG.html[CHANGELOG] for release highlights and a
 full list of all additions, changes and bug fixes. Changes are
 documented in the updated link:userguide.html[User Guide]. See the
 link:INSTALL.html[Installation page] for downloads and and