diff --git a/mercurial/minirst.py b/mercurial/minirst.py --- a/mercurial/minirst.py +++ b/mercurial/minirst.py @@ -138,7 +138,7 @@ def findliteralblocks(blocks): i += 1 return blocks -_bulletre = re.compile(r'(-|[0-9A-Za-z]+\.|\(?[0-9A-Za-z]+\)|\|) ') +_bulletre = re.compile(r'(\*|-|[0-9A-Za-z]+\.|\(?[0-9A-Za-z]+\)|\|) ') _optionre = re.compile(r'^(-([a-zA-Z0-9]), )?(--[a-z0-9-]+)' r'((.*) +)(.*)$') _fieldre = re.compile(r':(?![: ])([^:]*)(?<! ):[ ]+(.*)') @@ -596,7 +596,7 @@ def formathtml(blocks): out.append(' <dt>%s\n <dd>%s\n' % (term, text)) elif btype == 'bullet': bullet, head = lines[0].split(' ', 1) - if bullet == '-': + if bullet in ('*', '-'): openlist('ul', level) else: openlist('ol', level) diff --git a/tests/test-minirst.py b/tests/test-minirst.py --- a/tests/test-minirst.py +++ b/tests/test-minirst.py @@ -118,6 +118,13 @@ Line blocks are also a form of list: | This is the first line. The line continues here. | This is the second line. + +Bullet lists are also detected: + +* This is the first bullet +* This is the second bullet + It has 2 lines +* This is the third bullet """ debugformats('lists', lists) diff --git a/tests/test-minirst.py.out b/tests/test-minirst.py.out --- a/tests/test-minirst.py.out +++ b/tests/test-minirst.py.out @@ -187,6 +187,12 @@ Line blocks are also a form of list: This is the first line. The line continues here. This is the second line. + +Bullet lists are also detected: + +* This is the first bullet +* This is the second bullet It has 2 lines +* This is the third bullet ---------------------------------------------------------------------- 30 column format: @@ -231,6 +237,14 @@ list: This is the first line. The line continues here. This is the second line. + +Bullet lists are also +detected: + +* This is the first bullet +* This is the second bullet It + has 2 lines +* This is the third bullet ---------------------------------------------------------------------- html format: @@ -276,6 +290,14 @@ Line blocks are also a form of list: <li> This is the first line. The line continues here. <li> This is the second line. </ol> +<p> +Bullet lists are also detected: +</p> +<ul> + <li> This is the first bullet + <li> This is the second bullet It has 2 lines + <li> This is the third bullet +</ul> ---------------------------------------------------------------------- == options ==