diff options
| -rw-r--r-- | CHANGELOG.txt | 43 | ||||
| -rwxr-xr-x | asciidoc.py | 2 | ||||
| -rw-r--r-- | common.aap | 4 | ||||
| -rw-r--r-- | doc/asciidoc.dict | 39 | ||||
| -rw-r--r-- | doc/asciidoc.txt | 30 | ||||
| -rw-r--r-- | doc/faq.txt | 10 | ||||
| -rw-r--r-- | examples/website/asciidoc-website.dict | 4 | ||||
| -rw-r--r-- | examples/website/index.txt | 20 |
8 files changed, 98 insertions, 54 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 908882c..a9c2a75 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,49 @@ AsciiDoc ChangeLog :replacements.\bweb:: http://www.methods.co.nz/asciidoc/
+Version 8.3.5 (2009-02-02)
+--------------------------
+.Additions and changes
+- Cached compiled regular expression delimiters (speed up 'User
+ Manual' compilation by 250%).
+- Created distinct list definitions for each numbered list style to
+ allow nesting of all styles.
+- Roman numbers in numbered lists are followed by a closing
+ parenthesis instead of a period to eliminate 'i', 'v', 'x' item
+ ambiguity with respect to alpha numbered list items.
+- Added `pass:[**]`, `pass:[***]`, `pass:[****]`, `pass:[*****]`
+ bulleted lists.
+- Added `pass:[...]`, `pass:[....]`, `pass:[.....]` implicit numbered
+ lists.
+- Added `:::`, `::::` labeled lists.
+- Updated User Guide for new list syntaxes.
+- Optimized paragraph and list termination detection with separate
+ precompiled regular expressions for performance and to prevent
+ reaching Python 100 named group limit.
+- Updated Vim syntax highlighter for new list syntaxes.
+- Allow `template::[]` macros in conf file entries sections (not just
+ in template sections).
+- Dropped unused `[listdef-numbered2]` conf file sections.
+- Renamed 'ListBlock' to more appropriate 'OpenBlock'.
+- Implemented single-line versions of `ifdef::[]` and `ifndef::[]`
+ macros.
+- 'html4' backend styling:
+ * Underlined admonition captions.
+ * Added side border to Example Blocks.
+- 'xhtml11' backend styling:
+ * Dropped right hand margin from all but quote and verse blocks.
+ * html4 backend: corrected over-sized width of caption in admonition
+ block.
+
+.Bug fixes
+- Fixed broken numbered list nesting.
+
+Compatibility issues
+~~~~~~~~~~~~~~~~~~~~
+The roman numbered list parenthesis syntax is incompatible with the
+potentially ambiguous roman period syntax introduced in 8.3.2.
+
+
Version 8.3.4 (2009-01-20)
--------------------------
.Additions and changes
diff --git a/asciidoc.py b/asciidoc.py index f0e4f6c..a74c3ff 100755 --- a/asciidoc.py +++ b/asciidoc.py @@ -8,7 +8,7 @@ under the terms of the GNU General Public License (GPL). import sys, os, re, time, traceback, tempfile, subprocess, codecs, locale -VERSION = '8.3.4' # See CHANGLOG file for version history. +VERSION = '8.3.5' # See CHANGLOG file for version history. #--------------------------------------------------------------------------- # Program onstants. @@ -2,8 +2,8 @@ # Executed by all main.aap's before anything else. # -_parent.VERS = 8.3.4 -_parent.DATE = 20 January 2009 +_parent.VERS = 8.3.5 +_parent.DATE = 2 February 2009 all: :pass diff --git a/doc/asciidoc.dict b/doc/asciidoc.dict index 1ecbbf7..48188ae 100644 --- a/doc/asciidoc.dict +++ b/doc/asciidoc.dict @@ -1,7 +1,7 @@ -personal_ws-1.1 en 739 +personal_ws-1.1 en 742 Sturmer -Kleber Kléber +Kleber quis auctor linkcss @@ -12,8 +12,8 @@ BOLID callouts bulleted starttags -listingblock ListingBlock +listingblock eval ListLabel asc @@ -69,6 +69,7 @@ Luleå Lulea latexmathml LaTeXMathML +ListBlock CALS XSLT tyger @@ -95,8 +96,8 @@ pageunits LaTeX citetitle emphasizedwords -BlockTitle blocktitle +BlockTitle DTD CVS valign @@ -125,8 +126,8 @@ luptatum TitleBlock fmt subscripted -MiddleName middlename +MiddleName subdirectories footnoteref passtext @@ -147,8 +148,8 @@ entrytbl Ghostscript verear Buenos -linuxdoc LinuxDoc +linuxdoc PostScript hhp Vijay @@ -163,8 +164,8 @@ ListingBlocks GPL hsides upperalpha -Bolido Bólido +Bolido footrow misspelt WINNT @@ -176,8 +177,8 @@ bloggs hoc LiteralParagraphs primis -VerbatimBlock verbatimblock +VerbatimBlock corpname shiftwidth misevaluations @@ -229,6 +230,7 @@ sudo Helvetica SectionClose termtag +OpenBlock joe indir Comidas @@ -401,6 +403,7 @@ PRS CONFIG sem gzip +precompiled specialcharacters tablepcwidth codec @@ -457,8 +460,8 @@ arabic fringilla retab BackendBlocks -changelog ChangeLog +changelog tis Ubuntu sectids @@ -477,8 +480,8 @@ crlf vel Iisaka's localtime -blockmacro BlockMacro +blockmacro Xandros groff POSIX @@ -521,8 +524,8 @@ dbtimestamp txt BlockId passthrough -Berguvsvagen Berguvsvägen +Berguvsvagen noincsearch TableRow inlinemediaobject @@ -570,9 +573,9 @@ Redhat cb tuple cd -ASCIIMathML -AsciiMathML asciimathml +AsciiMathML +ASCIIMathML arounds filename mansource @@ -588,8 +591,8 @@ scaledwidth cp xsl fb -docbook DocBook +docbook stylesheet pagefile superscripted @@ -609,8 +612,8 @@ fprintf colabswidth tabsize smallnew -blocktitles BlockTitles +blocktitles localdate bodyrow hs @@ -660,8 +663,8 @@ permalink td py AROUT -LiteralBlock literalblock +LiteralBlock sgml biggy softtabstop @@ -677,8 +680,8 @@ tt blandit inline Martín -sectionbody SectionBody +sectionbody VM conformant listchars @@ -723,8 +726,8 @@ nbsp qanda noout massa -asciidoc AsciiDoc +asciidoc manmanual TableBody realpath diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt index 4f3f307..975164e 100644 --- a/doc/asciidoc.txt +++ b/doc/asciidoc.txt @@ -847,11 +847,12 @@ Example: [[X42]] -BlockTitles ------------ -A BlockTitle element is a single line beginning with a period followed -by a title. The title is applied to the next Paragraph, -DelimitedBlock, List, Table or BlockMacro. For example: +Block Titles +------------ +A 'BlockTitle' element is a single line beginning with a period +followed by the title text. A BlockTitle is applied to the immediately +following Paragraph, DelimitedBlock, List, Table or BlockMacro. For +example: ........................ .Notes @@ -871,8 +872,8 @@ BlockId Element --------------- A 'BlockId' is a single line block element containing a unique identifier enclosed in double square brackets. It is used to assign an -identifier to the ensuing block element for use by referring links. For -example: +identifier to the ensuing block element for use by referring links. +For example: [[chapter-titles]] Chapter titles can be ... @@ -882,10 +883,9 @@ linked from other location, for example with `\<<chapter-titles,chapter titles>>`. 'BlockId' elements can be applied to Title, Paragraph, List, -DelimitedBlock, Table and BlockMacro elements. The BlockId element is -really just an AttributeList with a special syntax which sets the -`\{id}` attribute for substitution in the subsequent block's markup -template. +DelimitedBlock, Table and BlockMacro elements. The BlockId element +sets the `\{id}` attribute for substitution in the subsequent block's +markup template. The 'BlockId' element has the same syntax and serves a similar function to the <<X30,anchor inline macro>>. @@ -1692,7 +1692,7 @@ children in the backend markup). Here are some examples of list item continuations: list item one contains multiple continuations; list item two is continued with an -<<X29,OpenBlock>> containing multip elements: +<<X29,OpenBlock>> containing multiple elements: --------------------------------------------------------------------- 1. List item one. @@ -2249,9 +2249,9 @@ The `include` macro includes a file as if it were part of the parent document -- tabs are expanded and system macros processed. The contents of `include1` files are not subject to tab expansion or system macro processing nor are attribute or lower priority -substitutions performed. The `include1` macro's main use is to include -verbatim embedded CSS or scripts into configuration file headers. -Example: +substitutions performed. The `include1` macro's intended use is to +include verbatim embedded CSS or scripts into configuration file +headers. Example: ------------------------------------ \include::chapter1.txt[tabsize=4] diff --git a/doc/faq.txt b/doc/faq.txt index 74cedd8..c029d32 100644 --- a/doc/faq.txt +++ b/doc/faq.txt @@ -280,7 +280,7 @@ This tip was contributed by Bernard Amade. == How can I supress cell separators in included table data files?
-Use the `\{include:}` system attribute instead of the `\include::[]`
+Use the `\{include:}` system attribute instead of the `include::[]`
macro (the former is not expanded until after the table data has been
parsed into cells, whereas the latter is included before the table is
processed.
@@ -310,9 +310,9 @@ homero verear ea mea, qui. == How can I include non-breaking space characters?
-The predefined `\{nbsp}` attribute reference will be replaced by a
-non-breaking space character. You could also use the non-breaking
-space character entity reference `\ ` (see the next question).
+Use the non-breaking space character entity reference `\ ` (see
+the next question). You could also use the predefined `\{nbsp}`
+attribute reference.
== Can I include HTML and XML character entity references in my document?
@@ -487,7 +487,7 @@ it useful). == Why have you used the DocBook <simpara> element instead of <para>?
`<simpara>` is really the same as `<para>` except it can't contain
-block elements -- this matched, more closely, the AsciiDoc paragraph
+block elements -- this matches, more closely, the AsciiDoc paragraph
semantics.
diff --git a/examples/website/asciidoc-website.dict b/examples/website/asciidoc-website.dict index 0da293e..f7fbb85 100644 --- a/examples/website/asciidoc-website.dict +++ b/examples/website/asciidoc-website.dict @@ -1,4 +1,4 @@ -personal_ws-1.1 en 161 +personal_ws-1.1 en 163 backends AsciiDoc's Rosten @@ -121,6 +121,7 @@ ShareSource Schottelius sqrt toolchain +precompiled scaledwidth usr linenumbering @@ -141,6 +142,7 @@ GPL Steen LaTeX latexmath +Bulleted blog conf backend diff --git a/examples/website/index.txt b/examples/website/index.txt index d81b5e4..c137215 100644 --- a/examples/website/index.txt +++ b/examples/website/index.txt @@ -5,18 +5,14 @@ AsciiDoc Home Page ************************************************************************
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).
+- Up to 250% faster than previous release (precompiled regular
+ expression optimization).
+- Bulleted lists can now be nested up to six deep with the addition of
+ two, three, four and five asterisk bullet syntaxes.
+- Implicitly numbered lists can now be nested up to six deep with the
+ addition of two, three, four and five period character syntaxes.
+- Labeled lists can now be nested up to four deep with the addition of
+ three and four colon syntaxes.
Plus a number of smaller additions along with the usual documentation
polishing. Read the link:CHANGELOG.html[CHANGELOG] for a full list of
|