[docmaker] Allow `-' in bold and italic markup. * src/tools/docmaker/sources.py (re_italic, re_bold): Adjust accordingly.
diff --git a/ChangeLog b/ChangeLog
index 8071971..73a7a41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/src/tools/docmaker/sources.py b/src/tools/docmaker/sources.py
index 0cf21ce..be38132 100644
--- a/src/tools/docmaker/sources.py
+++ b/src/tools/docmaker/sources.py
@@ -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