Update to 8.2.5:

1. Version 8.2.5 (2007-11-18)

   Bug fixes
     * Fixed exception thrown by illegal command-line arguments.
     * Rolled back the with warning bug fix introduced in 8.2.4 -- it was
       incompatible with Python <2.5.
     __________________________________________________________________

2. Version 8.2.4 (2007-11-10)

   Additions and changes
     * You can now use the lang attribute to set the DocBook language
       attribute.
     * Attribute values can now contain attribute references.
     * If the lang attribute is defined then configuration files named
       like lang-<lang>.conf will be loaded automatically.
     * The help file name help-<lang>.conf is based on the AsciiDoc lang
       attribute, defaults to help.conf (English).
     * Admonition, figure and table captions have been factored into a
       predefined set of caption_* attributes. They only apply to directly
       generated (X)HTML outputs (DocBook stylesheets generate their own
       language specific captions based on the lang attribute).
     * Dropped platform dependent doc/asciidoc.chm file from distribution
       documentation formats.

   Bug fixes
     * The spurious warning with will become a reserved keyword in Python
       2.6 has been suppressed.
     __________________________________________________________________

3. Version 8.2.3 (2007-09-12)

   Additions and changes
     * Added VMiklos's permalink patch for auto-generated section IDs
       (enabled by default by the sectids attribute).
     * Added [1]FAQ to website.
     * Changed format of {localdate} attribute to ISO 8601 (%Y-%m-%d).
     * Added abc2ly --beams=None option to make music2png.py conform to
       ABC's notion of beams.
     * XHTML level 2 section headings are now styled with an underlining
       border.
     * XHTML links to AsciiDoc title elements are now implemented with
       title ID attributes (previously separate <a> element targets were
       generated.
     * Multi-word first, middle and last names can be entered in the
       header author line using the underscore as a word separator.
     * The nested inline macros restriction has now been lifted, for
       example you can now include links and inline images inside
       footnotes.
     * Help topic names can be shortened (so long as they are not
       ambiguous). For example asciidoc -hm will print the AsciiDoc man
       page.
     * Added {two_colons} and {two_semicolons} attributes for escaping
       labeled list ambiguity.
     * If quirks mode is disabled the XHTML Mime Type is set to the
       recommended application/xhtml+xml (rather than text/html).

   Bug fixes
     * Author information is now correctly set when using attribute
       entries in the header instead of an author line (previously the
       author attribute was not being calculated correctly and there were
       attribute substitution problems).
     __________________________________________________________________

4. Version 8.2.2 (2007-07-22)

   Additions and changes
     * [2]LaTeXMathML capability has been added for users who are more
       familiar with or prefer LaTeX math formulas to the [3]ASCIIMathML
       notation (thanks to Arthur Sakellariou for the patch).
     * The source highlight and code filters now process embedded
       callouts.
     * Added an --attribute=ATTRIBUTE option to a2x(1) for passing
       attribute values to asciidoc(1) (a shortcut for --asciidoc-opts="-a
       ATTRIBUTE").
     * Image block and inline macros prepend optional {imagesdir}
       attribute to image link targets.

   Bug fixes
     * Fixed an assertion error that occurred when a configuration file
       containing an include::[] macro was loaded using the --conf-file
       option and the configuration file name did not include an explicit
       directory path -- patch submitted by Dmitry Potapov.
     * Asciidoc titles are only converted to lower case if all characters
       are upper case otherwise case is left unchanged -- patch submitted
       by Dmitry Potapov.
     * Added a missing check that input is not stdin before loading
       configuration files from the document directory -- patch submitted
       by Dmitry Potapov.
     * Attribute list items must evaluate to strings, numbers or None
       (previously it was possible to evaluate to other object types which
       resulted in surprising attribute values).
     * If an AsciiDoc document has no title an empty XHTML 1.1 title
       element is created -- previously the title element was dropped
       which resulted in invalid XHTML 1.1.
     * The Vim syntax file no longer highlights escaped callouts.
     * The Vim syntax highlighter now correctly highlights Double-dollar
       passthroughs when they enclose dollar delimited ASCIIMathML and
       LaTeXMathML formulas.
     __________________________________________________________________

5. Version 8.2.1 (2007-04-06)

   Additions and changes
     * A number of improvements have been made to the Vim syntax
       highlighter, for example the word C++ is no longer mistaken for the
       start of an unconstrained monospace quote.
     * Labeled list definitions have been tightened -- a list label can no
       longer containing trailing spaces. The following example is no
       longer recognized as a valid list label:

     Lorum ipsum ::
       This change implements the originally intended behavior (as per the
       AsciiDoc documentation and examples) so there should be very few
       compatibility issues.
     __________________________________________________________________

6. Version 8.2.0 (2007-04-04)

   Additions and changes
     * A Vim syntax file is now included in the AsciiDoc distribution
       (inspired by Felix Obenhuber's asciidoc.vim script). You can find
       it (along with a Vim filetype detection script in the distribution
       ./vim/ directory (the scripts are installed automatically by the
       AsciiDoc installer ./install.sh). See Appendix J of the AsciiDoc
       User Guide for details.
     * Added toclevel attribute (1..4) which sets the number of title
       levels reported in the table of contents. Defaults to 2 and must be
       used with the toc attribute. Example usage:

     $ asciidoc -a toc -a toclevels=3 doc/asciidoc.txt
     * Added a listindex attribute which is the current list item index
       (1..). If this attribute appears outside a list its value is the
       number of items in the most recently closed list.
     * The single line titles syntax now accepts trailing suffixes -- this
       syntax matches the title line syntax of a number of popular Wiki
       markups.
     * If a QuoteBlock has no attribution or citetitle then the DocBook
       <attribution> element is not generated (previously generated empty
       <attribution> element).
     * If the text of a labeled list item is blank then no texttag is
       written.
     * An end of line backslash performs line continuation for horizontal
       labeled list items.
     * The Revision line now accommodates Subversion $Id markers (in
       addition to CVS and RCS markers). Thanks to Tiago Sturmer Daitx for
       this patch.
     * Implemented a2x(1) option --skip-asciidoc which allows a2x(1) to
       convert DocBook XML files not derived from AsciiDoc sources.
     * If a2x(1) --doctype option is not specified it defaults to manpage
       if --format=manpage else defaults to article (previously --doctype
       always defaulted to article).
     * Added an External Resources section to the [4]AsciiDoc home page.

3 files changed, 10 insertions, 9 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 35c14bdc7c7..d2e8e5f594e 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/05/01 12:24:36 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2007/11/29 22:20:29 wiz Exp $
 #
 
-DISTNAME=		asciidoc-8.1.0
-PKGREVISION=		2
+DISTNAME=		asciidoc-8.2.5
 CATEGORIES=		textproc
 MASTER_SITES=		${HOMEPAGE}	\
 			${MASTER_SITE_SOURCEFORGE:=asciidoc/}
diff --git a/textproc/asciidoc/PLIST b/textproc/asciidoc/PLIST
index 66dd34240ff..d1f54b0711d 100644
--- a/textproc/asciidoc/PLIST
+++ b/textproc/asciidoc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/05/01 12:24:36 gdt Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/11/29 22:20:29 wiz Exp $
 bin/a2x
 bin/asciidoc
 man/man1/a2x.1
@@ -44,7 +44,9 @@ share/asciidoc/images/icons/tip.png
 share/asciidoc/images/icons/up.png
 share/asciidoc/images/icons/warning.png
 share/asciidoc/javascripts/ASCIIMathML.js
+share/asciidoc/javascripts/LaTeXMathML.js
 share/asciidoc/javascripts/toc.js
+share/asciidoc/lang-es.conf
 share/asciidoc/latex.conf
 share/asciidoc/linuxdoc.conf
 share/asciidoc/stylesheets/docbook-xsl.css
@@ -58,8 +60,8 @@ share/asciidoc/xhtml-deprecated-css.conf
 share/asciidoc/xhtml-deprecated.conf
 share/asciidoc/xhtml11-quirks.conf
 share/asciidoc/xhtml11.conf
-share/doc/asciidoc/asciidoc.txt
 share/doc/asciidoc/asciidoc.html
+share/doc/asciidoc/asciidoc.txt
 @dirrm share/doc/asciidoc
 @dirrm share/asciidoc/stylesheets
 @dirrm share/asciidoc/javascripts
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index 35d24e3dc02..51ab7accdff 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/11/17 20:43:48 reed Exp $
+$NetBSD: distinfo,v 1.3 2007/11/29 22:20:29 wiz Exp $
 
-SHA1 (asciidoc-8.1.0.tar.gz) = 72eccad4e71b4aad294cb6c9200fffa490e034ae
-RMD160 (asciidoc-8.1.0.tar.gz) = 1f041b7dc56dd2b9c5db4b1d5ac310cce470db38
-Size (asciidoc-8.1.0.tar.gz) = 761244 bytes
+SHA1 (asciidoc-8.2.5.tar.gz) = 792bc45a17a0b54f8744214251fb08989e178d25
+RMD160 (asciidoc-8.2.5.tar.gz) = 966ee7af72a3c53916e7bf6a1670f23ce739adfc
+Size (asciidoc-8.2.5.tar.gz) = 722902 bytes