- Bumped version number.8.3.3

- Attribute lists can now preceed nested lists.

5 files changed, 33 insertions, 13 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6ba7107..42267ac 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,15 @@ AsciiDoc ChangeLog
 

 :replacements.\bweb:: http://www.methods.co.nz/asciidoc/

 

+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.

+

+

 Version 8.3.2 (2009-01-01)

 --------------------------

 .Additions and changes

diff --git a/asciidoc.py b/asciidoc.py
index ae0b7b0..70901ec 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.2'   # See CHANGLOG file for version history.
+VERSION = '8.3.3'   # See CHANGLOG file for version history.
 
 #---------------------------------------------------------------------------
 # Program onstants.
@@ -2198,9 +2198,6 @@ class List(AbstractBlock):
     def iscontinued(self):
         if reader.read_next() == '+':
             reader.read()   # Discard.
-            # Allow attribute list to precede continued list item element.
-            while Lex.next() is AttributeList:
-                Lex.next().translate()
             return True
         else:
             return False
@@ -2229,6 +2226,7 @@ class List(AbstractBlock):
                     lists.delimiter + r'|^\+$|^$|' + blocks.delimiter
                     + r'|' + tables.delimiter
                     + r'|' + tables_OLD.delimiter
+                    + r'|' + AttributeList.pattern
             )
             if self.text is not None:
                 text = [self.text] + list(text)
@@ -2236,6 +2234,9 @@ class List(AbstractBlock):
                 writer.write_tag(self.tag.text, text, self.presubs, self.attributes)
             continued = self.iscontinued()
         while True:
+            # Allow attribute list to precede continued list item element.
+            while Lex.next() is AttributeList:
+                Lex.next().translate()
             next = Lex.next()
             if next in lists.open:
                 break
@@ -2263,11 +2264,16 @@ class List(AbstractBlock):
                     lists.delimiter + r'|^$|' + blocks.delimiter
                     + r'|' + tables.delimiter
                     + r'|' + tables_OLD.delimiter
+                    + r'|' + AttributeList.pattern
             )
             if self.text is not None:
                 text = [self.text] + list(text)
-            writer.write_tag(self.tag.text, text, self.presubs, self.attributes)
+            if text:
+                writer.write_tag(self.tag.text, text, self.presubs, self.attributes)
         while True:
+            # Allow attribute list to precede continued list item element.
+            while Lex.next() is AttributeList:
+                Lex.next().translate()
             next = Lex.next()
             if next in lists.open:
                 break
diff --git a/common.aap b/common.aap
index e0ce72e..ae0cb59 100644
--- a/common.aap
+++ b/common.aap
@@ -2,8 +2,8 @@
 # Executed by all main.aap's before anything else.
 #
 
-_parent.VERS = 8.3.2
-_parent.DATE = 1 January 2009
+_parent.VERS = 8.3.3
+_parent.DATE = 2 January 2009
 
 all:
     :pass
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index 7d88f2f..73f4916 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -1379,6 +1379,7 @@ Here are some examples of bulleted and numbered lists:
 - Nulla porttitor vulputate libero.
   . Fusce euismod commodo velit.
   . Vivamus fringilla mi eu lacus.
+[upperroman]
     .. Fusce euismod commodo velit.
     .. Vivamus fringilla mi eu lacus.
   . Donec eget arcu bibendum nunc consequat lobortis.
@@ -1388,6 +1389,8 @@ Here are some examples of bulleted and numbered lists:
     b. Vivamus fringilla mi eu lacus.
     c. Donec eget arcu bibendum nunc consequat lobortis.
   2. Vivamus fringilla mi eu lacus.
+    .. Fusce euismod commodo velit.
+    .. Vivamus fringilla mi eu lacus.
   3. Donec eget arcu bibendum nunc consequat lobortis.
   4. Nam fermentum mattis ante.
 ---------------------------------------------------------------------
@@ -1404,6 +1407,7 @@ Which render as:
 - Nulla porttitor vulputate libero.
   . Fusce euismod commodo velit.
   . Vivamus fringilla mi eu lacus.
+[upperroman]
     .. Fusce euismod commodo velit.
     .. Vivamus fringilla mi eu lacus.
   . Donec eget arcu bibendum nunc consequat lobortis.
@@ -1413,6 +1417,8 @@ Which render as:
     b. Vivamus fringilla mi eu lacus.
     c. Donec eget arcu bibendum nunc consequat lobortis.
   2. Vivamus fringilla mi eu lacus.
+    .. Fusce euismod commodo velit.
+    .. Vivamus fringilla mi eu lacus.
   3. Donec eget arcu bibendum nunc consequat lobortis.
   4. Nam fermentum mattis ante.
 
@@ -2453,8 +2459,8 @@ There are a wide variety of built-in customizable styles.
 *********************************************************************
 When technical users first start creating documents, tables (complete
 with column spanning and table nesting) are often considered very
-important.  important must-have feature. The reality is that tables
-are seldom used, even in technical documentation.
+important. The reality is that tables are seldom used, even in
+technical documentation.
 
 Try this exercise: thumb through your library of technical books,
 you'll be surprised just how seldom tables are actually used, even
diff --git a/examples/website/index.txt b/examples/website/index.txt
index fcfa890..3207a61 100644
--- a/examples/website/index.txt
+++ b/examples/website/index.txt
@@ -7,10 +7,9 @@ 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.

+- 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.

 

 Plus a number of smaller additions along with the usual documentation

 polishing.  Read the link:CHANGELOG.html[CHANGELOG] for a full list of