From 16b3e620133a5a874a4e27c7b158187180cef13c Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 30 Nov 2014 20:58:27 +0100 Subject: [PATCH] * src/tools/docmaker/sources.py (column) [Format 2]: Fix regexp. After the single asterisk there must be no other immediately following asterisk. --- ChangeLog | 7 +++++++ src/tools/docmaker/sources.py | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbd25e60c..a0d3299af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-11-29 Werner Lemberg + + * src/tools/docmaker/sources.py (column) [Format 2]: Fix regexp. + + After the single asterisk there must be no other immediately following + asterisk. + 2014-11-29 Werner Lemberg * src/tools/docmaker/tohtml.py: Improve CSS for vertical spacing. diff --git a/src/tools/docmaker/sources.py b/src/tools/docmaker/sources.py index d60fd4464..61ecc22c4 100644 --- a/src/tools/docmaker/sources.py +++ b/src/tools/docmaker/sources.py @@ -98,9 +98,9 @@ start = r''' ''' column = r''' - \s* # any number of whitespace - \*{1}(?!/) # followed by precisely one asterisk not followed by `/' - (.*) # then anything (group1) + \s* # any number of whitespace + \*{1}(?![*/]) # followed by precisely one asterisk not followed by `/' + (.*) # then anything (group1) ''' end = r'''