diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2011-02-04 13:39:15 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2011-02-04 13:39:15 +0000 |
| commit | ebf0aa14d02c9b40512d0aafd9c89cdb0e834cbc (patch) | |
| tree | 22903e6e2c398c87dd2f2e203cd83f49fcadf267 /src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala | |
| parent | 566857e894c3f8a3ec5c77e1a5b36289f4cc3a17 (diff) | |
| download | scala-ebf0aa14d02c9b40512d0aafd9c89cdb0e834cbc.tar.gz scala-ebf0aa14d02c9b40512d0aafd9c89cdb0e834cbc.tar.bz2 scala-ebf0aa14d02c9b40512d0aafd9c89cdb0e834cbc.zip | |
[scaladoc] Scaladoc recognises HTML entities in...
[scaladoc] Scaladoc recognises HTML entities in comments, and leaves
them untouched (except in code blocks defined using wiki syntax). Fixes
#4184. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala index b6855353f4..62ecae7b4f 100644 --- a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala @@ -172,7 +172,7 @@ trait CommentFactory { thisFactory: ModelFactory with CommentFactory => /** Safe HTML tags that can be kept. */ protected val SafeTags = - new Regex("""((<code( [^>]*)?>.*</code>)|(</?(abbr|acronym|address|area|a|bdo|big|blockquote|br|button|b|caption|cite|col|colgroup|dd|del|dfn|em|fieldset|form|hr|img|input|ins|i|kbd|label|legend|link|map|object|optgroup|option|param|pre|q|samp|select|small|span|strong|sub|sup|table|tbody|td|textarea|tfoot|th|thead|tr|tt|var)( [^>]*)?/?>))""") + new Regex("""((&\w+;)|(<code( [^>]*)?>.*</code>)|(</?(abbr|acronym|address|area|a|bdo|big|blockquote|br|button|b|caption|cite|col|colgroup|dd|del|dfn|em|fieldset|form|hr|img|input|ins|i|kbd|label|legend|link|map|object|optgroup|option|param|pre|q|samp|select|small|span|strong|sub|sup|table|tbody|td|textarea|tfoot|th|thead|tr|tt|var)( [^>]*)?/?>))""") protected val safeTagMarker = '\u000E' |