From 1e0846707622d0301b821cec67d3d0aac6361273 Mon Sep 17 00:00:00 2001
From: Gilles Dubochet <gilles.dubochet@epfl.ch>
Date: Tue, 15 Jun 2010 16:08:57 +0000
Subject: [scaladoc] Slightly more robust treatment of "c...

[scaladoc] Slightly more robust treatment of "code" HTML elements in
Scaladoc comments. No review.
---
 src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

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 475fbf584e..c7cf146894 100644
--- a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala
@@ -71,14 +71,13 @@ trait CommentFactory { thisFactory: ModelFactory with CommentFactory =>
     case "/h3" => " ===\n"
     case "h4" | "h5" | "h6" => "\n==== "
     case "/h4" | "/h5" | "/h6" => " ====\n"
-    case "code" | "/code" => "`"
     case "li" => "\n *  - "
     case _ => ""
   }
 
   /** Safe HTML tags that can be kept. */
   protected val SafeTags =
-    new Regex("""(</?(abbr|acronym|address|area|a|bdo|big|blockquote|br|button|b|caption|code|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("""((<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'
 
-- 
cgit v1.2.3