diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2010-05-12 15:17:53 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2010-05-12 15:17:53 +0000 |
| commit | ba1c91710f44862ec5b9d05307ddf04884bc23ac (patch) | |
| tree | fda1ed8ddb0d0afba810ff63f2a35ee250110ea9 /src | |
| parent | c7c69ea24581812790cd8bed17aa64486277fba0 (diff) | |
| download | scala-ba1c91710f44862ec5b9d05307ddf04884bc23ac.tar.gz scala-ba1c91710f44862ec5b9d05307ddf04884bc23ac.tar.bz2 scala-ba1c91710f44862ec5b9d05307ddf04884bc23ac.zip | |
[scaladoc] Closes #3351 (white space before fir...
[scaladoc] Closes #3351 (white space before first period in comment). No
review.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala | 8 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala b/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala index 31b932ac53..68d17c683f 100644 --- a/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala +++ b/src/compiler/scala/tools/nsc/doc/html/HtmlPage.scala @@ -10,7 +10,7 @@ package html import model._ import comment._ -import xml.{Unparsed, XML, NodeSeq} +import xml.{XML, NodeSeq} import xml.dtd.{DocType, PublicID} import scala.collection._ import scala.reflect.NameTransformer @@ -133,7 +133,7 @@ abstract class HtmlPage { thisPage => case Title(in, 3) => <h3>{ inlineToHtml(in) }</h3> case Title(in, _) => <h4>{ inlineToHtml(in) }</h4> case Paragraph(in) => <p>{ inlineToHtml(in) }</p> - case Code(data) => <pre>{ Unparsed(data) }</pre> + case Code(data) => <pre>{ xml.Text(data) }</pre> case UnorderedList(items) => <ul>{ listItemsToHtml(items) }</ul> case OrderedList(items, listStyle) => @@ -165,8 +165,8 @@ abstract class HtmlPage { thisPage => case Subscript(in) => <sub>{ inlineToHtml(in) }</sub> case Link(raw, title) => <a href={ raw }>{ inlineToHtml(title) }</a> case EntityLink(entity) => templateToHtml(entity) - case Monospace(text) => <code>{ Unparsed(text) }</code> - case Text(text) => Unparsed(text) + case Monospace(text) => <code>{ xml.Text(text) }</code> + case Text(text) => xml.Text(text) case Summary(in) => inlineToHtml(in) } 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 f067555cc3..63b7b10859 100644 --- a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala @@ -333,6 +333,7 @@ trait CommentFactory { thisFactory: ModelFactory with CommentFactory => val constructor = listStyles(style) listLevel(indentStr, style, constructor) } + def code(): Block = { jumpWhitespace() jump("{{{") |