summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt37
-rw-r--r--README.txt2
-rwxr-xr-xasciidoc.py4
-rw-r--r--common.aap4
-rw-r--r--doc/a2x.1.txt2
-rw-r--r--doc/asciidoc.1.txt2
-rw-r--r--doc/asciidoc.dict36
-rw-r--r--doc/asciidoc.txt4
-rw-r--r--examples/website/asciidoc-website.dict5
-rw-r--r--examples/website/index.txt28
10 files changed, 90 insertions, 34 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f8bfb4d..908882c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,43 @@ AsciiDoc ChangeLog
:replacements.\bweb:: http://www.methods.co.nz/asciidoc/
+Version 8.3.4 (2009-01-20)
+--------------------------
+.Additions and changes
+- Implemented a title 'float' style. A floating title (or bridgehead)
+ is rendered just like a normal section but is not formally
+ associated with a text body and is not part of the regular section
+ hierarchy so the normal ordering rules do not apply.
+- Implemented inline comment macro so comment lines can now appear
+ inside block elements.
+- Comment lines are sent to the output if the 'showcomments' attribute
+ is defined (comment blocks are never sent to the output).
+- Single quoting attribute values in 'AttributeList' elements causes
+ them to be substituted like normal inline text (without single
+ quoting only attribute substitution is performed).
+- Rewrote list item processing (was very crufty). List continuation
+ and list blocks now work as expected. Updated and clarified list
+ documentation in User Guide.
+- The 'revision' attribute now recognizes the RCS $Id$ marker format.
+- An RCS $Id$ marker formatted revision line in the header does not
+ need to be preceded by an author line.
+- If an RCS $Id$ formatted revision is specified and the author name
+ has not already been set then the author name in the $Id$ marker
+ will be used.
+- Updated Gouichi Iisaka's Graphviz filter to version 1.1.3.
+- Added 'autowidth' table attribute option for (X)HTML outputs.
+- DocBook backend now puts 'orgname' optional attribute in DocBook
+ header.
+- Deprecated undocumented 'companyname' attribute in favor of
+ DocBook's 'corpname'.
+- Removed explicit closing backslash from HTML4 self-closing tags to
+ comply with WC3 recommendation.
+
+.Bug fixes
+- Fixed 8.3.3 regression whereby adjacent lists with the same syntax
+ but different list styles were incorrectly treated as a single list.
+
+
Version 8.3.3 (2009-01-02)
--------------------------
This release supersedes 8.3.2.
diff --git a/README.txt b/README.txt
index b313b4e..e57ce30 100644
--- a/README.txt
+++ b/README.txt
@@ -31,6 +31,6 @@ Current AsciiDoc version tested on Xubuntu Linux 8.04 with:
COPYING
-------
-Copyright (C) 2002-2008 Stuart Rackham. Free use of this software
+Copyright (C) 2002-2009 Stuart Rackham. Free use of this software
is granted under the terms of the GNU General Public License (GPL).
diff --git a/asciidoc.py b/asciidoc.py
index 12d3bef..7fc20c2 100755
--- a/asciidoc.py
+++ b/asciidoc.py
@@ -2,13 +2,13 @@
"""
asciidoc - converts an AsciiDoc text file to DocBook, HTML or LinuxDoc
-Copyright (C) 2002-2008 Stuart Rackham. Free use of this software is granted
+Copyright (C) 2002-2009 Stuart Rackham. Free use of this software is granted
under the terms of the GNU General Public License (GPL).
"""
import sys, os, re, time, traceback, tempfile, subprocess, codecs, locale
-VERSION = '8.3.3' # See CHANGLOG file for version history.
+VERSION = '8.3.4' # See CHANGLOG file for version history.
#---------------------------------------------------------------------------
# Program onstants.
diff --git a/common.aap b/common.aap
index ae0cb59..6c8ad87 100644
--- a/common.aap
+++ b/common.aap
@@ -2,8 +2,8 @@
# Executed by all main.aap's before anything else.
#
-_parent.VERS = 8.3.3
-_parent.DATE = 2 January 2009
+_parent.VERS = 8.3.4
+_parent.DATE = 20 January 2009
all:
:pass
diff --git a/doc/a2x.1.txt b/doc/a2x.1.txt
index f9d4eab..564fbc5 100644
--- a/doc/a2x.1.txt
+++ b/doc/a2x.1.txt
@@ -199,6 +199,6 @@ Main web site: http://www.methods.co.nz/asciidoc/
COPYING
-------
-Copyright \(C) 2002-2008 Stuart Rackham. Free use of this software is
+Copyright \(C) 2002-2009 Stuart Rackham. Free use of this software is
granted under the terms of the GNU General Public License (GPL).
diff --git a/doc/asciidoc.1.txt b/doc/asciidoc.1.txt
index f6c239d..68488bc 100644
--- a/doc/asciidoc.1.txt
+++ b/doc/asciidoc.1.txt
@@ -113,6 +113,6 @@ Main web site: <http://www.methods.co.nz/asciidoc/>
COPYING
-------
-Copyright \(C) 2002-2008 Stuart Rackham. Free use of this software is
+Copyright \(C) 2002-2009 Stuart Rackham. Free use of this software is
granted under the terms of the GNU General Public License (GPL).
diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict
index 8e7031f..1ecbbf7 100644
--- a/doc/asciidoc.dict
+++ b/doc/asciidoc.dict
@@ -1,7 +1,7 @@
-personal_ws-1.1 en 737
+personal_ws-1.1 en 739
Sturmer
-Kléber
Kleber
+Kléber
quis
auctor
linkcss
@@ -12,8 +12,8 @@ BOLID
callouts
bulleted
starttags
-ListingBlock
listingblock
+ListingBlock
eval
ListLabel
asc
@@ -81,6 +81,7 @@ callto
vsides
tablewidth
Morbi
+DocBook's
monospacedwords
css
asciimath
@@ -124,8 +125,8 @@ luptatum
TitleBlock
fmt
subscripted
-middlename
MiddleName
+middlename
subdirectories
footnoteref
passtext
@@ -146,8 +147,8 @@ entrytbl
Ghostscript
verear
Buenos
-LinuxDoc
linuxdoc
+LinuxDoc
PostScript
hhp
Vijay
@@ -156,13 +157,14 @@ systemIdStartString
README
utils
CustomBlock
+orgname
fermentum
ListingBlocks
GPL
hsides
upperalpha
-Bólido
Bolido
+Bólido
footrow
misspelt
WINNT
@@ -174,8 +176,8 @@ bloggs
hoc
LiteralParagraphs
primis
-verbatimblock
VerbatimBlock
+verbatimblock
corpname
shiftwidth
misevaluations
@@ -455,8 +457,8 @@ arabic
fringilla
retab
BackendBlocks
-ChangeLog
changelog
+ChangeLog
tis
Ubuntu
sectids
@@ -475,8 +477,8 @@ crlf
vel
Iisaka's
localtime
-BlockMacro
blockmacro
+BlockMacro
Xandros
groff
POSIX
@@ -519,8 +521,8 @@ dbtimestamp
txt
BlockId
passthrough
-Berguvsvägen
Berguvsvagen
+Berguvsvägen
noincsearch
TableRow
inlinemediaobject
@@ -568,9 +570,9 @@ Redhat
cb
tuple
cd
-asciimathml
-AsciiMathML
ASCIIMathML
+AsciiMathML
+asciimathml
arounds
filename
mansource
@@ -586,8 +588,8 @@ scaledwidth
cp
xsl
fb
-DocBook
docbook
+DocBook
stylesheet
pagefile
superscripted
@@ -607,8 +609,8 @@ fprintf
colabswidth
tabsize
smallnew
-BlockTitles
blocktitles
+BlockTitles
localdate
bodyrow
hs
@@ -658,8 +660,8 @@ permalink
td
py
AROUT
-literalblock
LiteralBlock
+literalblock
sgml
biggy
softtabstop
@@ -675,8 +677,8 @@ tt
blandit
inline
Martín
-SectionBody
sectionbody
+SectionBody
VM
conformant
listchars
@@ -721,8 +723,8 @@ nbsp
qanda
noout
massa
-AsciiDoc
asciidoc
+AsciiDoc
manmanual
TableBody
realpath
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index 259f7d2..5437498 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -837,7 +837,9 @@ Setting the first title attribute to `float` generates a free-floating
title. A free-floating title is rendered just like a normal section
title but is not formally associated with a text body and is not part
of the regular section hierarchy so the normal ordering rules do not
-apply. Example:
+apply. Floating titles can also be used in contexts where section
+titles are illegal: for example sidebar, admonition and list blocks.
+Example:
[float]
The second day
diff --git a/examples/website/asciidoc-website.dict b/examples/website/asciidoc-website.dict
index b4cd46d..0da293e 100644
--- a/examples/website/asciidoc-website.dict
+++ b/examples/website/asciidoc-website.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 158
+personal_ws-1.1 en 161
backends
AsciiDoc's
Rosten
@@ -43,6 +43,7 @@ multi
LinuxDoc
faq
Rackham
+showcomments
jw
src
Calixto
@@ -98,6 +99,7 @@ dvi
callouts
sinx
vB
+autowidth
Sakellariou
frontmatter
dxf
@@ -152,6 +154,7 @@ xml
upperalpha
Wiese
chunked
+AttributeList
Gouichi
Jipsen
Iisaka's
diff --git a/examples/website/index.txt b/examples/website/index.txt
index 3207a61..d81b5e4 100644
--- a/examples/website/index.txt
+++ b/examples/website/index.txt
@@ -3,13 +3,20 @@ AsciiDoc Home Page
.{date}: AsciiDoc {revision} Released
************************************************************************
-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 ('arabic',
- 'loweralpha', 'upperalpha', 'lowerroman', 'upperroman') or let
- AsciiDoc guess the style of the first numbered item.
+Additions and change in this release include:
+
+- Implemented a title 'float' style. A floating title (or bridgehead)
+ is rendered just like a normal section but is not formally
+ associated with a text body and is not part of the regular section
+ hierarchy so the normal ordering rules do not apply.
+- Implemented inline comment macro so comment lines can now appear
+ inside block elements.
+- Comment lines are sent to the output if the 'showcomments' attribute
+ is defined (comment blocks are never sent to the output).
+- Added 'autowidth' table attribute option for (X)HTML outputs.
+- Single quoting attribute values in 'AttributeList' elements causes
+ them to be substituted like normal inline text (without single
+ quoting only attribute substitution is performed).
Plus a number of smaller additions along with the usual documentation
polishing. Read the link:CHANGELOG.html[CHANGELOG] for a full list of
@@ -97,13 +104,18 @@ from link:asciidoc.1.txt[this file].
This link:asciidoc.1[roff formatted man page] was generated from
asciidoc(1) DocBook output using `xsltproc(1)` and DocBook XSL
Stylesheets.
-
+
Example Web Site
~~~~~~~~~~~~~~~~
The link:README-website.html[AsciiDoc website] is included in the
AsciiDoc distribution (in `./examples/website/`) as example website
built using AsciiDoc. See `./examples/website/README-website.txt`.
+More examples
+~~~~~~~~~~~~~
+- link:newtables.html[Tables].
+//- link:newlists.html[Lists].
+
Music Filter
------------