Mercurial > public > mercurial-scm > hg-stable
diff mercurial/minirst.py @ 31145:6582b3716ae0
minirst: detect bullet lists using asterisks
Previously, the "bullet" regular expression excluded the asterisk
('*') as a character denoting a bulleted list. Why I'm not sure
because the asterisk seems to be the canonical bullet character
in reST these days.
This patch makes asterisk-prefixed lines parse as bulleted lists.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 15 Feb 2017 16:42:17 -0800 |
| parents | bff77a693531 |
| children | 50a49ead4db4 |
line wrap: on
line diff
--- a/mercurial/minirst.py Wed Mar 01 20:22:04 2017 +0100 +++ b/mercurial/minirst.py Wed Feb 15 16:42:17 2017 -0800 @@ -138,7 +138,7 @@ 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 @@ 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)