- Drop unused build script code.

- Drop mon-math LaTeX blocks from latexmath.txt documentation (as of dblatex
  0.3 arbitrary LaTeX markup does not seem to work).
- Included latex-filter doc in build scripts.
- Dropped HTML documentation files from distribution (the source is included
  and the HTML documentation is on the website).
- Include root directory name in zipped distribution.
- Dropped unused files in the examples/website directory.

12 files changed, 80 insertions, 234 deletions

diff --git a/MANIFEST b/MANIFEST
index 3a3e40a..92b93ed 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,6 +3,8 @@ asciidoc.py
 asciidocapi.py
 BUGS
 BUGS.txt
+MANIFEST
+main.aap
 common.aap
 CHANGELOG
 CHANGELOG.txt
@@ -23,31 +25,28 @@ dblatex/asciidoc-dblatex.xsl
 dblatex/dblatex-readme.txt
 doc/a2x.1
 doc/book.epub
-doc/article.pdf
 doc/asciidoc.1
 doc/asciidoc.conf
 doc/article-docinfo.xml
-docbook-xsl/*.txt
-docbook-xsl/*.xsl
 doc/*.css
 doc/customers.csv
-doc/*.html
 doc/images/
 doc/main.aap
+doc/article.pdf
 doc/latex-filter.pdf
 doc/music-filter.pdf
 doc/source-highlight-filter.pdf
 doc/*.txt
 doc/asciidoc.dict
+docbook-xsl/*.txt
+docbook-xsl/*.xsl
+examples/website/main.aap
 examples/website/build-website.sh
 examples/website/*.css
 examples/website/*.js
 examples/website/customers.csv
-examples/website/*.html
 examples/website/images/
 examples/website/layout?.conf
-examples/website/music?.*
-examples/website/sample?.png
 examples/website/*.txt
 filters/code/code-filter.conf
 filters/code/code-filter.py
diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict
index 17d0b9a..dd01f11 100644
--- a/doc/asciidoc.dict
+++ b/doc/asciidoc.dict
@@ -4,8 +4,8 @@ colspecs
 API
 testcases
 BSBEV
-dblatex
 dapibus
+dblatex
 attributelist
 AttributeList
 Blondel
@@ -32,8 +32,8 @@ BOM
 Bon
 ungenerated
 zipP
-des
 cmd
+des
 ListItems
 dev
 vulputate
@@ -114,8 +114,8 @@ xreflabel
 PDF's
 PDFs
 pygmentize
-MSIE
 pede
+MSIE
 permalinks
 Boscombe
 Daly
@@ -129,8 +129,8 @@ apos
 ShareSource
 projectname
 hoc
-ispum
 Maier
+ispum
 TableFooter
 blog
 passthroughs
@@ -186,8 +186,8 @@ optionname
 sollicitudin
 companyname
 pageunits
-nec
 loc
+nec
 latexmath
 articleinfo
 auctor
@@ -216,12 +216,12 @@ endDocument
 odt
 Cygwin
 ultrices
-indentedparagraph
 IndentedParagraph
+indentedparagraph
 ltr
 doctests
-AsciiDocAPI
 asciidocapi
+AsciiDocAPI
 itemtag
 Dvips
 Jython
@@ -258,9 +258,9 @@ lobortis
 Broberg
 Bowlin
 navPoint
-asciimathml
-AsciiMathML
 ASCIIMathML
+AsciiMathML
+asciimathml
 conf
 RCS
 CalloutList
@@ -311,8 +311,8 @@ pgwide
 RevisionDate
 crlf
 tex
-Bólido
 Bolido
+Bólido
 tabsize
 colpcwidth
 Orry
@@ -328,8 +328,8 @@ Tsawassen
 Aenean
 postsubs
 src
-LastName
 lastname
+LastName
 toc
 tmp
 Knisley
@@ -379,13 +379,13 @@ params
 undefines
 Andrés
 Quisque
-htmlhelp
 HTMLHelp
+htmlhelp
 cellspacing
 Citeaux
 srackham
-Luleĺ
 Lulea
+Luleĺ
 Ubuntu
 xml
 XSLTLib
@@ -393,9 +393,9 @@ headrow
 Morbi
 Blauer
 footdata
-al
-bg
 cb
+bg
+al
 cd
 xsl
 backmatter
@@ -412,16 +412,16 @@ fb
 fermentum
 fi
 cellcount
-et
 fo
+et
 eu
 hg
 guimenu
 fugiat
 toclevels
 xzf
-gq
 JB
+gq
 refactored
 sgml
 backcolor
@@ -438,14 +438,14 @@ lf
 defacto
 mb
 IndentedBlocks
-md
 js
+md
 erat
 blogpost
 xsltproc
 jw
-ln
 nd
+ln
 ne
 oa
 Terje
@@ -467,8 +467,8 @@ ps
 runtime
 tcqn
 epub
-px
 td
+px
 vivamus
 py
 addon
@@ -484,8 +484,8 @@ tt
 VM
 Frédérique
 SidebarBlock
-wj
 ut
+wj
 Efros
 param
 Movet
@@ -690,8 +690,8 @@ pagebreak
 VariableList
 LiteralBlocks
 Donec
-BLONP
 dbook
+BLONP
 asciimath
 interesset
 pellentesque
@@ -769,8 +769,8 @@ basebackend
 urna
 rowsep
 checksums
-BlockMacro
 blockmacro
+BlockMacro
 mailto
 http
 pychart
@@ -812,16 +812,16 @@ startDocument
 ifdef
 manmanual
 Konqueror
-FirstName
 firstname
-LaTeXMathML
+FirstName
 latexmathml
+LaTeXMathML
 sectnum
 BlockMacros
 cceeff
 unfloat
-snabbköp
 snabbkop
+snabbköp
 NumberedList
 everti
 multi
@@ -891,8 +891,8 @@ cellpadding
 entrytbl
 Ornare
 authorinitials
-javascripts
 JavaScripts
+javascripts
 undefining
 leveloffset
 CustomBlock
@@ -948,8 +948,8 @@ Redhat
 datadir
 Kumar
 IndentedParagraphs
-Berguvsvagen
 Berguvsvägen
+Berguvsvagen
 executables
 tabledef
 ftdetect
@@ -970,6 +970,6 @@ lectus
 JavaHelp
 unescaped
 mydoc
-middlename
 MiddleName
+middlename
 Jimmac's
diff --git a/doc/latexmath.txt b/doc/latexmath.txt
index 49550a0..6f04321 100644
--- a/doc/latexmath.txt
+++ b/doc/latexmath.txt
@@ -1,12 +1,11 @@
 Embedding LaTeX Math in AsciiDoc dblatex documents
 ==================================================
 
-You can include
-ftp://ftp.ams.org/pub/tex/doc/amsmath/short-math-guide.pdf[LaTeX math]
-equations in AsciiDoc documents that are processed by 'dblatex'. The
-AsciiDoc 'latexmath' macros generate DocBook 'inlineequation' and
-'informalequation' elements containing the LaTeX markup which is
-processed by 'dblatex'.
+You can include LaTeX math equations in AsciiDoc documents that are
+processed by http://dblatex.sourceforge.net/[dblatex]. The AsciiDoc
+'latexmath' macros and passthrough blocks generate DocBook
+'inlineequation', 'informalequation' and 'equation' elements
+containing the LaTeX markup which is processed by 'dblatex'.
 
 
 Inline equations
@@ -15,24 +14,18 @@ This markup:
 
 ---------------------------------------------------------------------
 An inline equation latexmath:[$C = \alpha + \beta Y^{\gamma} + \epsilon$]
-using the 'math' inline macro.
-
-You can use the same 'math' macro to inject arbitrary latexmath:[\LaTeX] markup
-(but beware, this is an undocumented trick).
+using the 'latexmath' inline macro.
 ---------------------------------------------------------------------
 
 Renders:
 
 An inline equation latexmath:[$C = \alpha + \beta Y^{\gamma} + \epsilon$]
-using the 'math' inline macro.
-
-You can use the same 'math' macro to inject arbitrary latexmath:[\LaTeX] markup
-(but beware, this is an undocumented trick).
+using the 'latexmath' inline macro.
 
 
 Informal equations
 ------------------
-Informal (untitled) equations are generated with a 'math' style
+Informal (untitled) equations are generated with a 'latexmath' style
 passthrough delimited block. This markup:
 
 ---------------------------------------------------------------------
@@ -62,13 +55,13 @@ latexmath::[\[C = \alpha + \beta Y^{\gamma} + \epsilon\]]
 
 Formal equations
 ----------------
-Formal equations are titled and are generated with a 'math' style
+Formal equations are titled and are generated with a 'latexmath' style
 passthrough delimited block.
 
 This markup:
 
 ---------------------------------------------------------------------
-.Unnumbered
+.First equation
 [latexmath]
 ++++++++++++++++++++++++++++++++++++++++++++
 \[C = \alpha + \beta Y^{\gamma} + \epsilon\]
@@ -77,7 +70,7 @@ This markup:
 
 Renders:
 
-.Unnumbered
+.First equation
 [latexmath]
 ++++++++++++++++++++++++++++++++++++++++++++
 \[C = \alpha + \beta Y^{\gamma} + \epsilon\]
@@ -86,127 +79,6 @@ Renders:
 This markup:
 
 ---------------------------------------------------------------------
-.Aligned
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{align*}
-2x^2 + 3(x-1)(x-2) & = 2x^2 + 3(x^2-3x+2) \\
-&= 2x^2 + 3x^2 - 9x + 6 \\
-&= 5x^2 - 9x + 6
-\end{align*}
-++++++++++++++++++++++++++++++++++++++++++++
----------------------------------------------------------------------
-
-Renders:
-
-.Unnumbered
-.Aligned
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{align*}
-2x^2 + 3(x-1)(x-2) & = 2x^2 + 3(x^2-3x+2) \\
-&= 2x^2 + 3x^2 - 9x + 6 \\
-&= 5x^2 - 9x + 6
-\end{align*}
-++++++++++++++++++++++++++++++++++++++++++++
-
-This markup:
-
----------------------------------------------------------------------
-.Array
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{eqnarray}
-x & = & \frac{-7 \pm \sqrt{49 - 24}}{6} \\
-& = & -2 \textrm{ or } -\frac13
-\end{eqnarray}
-++++++++++++++++++++++++++++++++++++++++++++
----------------------------------------------------------------------
-
-Renders:
-
-.Array
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{eqnarray}
-x & = & \frac{-7 \pm \sqrt{49 - 24}}{6} \\
-& = & -2 \textrm{ or } -\frac13
-\end{eqnarray}
-++++++++++++++++++++++++++++++++++++++++++++
-
-This markup:
-
----------------------------------------------------------------------
-.Array
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{eqnarray*}
-4r^2\int_0^{\pi/2} \cos^2 \theta\, d\theta
-&=& 4r^2\int_0^{\pi/2} \frac{1}{2}(1 + \cos 2\theta) \,d\theta\\
-& = & {2r^2\theta}\Bigg{|}_0^{\pi/2}
-  + 2r^2\int_0^{\pi/2} \cos 2\theta \,d\theta\\
-& = & \pi r^2 + 2r^2(\sin2\theta)\Bigg{|}_0^{\pi/2}\\
-& = & \pi r^2
-\end{eqnarray*}
-++++++++++++++++++++++++++++++++++++++++++++
----------------------------------------------------------------------
-
-Renders:
-
-.Array
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{eqnarray*}
-4r^2\int_0^{\pi/2} \cos^2 \theta\, d\theta
-&=& 4r^2\int_0^{\pi/2} \frac{1}{2}(1 + \cos 2\theta) \,d\theta\\
-& = & {2r^2\theta}\Bigg{|}_0^{\pi/2}
-  + 2r^2\int_0^{\pi/2} \cos 2\theta \,d\theta\\
-& = & \pi r^2 + 2r^2(\sin2\theta)\Bigg{|}_0^{\pi/2}\\
-& = & \pi r^2
-\end{eqnarray*}
-++++++++++++++++++++++++++++++++++++++++++++
-
-This markup:
-
----------------------------------------------------------------------
-.List
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{enumerate}
-\item $\frac{da}{dx} = 0$
-\item $\frac{d}{dx} ax = a$
-\item $\frac{d}{dx} x^n = nx^{n-1}$
-\item $\displaystyle \frac{d}{dx} (f(x) + g(x))
-  = \frac{d}{dx} f(x) + \frac{d}{dx} g(x)$
-\item $\displaystyle \frac{d}{dx} f(x)g(x)
-  = g(x) \frac{d}{dx} f(x) + f(x) \frac{d}{dx} g(x)$
-\item $\displaystyle  \frac{d}{dx} \frac{f(x)}{g(x)}
-  = \frac{g(x) \frac{d}{dx} f(x) - f(x) \frac{d}{dx} g(x)}{(g(x))^2}$
-\end{enumerate}
-++++++++++++++++++++++++++++++++++++++++++++
----------------------------------------------------------------------
-
-Renders:
-
-.List
-[latexmath]
-++++++++++++++++++++++++++++++++++++++++++++
-\begin{enumerate}
-\item $\frac{da}{dx} = 0$
-\item $\frac{d}{dx} ax = a$
-\item $\frac{d}{dx} x^n = nx^{n-1}$
-\item $\displaystyle \frac{d}{dx} (f(x) + g(x))
-  = \frac{d}{dx} f(x) + \frac{d}{dx} g(x)$
-\item $\displaystyle \frac{d}{dx} f(x)g(x)
-  = g(x) \frac{d}{dx} f(x) + f(x) \frac{d}{dx} g(x)$
-\item $\displaystyle  \frac{d}{dx} \frac{f(x)}{g(x)}
-  = \frac{g(x) \frac{d}{dx} f(x) - f(x) \frac{d}{dx} g(x)}{(g(x))^2}$
-\end{enumerate}
-++++++++++++++++++++++++++++++++++++++++++++
-
-This markup:
-
----------------------------------------------------------------------
 .Matrix
 [latexmath]
 ++++++++++++++++++++++++++++++++++++++++++++
@@ -245,3 +117,5 @@ Renders:
   \end{array}
 \right] \]
 ++++++++++++++++++++++++++++++++++++++++++++
+
+
diff --git a/doc/main.aap b/doc/main.aap
index b8f8f17..299533b 100644
--- a/doc/main.aap
+++ b/doc/main.aap
@@ -8,10 +8,6 @@
 

 :execute ../common.aap

 

-# Uncomment next line to use dblatex instead of FOP, or alternatively

-# include PDF_PROCESSOR=dblatex on the command-line.

-#PDF_PROCESSOR = dblatex

-

 ASCIIDOC = python ../asciidoc.py -a revnumber=$(VERS)@ -a revdate="$(DATE)@"

 A2X = python ../a2x.py

 

@@ -39,6 +35,7 @@ OUTFILES = $*(ROOT).html $*(ROOT).css.html $*(ROOT).css-embedded.html \
         $CHUNK_DIR/index.html \

         article.pdf \

         latexmath.pdf \

+        latex-filter.pdf \

         source-highlight-filter.pdf \

         music-filter.pdf \

         book.epub \

@@ -130,15 +127,16 @@ TEST_FILES = $*(ROOT).css-embedded.html
 :rule %.fo: %.xml

     :sys $XSLTPROC --nonet --stringparam admon.textlabel 0 ../docbook-xsl/fo.xsl $source >$target

 

-# This kludge forces the User Guide and LaTeX Math PDFs to be generated using

-# dblatex so we include a dblatex example in the distribution.

+# This kludge forces the User Guide and LaTeX related PDFs to be generated

+# using dblatex so we include a dblatex example in the distribution.

 @if _no.DBLATEX:

     asciidoc.pdf: asciidoc.txt

-        # dblatex table widths can only be set via absolute column widths.

         :sys $ASCIIDOC -b docbook $(source[0])

         :sys $DBLATEX -p ../dblatex/asciidoc-dblatex.xsl -s ../dblatex/asciidoc-dblatex.sty -o $target asciidoc.xml

     latexmath.pdf: latexmath.xml

         :sys $DBLATEX -p ../dblatex/asciidoc-dblatex.xsl -s ../dblatex/asciidoc-dblatex.sty -o $target $source

+    latex-filter.pdf: latex-filter.xml

+        :sys $DBLATEX -p ../dblatex/asciidoc-dblatex.xsl -s ../dblatex/asciidoc-dblatex.sty -o $target $source

 

 # Force the Source Highlighter PDF to be generated using dblatex

 # because dblatex has builtin source code highlighting.

@@ -146,13 +144,13 @@ TEST_FILES = $*(ROOT).css-embedded.html
     source-highlight-filter.pdf: source-highlight-filter.xml

         :sys $DBLATEX -p ../dblatex/asciidoc-dblatex.xsl -s ../dblatex/asciidoc-dblatex.sty -o $target $source

 

-# Try PDF generators in order of preference.

-@if _no.DBLATEX and _no.get('PDF_PROCESSOR') and _no.PDF_PROCESSOR == 'dblatex':

-    :rule %.pdf: %.xml

-        :sys $DBLATEX -p ../dblatex/asciidoc-dblatex.xsl -s ../dblatex/asciidoc-dblatex.sty -o $target $source

-@elif _no.FOP:

+@if _no.FOP:

     :rule %.pdf: %.fo

         :sys $FOP $source $target

+@elif _no.DBLATEX:

+    # Fall back to dblatex if no FOP.

+    :rule %.pdf: %.xml

+        :sys $DBLATEX -p ../dblatex/asciidoc-dblatex.xsl -s ../dblatex/asciidoc-dblatex.sty -o $target $source

 @else:

     :rule %.pdf:

         :print WARNING: PDF processor  unavailable: skipping $target file generation

diff --git a/examples/website/index.txt b/examples/website/index.txt
index 9055582..c15414d 100644
--- a/examples/website/index.txt
+++ b/examples/website/index.txt
@@ -47,7 +47,7 @@ using readily available Open Source tools.
 

 Example Articles

 ~~~~~~~~~~~~~~~~

-- This version of the

+- This XHTML version of the

   link:asciidoc.css-embedded.html[AsciiDoc User Guide]

   was generated by AsciiDoc from

   link:asciidoc.txt[this AsciiDoc file].

diff --git a/examples/website/latexmath.pdf b/examples/website/latexmath.pdf
deleted file mode 120000
index bebc810..0000000
--- a/examples/website/latexmath.pdf
+++ /dev/null
@@ -1 +0,0 @@
-../../doc/latexmath.pdf
\ No newline at end of file
diff --git a/examples/website/main.aap b/examples/website/main.aap
index 8ba9e5e..51c439a 100644
--- a/examples/website/main.aap
+++ b/examples/website/main.aap
@@ -76,11 +76,6 @@ DOCS =
 
 # Client applications.
 @if OSTYPE == 'posix':
-    ASCIIDOC = `program_path("asciidoc")`
-    @if not ASCIIDOC:
-        :print ERROR: asciidoc(1) not found
-        :exit
-    TAR = `program_path("tar")`
     ASPELL = `program_path("aspell")`
 @else:
     :print ERROR: Unsupported operating system $OSTYPE
diff --git a/examples/website/music1.abc b/examples/website/music1.abc
deleted file mode 100644
index e01b6de..0000000
--- a/examples/website/music1.abc
+++ /dev/null
@@ -1,12 +0,0 @@
-T:The Butterfly
-R:slip jig
-C:Tommy Potts
-H:Fiddle player Tommy Potts made this tune from two older slip jigs,
-H:one of which is called "Skin the Peelers" in Roche's collection.
-H:This version by Peter Cooper.
-D:Bothy Band: 1975.
-M:9/8
-K:Em
-vB2(E G2)(E F3)|B2(E G2)(E F)ED|vB2(E G2)(E F3)|(B2d) d2(uB A)FD:|
-|:(vB2c) (e2f) g3|(uB2d) (g2e) (dBA)|(B2c) (e2f) g2(ua|b2a) (g2e) (dBA):|
-|:~B3 (B2A) G2A|~B3 BA(uB d)BA|~B3 (B2A) G2(A|B2d) (g2e) (dBA):|
\ No newline at end of file
diff --git a/examples/website/music1.png b/examples/website/music1.png
deleted file mode 100644
index 49218d9..0000000
--- a/examples/website/music1.png
+++ /dev/null
diff --git a/examples/website/music2.ly b/examples/website/music2.ly
deleted file mode 100644
index 669e394..0000000
--- a/examples/website/music2.ly
+++ /dev/null
@@ -1,9 +0,0 @@
-\version "2.10.0"
-\paper {
-  ragged-right = ##t
-}
-{
-  \time 3/4
-  \clef bass
-  c2 e4 g2. f4 e d c2 r4
-}
\ No newline at end of file
diff --git a/examples/website/music2.png b/examples/website/music2.png
deleted file mode 100644
index 32fee7e..0000000
--- a/examples/website/music2.png
+++ /dev/null
diff --git a/main.aap b/main.aap
index f05c243..e7a5f36 100644
--- a/main.aap
+++ b/main.aap
@@ -24,33 +24,35 @@ website:
     :execute ./examples/website/main.aap
 
 distribution: docs website
+    NAME = asciidoc-$(VERS)
     # Make configure script.
     :sys autoconf
     # Make tarball of all files in MANIFEST.
-    :syseval pwd | :assign WD
-    :sys cd .. && ln -s $(WD) asciidoc-$(VERS)
-    :sys cd .. && tar -czf $(WD)/asciidoc-$(VERS).tar.gz \
-        ``sed s:^:asciidoc-$(VERS)/: $(WD)/MANIFEST``
-    :sys cd .. && rm -f asciidoc-$VERS
+    :sys ln -s . $(NAME)
+    :sys tar -czf $(NAME).tar.gz \
+        ``sed s:^:$(NAME)/: MANIFEST``
+    :sys rm -f asciidoc-$VERS
     # Make zip file.
     ZIP = `program_path("zip")`
     @if ZIP:
-        :sys rm -f asciidoc-$(VERS).zip
-        :sys ls ``cat MANIFEST`` | $ZIP asciidoc-$(VERS).zip -@
+        :sys ln -s . $(NAME)
+        :sys rm -f $(NAME).zip
+        :sys ls ``sed s:^:$(NAME)/: MANIFEST`` | $ZIP $(NAME).zip -@
         # Zip files don't know about symlinks so just duplicate the
         # files.
-        :sys $ZIP asciidoc-$(VERS).zip \
-                doc/images/tiger.png \
-                doc/images/smallnew.png \
-                doc/images/icons/README \
-                doc/images/icons/*.png \
-                doc/images/icons/callouts/*.png \
-                examples/website/images/tiger.png \
-                examples/website/images/highlighter.png \
-                examples/website/images/smallnew.png \
-                examples/website/images/icons/README \
-                examples/website/images/icons/*.png \
-                examples/website/images/icons/callouts/*.png
+        :sys $ZIP $(NAME).zip \
+                $(NAME)/doc/images/tiger.png \
+                $(NAME)/doc/images/smallnew.png \
+                $(NAME)/doc/images/icons/README \
+                $(NAME)/doc/images/icons/*.png \
+                $(NAME)/doc/images/icons/callouts/*.png \
+                $(NAME)/examples/website/images/tiger.png \
+                $(NAME)/examples/website/images/highlighter.png \
+                $(NAME)/examples/website/images/smallnew.png \
+                $(NAME)/examples/website/images/icons/README \
+                $(NAME)/examples/website/images/icons/*.png \
+                $(NAME)/examples/website/images/icons/callouts/*.png
+        :sys rm -f asciidoc-$VERS
     @else:
         :print WARNING: zip(1) unavailable, skipping zip file creation