Commits

Stuart Rackham  committed 0c7a79e

- Bumped version number.
- Attribute lists can now preceed nested lists.

  • Participants
  • Parent commits 9afc91c
  • Tags 8.3.3

Comments (0)

Files changed (5)

File CHANGELOG.txt

 
 :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
 
 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.
     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
                     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)
             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
                     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
 # 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

File doc/asciidoc.txt

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

File examples/website/index.txt

 
 - 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