Update to 8.3.3:

1. Version 8.3.3 (2009-01-02)

   This release supercedes 8.3.2.

   Bug fixes
     * The broken and confusing numeration and numeration2 numbered list
       attributes have been dropped, use the style attribute instead.
     __________________________________________________________________

2. Version 8.3.2 (2009-01-01)

   Additions and changes
     * Added Gouichi Iisaka's Graphviz filter to distribution.
     * The SidebarBlock element can now be rendered with an abstract
       style.
     * Reorganized filters into a separate subdirectory for each filter.
     * Updated Makefile.in and MANIFEST files to reflect new filters
       organization.
     * Added listing style to LiteralBlock element so listings with nested
       listing blocks can be rendered as a listing block.
     * Changed example code filter to use preferred ListingBlock syntax
       (the old ~ delimited filter syntax is no longer used).
     * Implemented enumeration and enumeration2 numbered list attributes
       for specifying the list numbering style (arabic, loweralpha,
       upperalpha, lowerroman and upperroman).
     * AsciiDoc now recognizes upperalpha, lowerroman and upperroman
       numbers in listdef-numbered2 numbered lists and sets the number
       style based on the style of the first numbered list item
       (alternative to setting enumeration2 attribute).
     * Updated formatlistpat definition in .vimrc example in User Guide.
     * You can now backslash escape system block macros.
     * Added Pychart FAQ.
     * Drop paragraph text and list text, index and label match groups
       from attributes -- they are included in the element's text and we
       don't want them processed a second time as attributes.
     * Changed comment line block macro to a passthrough block macro to
       ensure no substitutions.
     * A subslist no longer has to be appended to a PassthroughBlock macro
       definition, if omitted no substitutions are performed.
     * Code tidy up: replaced deprecated <> operator with !=.
     * Removed unused linuxdoc code.
     * Code tidy ups: dropped old types module reference; replaced
       has_key() with preferred in operator.

   Bug fixes
     * Old syntax source highlight filter regression: special characters
       where not escaped in DocBook outputs.
     __________________________________________________________________

3. Version 8.3.1 (2008-12-14)

   Additions and changes
     * Replaced the install.sh script with Ben Walton's updated autoconf
       scripts -- see [1]INSTALL for details.
     * Added a generalized AttributeEntry syntax to allow arbitrary
       configuration file entries to be set from within an AsciiDoc
       document (suggested by Henrik Maier).
     * Listing delimited blocks in DocBook outputs now support IDs; IDs of
       titled Listing and Literal delimited blocks have been moved to the
       enclosing DocBook example tag (thanks to Vijay Kumar for this
       patch).
     * Replaced vertical typewriter apostrophe with punctuation apostrophe
       (thanks to Noah Slater).

   Bug fixes
     * Regression: Excluding double-quotes from unquoted attribute values
       resulted in backward incompatibility, double-quotes in unquoted
       attribute values has been reinstated.
     * Regression: Text like &...; was sometimes mistaken for an entity
       reference -- tightened up entity reference matching.
     __________________________________________________________________

4. Version 8.3.0 (2008-11-29)

   Additions and changes
     * [2]AsciiDoc new tables is a complete redesign of the tables syntax
       and generation. The new syntax and features are a huge improvement
       over the old tables. The old tables syntax has been deprecated but
       is currently still processed.
     * [3]Lists can now be styled like other block elements. This allows a
       single list syntax for glossary, qanda (Question and Answer) and
       bibliography lists instead of having to remember a different syntax
       for each type.
     * Inline passthroughs macros have been improved and block passthrough
       macros added. Attribute substitution can be optionally specified
       when the macro is called.
     * The passthrough block has a fully transparent passthrough delimited
       block block style called pass.
     * The asciimath and latexmath [4]passthrough macros along with
       asciimath and latexmath [5]passthrough blocks provide a (backend
       dependent) mechanism for rendering mathematical formulas. There are
       [6]LaTeX Math, [7]AsciiMathML and [8]LaTeXMathML examples on the
       AsciiDoc website.
     * Reimplemented and cleaned up filter processing based on a patch
       submitted by Kelly Anderson. Uses the newer subprocess module
       instead of the deprecated popen2 module. Now works in Win32 command
       shell.
     * Addition FAQs, more documentation updates.
     * Arbitrary HTML/XML entities can be entered in AsciiDoc source.
     * Did away with the need for the shaded-literallayout.patch (thanks
       to Henrik Maier for this patch).
     * Implemented page break block macro.
     * Added line breaks and ruler processing instructions to DocBook
       outputs (thanks to Henrik Maier for this patch).
     * Added deg (degree) and wj (word joiner) entity attributes (thanks
       to Henrik Maier).
     * Tweaked DocBook indexterm2 macro to avoid white space preceding the
       term when used in table cells (thanks to Henrik Maier for this
       patch).
     * Title elements now process the options attribute like other block
       elements.
     * Added `single quoted' element.
     * Spaces on both sides of a -- em-dash are translated to thin space
       characters.
     * Improved detection and reporting of malformed attribute lists.
     * The list compact style is now a list option.
     * Added strong labeled list option which makes the labels bold (HTML
       outputs only).
     * Dropped unsupported linuxdoc backend.
     * Dropped deprecated xhtml-deprecated (version 6) backend.
     * Added breakable and unbreakable attribute options to tables to
       control table breaking across page boundaries (DocBook XSL/FO
       outputs). By and in collaboration with Henrik Maier.
     * Added pgwide attribute option to tables to table, block image,
       horizontal labeled lists. Specifies that the element should be
       rendered across the full text width of the page irrespective of the
       current indentation (DocBook XSL/FO outputs). Thanks to Henrik
       Maier for this patch.
     * Vim syntax highlighter: spaces before/after bullets no longer
       highlighted (which is ugly if using a theme that highlights with
       underlines). Thanks to Donald Chai for this patch.
     * Added a2x(1) --fop option.
     * Added a2x(1) --no-xmllint option.
     * Highlighted labelled list terms with the navy color in XHTML
       outputs.
     * Use w3m(1) as default a2x(1) text format generator (fallback to
       lynx(1)).
     * Changed callout formats in html4 and xhtml11 outputs to angle
       brackets to match source highlighter rendering.
     * Macros now inject user defined <optionname>-option attributes into
       markup.
     * Added IRC URLs to AsciiDoc inline macros.
     * Added depth attribute to include::[] system macro.
     * Added footnoteref inline macro.
     * Added stylesheet XHTML attribute to specify additional custom CSS
       stylesheet.
     * If a paragraph style is specified it will be added to the XHTML
       class attribute and DocBook role attribute.
     * Replacements can be set in a document using the reserved
       AttributeEntry name replacement.
     * The prefix for auto-generated section name IDs can be set with the
       idprefix attribute.

   Bug fixes
     * Escaped quote skipped over leading and trailing quote instead of
       just the leading quote.
     * Fixed bug that was causing false negative safe mode warnings (patch
       submitted by Julien Palmas).
     * Placed priority of AttributeEntry, AttributeList and BlockTitle
       above Title. This ensures an AttributeEntry, AttributeList or
       BlockTitle followed by a same length leading ListingBlock delimiter
       is not mistaken for a two-line title.
     * Vim syntax highlighter: fixed multi-line quoted text.
     * Contstrained quote termination after non-space character enforced.
     * Vim syntax highlighter: unterminated quoted text is no longer
       highlighted.
     * Vim syntax highlighter: passthroughs now exactly match AsciiDoc
       semantics.
     * Vim syntax highlighter: escaped quoted text, attribute references
       and inline macros are not highlighted.
     * Vim syntax highlighter: TODO's highlighted in CommentBlocks (thanks
       to Scott Wall); non-greedy $$...$$.
     * Vim syntax highlighter: Comment lines mistaken for vertical list
       labels (thanks to Scott Wall).
     * Vim syntax highlighter: Single unmatched $$ mistakenly highlighted
       remaining text (patch contributed by Scott Wall).
     * Callouts now work in source highlighted listing generated by
       dblatex.
     * Fixed exception that occured if undefined attribute was present in
       filter command.
     * AttributeList block can now follow a paragraph without intervening
       blank line.
     * The include macro tabsize attribute is no longer propagated to
       nested includes.

   Omissions
   The following features were implemented but then but removed from this
   release:
     * pi, cdata and comment passthrough macros and passthrough block
       styles (creeping featurism, use pass macros instead).
     * Generic tag inline macro (creeping featurism, use pass macros
       instead).

  4.1. Compatibility issues

   Version 8.3.0 has a number of backward incompatibilities with respect
   to the previous 8.2.7 release:
     * The old table syntax is still processed but a DEPRECATED warning is
       issued.
     * Entity references have to be escaped with a backslash.
     * You have to explicitly precede horizontal style labeled lists with
       the [horizontal] style attribute -- by default all labeled lists
       are rendered vertically.
     * The list compact style has been dropped and is now a list option
       (use options="compact" in attribute lists).
     * AsciiDoc version 6 sytnax no longer supported.
     * Linuxdoc been removed from the distribution.
     * The unsupported experimental latex backend has not been tested on
       this release.
     * The introduction of single-quote quoting requires that double-quote
       quoting is escaped with two backslashes.
     __________________________________________________________________

5. Version 8.2.7 (2008-07-04)

   Additions and changes
     * Added dvi, ps and tex output format options to a2x(1).
     * Added --dblatex option to a2x(1) so dblatex(1) can be used to
       generate PDFs.
     * Added custom dblatex(1) configuration files (in distribution
       ./dblatex directory) that are used by a2x(1).
     * dblatex(1) is now used to generate the distributed PDF version of
       the AsciiDoc User Guide.
     * If you don't need a customized the link caption you can enter the
       http, https, ftp, file URLs and email addresses without any special
       macro syntax -- you get the links by just cutting and pasting URLs
       and emails addresses. This also makes it easier to open links
       directly form AsciiDoc source ( most editors allow you to open URLs
       directly). The Vim syntax highlighter has been updated to reflect
       these changes.
     * Highlighted source code paragraphs have been implemented -- it's a
       much more convenient way to enter short code examples (see [9]the
       online docs).
     * The source highlighter and music filter syntax has changed -- they
       now used the ListingBlock syntax customized with source and music
       style attribute values. This follows the Paragraph styling
       convention introduced by the source paragraph (previous item) and
       is easier to read. The old syntax still works but has been
       deprecated.
     * QuoteBlocks now have a verse style -- you no longer have to nest a
       verse LiteralBlock inside a QuoteBlock for verses. The verse style
       on the LiteralBlock has been deprecated (still works though) and
       the style attribute is positional attribute 1, pushing attribution
       and citetitle attributes to the right (you'll need to insert a
       quote attribute into your existing QuoteBlocks).
     * It is no up to the DocBook processor to highlight source code
       syntax in <programlisting> elements rather than GNU Highlighter --
       this is the correct way to handle it, plus dblatex(1) makes a much
       better job.
     * scaledwidth and align attributes have been added to the image
       macro. They apply to DocBook outputs (specifically for PDF
       documents). scaledwidth sets the image size as a percent of the
       available page width; align applies left, center or right
       horizontal image justification.
     * Added a2x(1) --fop-opts=FOP_OPTS option (patch submitted by Miklos
       Vajna).
     * Added a2x(1) --dblatex-opts=DBLATEX_OPTS option.
     * Added Mikhail Yakshin's FOP 0.95 patch which fixes a long-standing
       fo.xsl problem and allows PDF's to be generated with FOP 0.95
       (previously had to use FOP 0.20.5).
     * The User Guide has been updated and outdated FOP configuration and
       installation sections removed.

   Bug fixes
     * Fixed stylesheets/xhtml11-manpage.css not being included when
       linkcss attribute was used.
     * Configuration file *-style attributes are now dumped correctly.
     * Fixed FAILED: malformed section entry LaTeX backend error.

   See the also the [10]AsciiDoc repository changelog.

5 files changed, 37 insertions, 42 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 78a63699a74..74c3b0dec76 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2009/02/09 22:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/03/06 15:17:07 wiz Exp $
 #
 
-DISTNAME=		asciidoc-8.2.6
-PKGREVISION=		2
+DISTNAME=		asciidoc-8.3.3
 CATEGORIES=		textproc
 MASTER_SITES=		${HOMEPAGE}	\
 			${MASTER_SITE_SOURCEFORGE:=asciidoc/}
@@ -18,7 +17,10 @@ DEPENDS+=		getopt-[0-9]*:../../misc/getopt
 
 REPLACE_BASH+=		a2x
 USE_TOOLS+=		bash:run pax
-PYTHON_PATCH_SCRIPTS=	asciidoc.py filters/code-filter.py filters/music2png.py
+PYTHON_PATCH_SCRIPTS=	asciidoc.py
+PYTHON_PATCH_SCRIPTS+=	filters/code/code-filter.py
+PYTHON_PATCH_SCRIPTS+=	filters/music/music2png.py
+PYTHON_PATCH_SCRIPTS+=	filters/graphviz/graphviz2png.py
 
 NO_BUILD=		yes
 
@@ -44,8 +46,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.html ${DESTDIR}${DOCDIR}
 
-	cd ${WRKSRC} && pax -wr -pma *.conf filters/*.py \
-		filters/*.conf docbook-xsl/*.xsl stylesheets/*.css	\
+	cd ${WRKSRC} && pax -wr -pma *.conf filters \
+		filters docbook-xsl/*.xsl stylesheets/*.css	\
 		javascripts/*.js images/icons/callouts/* images/icons/*.png \
 		images/icons/README \
 		${DESTDIR}${PREFIX}/share/asciidoc/.
diff --git a/textproc/asciidoc/PLIST b/textproc/asciidoc/PLIST
index 288cdb554ee..619d3a60ea3 100644
--- a/textproc/asciidoc/PLIST
+++ b/textproc/asciidoc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/06/10 13:06:30 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/03/06 15:17:07 wiz Exp $
 bin/a2x
 bin/asciidoc
 man/man1/a2x.1
@@ -9,13 +9,21 @@ share/asciidoc/docbook-xsl/common.xsl
 share/asciidoc/docbook-xsl/fo.xsl
 share/asciidoc/docbook-xsl/htmlhelp.xsl
 share/asciidoc/docbook-xsl/manpage.xsl
+share/asciidoc/docbook-xsl/text.xsl
 share/asciidoc/docbook-xsl/xhtml.xsl
 share/asciidoc/docbook.conf
-share/asciidoc/filters/code-filter.conf
-share/asciidoc/filters/code-filter.py
-share/asciidoc/filters/music-filter.conf
-share/asciidoc/filters/music2png.py
-share/asciidoc/filters/source-highlight-filter.conf
+share/asciidoc/filters/code/code-filter-readme.txt
+share/asciidoc/filters/code/code-filter-test.txt
+share/asciidoc/filters/code/code-filter.conf
+share/asciidoc/filters/code/code-filter.py
+share/asciidoc/filters/graphviz/asciidoc-graphviz-sample.txt
+share/asciidoc/filters/graphviz/graphviz-filter.conf
+share/asciidoc/filters/graphviz/graphviz2png.py
+share/asciidoc/filters/music/music-filter-test.txt
+share/asciidoc/filters/music/music-filter.conf
+share/asciidoc/filters/music/music2png.py
+share/asciidoc/filters/source/source-highlight-filter-test.txt
+share/asciidoc/filters/source/source-highlight-filter.conf
 share/asciidoc/help.conf
 share/asciidoc/html4.conf
 share/asciidoc/images/icons/README
@@ -49,17 +57,12 @@ 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/compact.css
 share/asciidoc/stylesheets/docbook-xsl.css
-share/asciidoc/stylesheets/xhtml-deprecated-manpage.css
-share/asciidoc/stylesheets/xhtml-deprecated.css
 share/asciidoc/stylesheets/xhtml11-manpage.css
 share/asciidoc/stylesheets/xhtml11-quirks.css
 share/asciidoc/stylesheets/xhtml11.css
 share/asciidoc/text.conf
-share/asciidoc/xhtml-deprecated-css.conf
-share/asciidoc/xhtml-deprecated.conf
+share/asciidoc/wordpress.conf
 share/asciidoc/xhtml11-quirks.conf
 share/asciidoc/xhtml11.conf
 share/doc/asciidoc/asciidoc.html
@@ -70,6 +73,10 @@ share/doc/asciidoc/asciidoc.txt
 @dirrm share/asciidoc/images/icons/callouts
 @dirrm share/asciidoc/images/icons
 @dirrm share/asciidoc/images
+@dirrm share/asciidoc/filters/source
+@dirrm share/asciidoc/filters/music
+@dirrm share/asciidoc/filters/graphviz
+@dirrm share/asciidoc/filters/code
 @dirrm share/asciidoc/filters
 @dirrm share/asciidoc/docbook-xsl
 @dirrm share/asciidoc
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index 2d05bef69cb..c33be969063 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/12/04 04:05:01 minskim Exp $
+$NetBSD: distinfo,v 1.7 2009/03/06 15:17:07 wiz Exp $
 
-SHA1 (asciidoc-8.2.6.tar.gz) = cce98ed670c462a3a007b03b6f92d2108c5bc405
-RMD160 (asciidoc-8.2.6.tar.gz) = c07d2eaa04d16275c44756236023c0789cf54310
-Size (asciidoc-8.2.6.tar.gz) = 739790 bytes
-SHA1 (patch-aa) = f8e1128a7ea77a6c4bcfa023b6fcb040cc3882de
-SHA1 (patch-ab) = fe9d10cf052dc6cb6918ae00a14cccc7d52dc4ea
+SHA1 (asciidoc-8.3.3.tar.gz) = 6c85063185deaeecee6389cdadafd3e88c5ae160
+RMD160 (asciidoc-8.3.3.tar.gz) = 42417668d1fe1d6a1b580c7ee49ad54d2688f207
+Size (asciidoc-8.3.3.tar.gz) = 1050151 bytes
+SHA1 (patch-aa) = fab20eec609960b05b0bab034159b6138436f30a
diff --git a/textproc/asciidoc/patches/patch-aa b/textproc/asciidoc/patches/patch-aa
index 988e39a708f..47570655645 100644
--- a/textproc/asciidoc/patches/patch-aa
+++ b/textproc/asciidoc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2008/06/10 13:06:30 gdt Exp $
+$NetBSD: patch-aa,v 1.3 2009/03/06 15:17:07 wiz Exp $
 
 a2x uses the '-u' argument to cp, which POSIX does not specify:
   http://www.opengroup.org/onlinepubs/009695399/utilities/cp.html
@@ -6,9 +6,9 @@ a2x uses the '-u' argument to cp, which POSIX does not specify:
 Filed upstream on 20080609 as
 https://sourceforge.net/tracker/index.php?func=detail&aid=1989227&group_id=67797&atid=519005
 
---- a2x.orig	2007-10-28 23:50:53.000000000 -0400
+--- a2x.orig	2008-12-31 02:46:28.000000000 +0000
 +++ a2x
-@@ -379,7 +379,7 @@ function copy_stylesheet()
+@@ -415,7 +415,7 @@ function copy_stylesheet()
      if [[ "$src" -ef "$dst" ]]; then
          return
      fi
@@ -17,7 +17,7 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=1989227&group_id=67797
  }
  
  # Copy distribution admonition and navigation icons to destination directory
-@@ -405,7 +405,7 @@ function copy_icons()
+@@ -441,7 +441,7 @@ function copy_icons()
      else
          execute_command_2 "mkdir -p \"$dst\""
      fi
@@ -25,4 +25,4 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=1989227&group_id=67797
 +    execute_command_2 "cp -rf  \"$src/\"* \"$dst\""
  }
  
- #--------------------------------------------------------------------
+ # Run xmllint(1) checking of $1 file if xmllint checking is enabled.
diff --git a/textproc/asciidoc/patches/patch-ab b/textproc/asciidoc/patches/patch-ab
deleted file mode 100644
index 408721d89ff..00000000000
--- a/textproc/asciidoc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/12/04 04:05:39 minskim Exp $
-
---- asciidoc.py.orig	2008-12-03 18:56:53.000000000 -0800
-+++ asciidoc.py
-@@ -124,7 +124,7 @@ def file_in(fname, directory):
-         directory = os.getcwd()
-     else:
-         assert os.path.isdir(directory)
--        directory = os.path.abspath(directory)
-+        directory = os.path.realpath(directory)
-     fname = os.path.realpath(fname)
-     return os.path.commonprefix((directory, fname)) == directory
-