summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt39
-rw-r--r--MANIFEST1
-rw-r--r--common.aap2
-rw-r--r--doc/asciidoc.dict38
-rw-r--r--doc/faq.txt4
l---------examples/website/asciidoc-graphviz-sample.txt1
-rw-r--r--examples/website/asciidoc-website.dict13
-rw-r--r--examples/website/index.txt35
-rw-r--r--examples/website/main.aap2
9 files changed, 103 insertions, 32 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 63247ff..b010292 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,45 @@ AsciiDoc ChangeLog
:replacements.\bweb:: http://www.methods.co.nz/asciidoc/
+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).
+- Hardwired 'CommentBlock' processing to ensure macros are not
+ executed inside comment blocks.
+- 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.
+
+
Version 8.3.1 (2008-12-14)
--------------------------
.Additions and changes
diff --git a/MANIFEST b/MANIFEST
index 720d920..ea05e68 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -45,6 +45,7 @@ examples/website/*.html
examples/website/images/
examples/website/layout?.conf
examples/website/music?.*
+examples/website/sample?.png
examples/website/toc.js
examples/website/*.txt
filters/code/code-filter.conf
diff --git a/common.aap b/common.aap
index af61e37..e0ce72e 100644
--- a/common.aap
+++ b/common.aap
@@ -3,7 +3,7 @@
#
_parent.VERS = 8.3.2
-_parent.DATE = ?? January 2009
+_parent.DATE = 1 January 2009
all:
:pass
diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict
index 842fb0f..d7a98f0 100644
--- a/doc/asciidoc.dict
+++ b/doc/asciidoc.dict
@@ -1,7 +1,7 @@
-personal_ws-1.1 en 728
+personal_ws-1.1 en 732
Sturmer
-Kleber
Kléber
+Kleber
quis
auctor
linkcss
@@ -12,8 +12,8 @@ BOLID
callouts
bulleted
starttags
-listingblock
ListingBlock
+listingblock
eval
ListLabel
asc
@@ -55,6 +55,7 @@ ListContinuation
listcontinuation
consectetuer
Magnocavallo
+Gouichi
defacto
ListParagraph
charset
@@ -122,8 +123,8 @@ luptatum
TitleBlock
fmt
subscripted
-MiddleName
middlename
+MiddleName
subdirectories
footnoteref
passtext
@@ -133,6 +134,7 @@ itemtag
entrytag
hhc
else's
+Graphviz
executables
basebackend
expr
@@ -143,8 +145,8 @@ entrytbl
Ghostscript
verear
Buenos
-linuxdoc
LinuxDoc
+linuxdoc
PostScript
hhp
Vijay
@@ -158,8 +160,8 @@ ListingBlocks
GPL
hsides
upperalpha
-Bolido
Bólido
+Bolido
footrow
misspelt
WINNT
@@ -171,8 +173,8 @@ bloggs
hoc
LiteralParagraphs
primis
-VerbatimBlock
verbatimblock
+VerbatimBlock
shiftwidth
misevaluations
asciidocEmphasized
@@ -451,8 +453,8 @@ arabic
fringilla
retab
BackendBlocks
-changelog
ChangeLog
+changelog
tis
Ubuntu
sectids
@@ -469,9 +471,10 @@ endtag
Vasilev
crlf
vel
+Iisaka's
localtime
-blockmacro
BlockMacro
+blockmacro
Xandros
groff
POSIX
@@ -514,8 +517,8 @@ dbtimestamp
txt
BlockId
passthrough
-Berguvsvagen
Berguvsvägen
+Berguvsvagen
noincsearch
TableRow
inlinemediaobject
@@ -563,9 +566,9 @@ Redhat
cb
tuple
cd
-ASCIIMathML
-AsciiMathML
asciimathml
+AsciiMathML
+ASCIIMathML
arounds
filename
mansource
@@ -581,14 +584,15 @@ scaledwidth
cp
xsl
fb
-docbook
DocBook
+docbook
stylesheet
pagefile
superscripted
glossdiv
symlinked
Mihai
+Pychart
Klum
fo
sgmlformat
@@ -600,8 +604,8 @@ fprintf
colabswidth
tabsize
smallnew
-blocktitles
BlockTitles
+blocktitles
localdate
bodyrow
hs
@@ -651,8 +655,8 @@ permalink
td
py
AROUT
-LiteralBlock
literalblock
+LiteralBlock
sgml
biggy
softtabstop
@@ -668,8 +672,8 @@ tt
blandit
inline
Martín
-sectionbody
SectionBody
+sectionbody
VM
conformant
listchars
@@ -712,8 +716,8 @@ nbsp
qanda
noout
massa
-asciidoc
AsciiDoc
+asciidoc
manmanual
TableBody
realpath
diff --git a/doc/faq.txt b/doc/faq.txt
index 6349b28..8a28a50 100644
--- a/doc/faq.txt
+++ b/doc/faq.txt
@@ -136,7 +136,7 @@ a backslash character. These elements include:
- Attribute references.
- Text formatting.
- Quoting,
-- 'URLs', 'image' and 'link' macros.
+- Macros.
- Replacements.
- Special words.
- Table cell separators.
@@ -174,8 +174,6 @@ the first match unescapes allowing the second to substitute. A
work-around for difficult cases is to side-step the problem using the
`\pass:[]` passthrough inline macro.
-NOTE: System macros cannot be escaped.
-
== How can I set default list and tables styles?
diff --git a/examples/website/asciidoc-graphviz-sample.txt b/examples/website/asciidoc-graphviz-sample.txt
new file mode 120000
index 0000000..24b4ea6
--- /dev/null
+++ b/examples/website/asciidoc-graphviz-sample.txt
@@ -0,0 +1 @@
+../../filters/graphviz/asciidoc-graphviz-sample.txt \ No newline at end of file
diff --git a/examples/website/asciidoc-website.dict b/examples/website/asciidoc-website.dict
index 5bfda33..b4cd46d 100644
--- a/examples/website/asciidoc-website.dict
+++ b/examples/website/asciidoc-website.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 149
+personal_ws-1.1 en 158
backends
AsciiDoc's
Rosten
@@ -24,11 +24,13 @@ Potapov
backmatter
SourceForge
Solaris
+loweralpha
newtables
ikiwiki
callout
firefox
SGML
+graphviz
dx
doctests
hg
@@ -50,8 +52,8 @@ symlink
xhtml
ln
Philips
-LaTeXMathML
latexmathml
+LaTeXMathML
LaTexMathML
outlang
Efros
@@ -70,10 +72,12 @@ ImageMagick
Pommereau
ly
programlisting
+upperroman
Xubuntu
syntaxes
dblatex
stdout
+Iisaka
asciidoc
AsciiDoc
AsciiMathML
@@ -82,6 +86,7 @@ ASCIIMathML
ps
odf
filetype
+arabic
Rosenkraenzer
py
ua
@@ -105,6 +110,7 @@ pdf
userguide
Rapaz
Rřsten
+lowerroman
refentry
stylesheets
Gingras
@@ -143,8 +149,11 @@ png
formulae
Mandelson
xml
+upperalpha
Wiese
chunked
+Gouichi
Jipsen
+Iisaka's
Wiki
dBA
diff --git a/examples/website/index.txt b/examples/website/index.txt
index c38510b..fcfa890 100644
--- a/examples/website/index.txt
+++ b/examples/website/index.txt
@@ -3,15 +3,22 @@ AsciiDoc Home Page
.{date}: AsciiDoc {revision} Released
************************************************************************
-This release fixes a couple of regression bugs in the initial
-link:version83.html[version 8.3] release along with some minor
-additions.
-The platform dependent `install.sh` script has been replaced with an
-link:INSTALL.html#_distribution_tarball_installation[autoconf make
-file] (this change didn't make it into the 8.3.0 release because of
-time constraints).
-Read the link:CHANGELOG.html[CHANGELOG] for a full list of all
-additions and changes.
+Two significant changes in this release:
+
+- Included Gouichi Iisaka's <<X4,Graphviz filter>> in the AsciiDoc
+ distribution.
+- You can now set the numbered list number style by setting the
+ 'numeration' and 'numeration2' attributes ('arabic', 'loweralpha',
+ 'upperalpha', 'lowerroman' and 'upperroman') or letting AsciiDoc
+ guess the style of the first numbered item.
+
+Plus a number of smaller additions along with the usual documentation
+polishing. Read the link:CHANGELOG.html[CHANGELOG] for a full list of
+all additions and changes.
+
+One final note: if you are upgrading from version 8.2.7 or less please
+read about possible link:CHANGELOG.html#X1[compatibility issues]
+first.
mailto:srackham@gmail.com['Stuart Rackham']
************************************************************************
@@ -113,6 +120,16 @@ A link:source-highlight-filter.html[source code highlight filter] is
included in the distribution `./filters/` directory.
+[[X4]]
+Graphviz Filter
+---------------
+Gouichi Iisaka has written a http://www.graphviz.org/[Graphviz] filter
+for AsciiDoc. Graphviz generates diagrams from a textual
+specification. Gouichi Iisaka's Graphviz filter is included in the
+AsciiDoc distribution. Here are some
+link:asciidoc-graphviz-sample.html[AsciiDoc Graphviz examples].
+
+
[[X3]]
Mathematical Formulae
---------------------
diff --git a/examples/website/main.aap b/examples/website/main.aap
index 9000431..4758564 100644
--- a/examples/website/main.aap
+++ b/examples/website/main.aap
@@ -15,6 +15,7 @@ LOCAL_WEB = ~/tmp/asciidoc-web # Local web marshalling location.
WEB_ROOT =
a2x.1
asciidoc-docbook-xsl
+ asciidoc-graphviz-sample
asciimathml
CHANGELOG
downloads
@@ -130,6 +131,7 @@ copy: all
:sys mkdir -p $LOCAL_WEB/chunked/
:sys cp $DOCS_DIR/asciidoc.chunked/*.html $LOCAL_WEB/chunked/
:sys cp music?.* $LOCAL_WEB
+ :sys cp sample?.png $LOCAL_WEB
clean:
:del {f} $WEB_PAGES