[docmaker] Allow `-' in bold and italic markup.

* src/tools/docmaker/sources.py (re_italic, re_bold): Adjust
accordingly.
This commit is contained in:
Werner Lemberg 2015-09-10 07:44:11 +02:00
parent 09948e426e
commit e5a27a7596
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2015-09-10 Werner Lemberg <wl@gnu.org>
[docmaker] Allow `-' in bold and italic markup.
* src/tools/docmaker/sources.py (re_italic, re_bold): Adjust
accordingly.
2015-09-09 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/ftcalc.c (FT_RoundFix): Improve.

View File

@ -150,10 +150,11 @@ re_crossref = re.compile( r'@((?:\w|-)*)(.*)' ) # @foo
# Group 1 is the markup, group 2 the rest of the line.
#
# Note that the markup is limited to words consisting of letters, digits,
# the character `_', or an apostrophe (but not as the first character).
# the characters `_' and `-', or an apostrophe (but not as the first
# character).
#
re_italic = re.compile( r"_(\w(?:\w|')*)_(.*)" ) # _italic_
re_bold = re.compile( r"\*(\w(?:\w|')*)\*(.*)" ) # *bold*
re_italic = re.compile( r"_((?:\w|-)(?:\w|'|-)*)_(.*)" ) # _italic_
re_bold = re.compile( r"\*((?:\w|-)(?:\w|'|-)*)\*(.*)" ) # *bold*
#
# This regular expression code to identify an URL has been taken from