- Created distinct list definitions for each 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 **, ***, ****, ***** bulleted lists.
- Added ..., ...., ..... numbered lists.
- Added :::, :::: labeled lists.
- Optimized paragraph and list termination detection with separate precompiled
  re's for performance and to prevent reaching Python 100 group limit.
- Tidied up some method and argument names.
- Updated User Guide for new list syntaxes.
- Updated Vim syntax highlighter for new list syntaxes.

1 files changed, 87 insertions, 8 deletions

diff --git a/asciidoc.conf b/asciidoc.conf
index 66dda56..3fdf145 100644
--- a/asciidoc.conf
+++ b/asciidoc.conf
@@ -317,6 +317,7 @@ posattrs=style
 # Lists

 #-------

 [listdef-bulleted]

+# - bullets.

 delimiter=^\s*- +(?P<text>.+)$

 posattrs=style

 type=bulleted

@@ -324,24 +325,91 @@ tags=bulleted
 callout-style=tags="callout"

 bibliography-style=tags="bibliography"

 

-[listdef-bulleted2]

+[listdef-bulleted1]

+# * bullets.

 template::[listdef-bulleted]

 delimiter=^\s*\* +(?P<text>.+)$

 

-[listdef-numbered]

-delimiter=^\s*(?P<index>\d*)\. +(?P<text>.+)$

+[listdef-bulleted2]

+# ** bullets.

+template::[listdef-bulleted]

+delimiter=^\s*\*{2} +(?P<text>.+)$

+

+[listdef-bulleted3]

+# *** bullets.

+template::[listdef-bulleted]

+delimiter=^\s*\*{3} +(?P<text>.+)$

+

+[listdef-bulleted4]

+# **** bullets.

+template::[listdef-bulleted]

+delimiter=^\s*\*{4} +(?P<text>.+)$

+

+[listdef-bulleted5]

+# ***** bullets.

+template::[listdef-bulleted]

+delimiter=^\s*\*{5} +(?P<text>.+)$

+

+[listdef-arabic]

+# Arabic numbering.

+delimiter=^\s*(?P<index>\d+)\. +(?P<text>.+)$

 posattrs=style

 type=numbered

 tags=numbered

 style=arabic

 

-[listdef-numbered2]

-template::[listdef-numbered]

-delimiter=^\s*(?P<index>[.a-zA-Z]|[ivxIVX]+)\. +(?P<text>.+)$

+[listdef-loweralpha]

+# Lower alpha numbering.

+template::[listdef-arabic]

+delimiter=^\s*(?P<index>[a-z])\. +(?P<text>.+)$

 style=loweralpha

 

+[listdef-upperalpha]

+# Upper alpha numbering.

+template::[listdef-arabic]

+delimiter=^\s*(?P<index>[A-Z])\. +(?P<text>.+)$

+style=upperalpha

+

+[listdef-lowerroman]

+# Lower roman numbering.

+template::[listdef-arabic]

+delimiter=^\s*(?P<index>[ivx]+)\) +(?P<text>.+)$

+style=lowerroman

+

+[listdef-upperroman]

+# Upper roman numbering.

+template::[listdef-arabic]

+delimiter=^\s*(?P<index>[IVX]+)\) +(?P<text>.+)$

+style=upperroman

+

+[listdef-numbered1]

+# . numbering.

+template::[listdef-arabic]

+delimiter=^\s*(?P<index>\.) +(?P<text>.+)$

+

+[listdef-numbered2]

+# .. numbering.

+template::[listdef-loweralpha]

+delimiter=^\s*(?P<index>\.{2}) +(?P<text>.+)$

+

+[listdef-numbered3]

+# ... numbering.

+template::[listdef-lowerroman]

+delimiter=^\s*(?P<index>\.{3}) +(?P<text>.+)$

+

+[listdef-numbered4]

+# .... numbering.

+template::[listdef-upperalpha]

+delimiter=^\s*(?P<index>\.{4}) +(?P<text>.+)$

+

+[listdef-numbered5]

+# ..... numbering.

+template::[listdef-upperroman]

+delimiter=^\s*(?P<index>\.{5}) +(?P<text>.+)$

+

 [listdef-labeled]

-delimiter=^\s*(?P<label>.*\S)::(\s+(?P<text>.+))?$

+# label:: item.

+delimiter=^\s*(?P<label>.*[^:])::(\s+(?P<text>.+))?$

 posattrs=style

 type=labeled

 tags=labeled

@@ -351,8 +419,19 @@ glossary-style=tags="glossary"
 qanda-style=tags="qanda"

 

 [listdef-labeled2]

+# label;; item.

+template::[listdef-labeled]

+delimiter=^\s*(?P<label>.*[^;]);;(\s+(?P<text>.+))?$

+

+[listdef-labeled3]

+# label::: item.

+template::[listdef-labeled]

+delimiter=^\s*(?P<label>.*[^:]):{3}(\s+(?P<text>.+))?$

+

+[listdef-labeled4]

+# label:::: item.

 template::[listdef-labeled]

-delimiter=^\s*(?P<label>.*\S);;(\s+(?P<text>.+))?$

+delimiter=^\s*(?P<label>.*[^:]):{4}(\s+(?P<text>.+))?$

 

 [listdef-callout]

 posattrs=style