diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-06-09 12:25:28 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-06-09 12:25:28 -0700 |
| commit | 34dcd370389c69d27ad8781ddba1a56fce168479 (patch) | |
| tree | 29363a4c09d1de580e0b993a03d1f4239ccd2952 | |
| parent | 1844e2def6a66c01cf16841416ad351ae64cb951 (diff) | |
| parent | c77edc44c2da1249fd4d61347e9013c969125571 (diff) | |
| download | scala-34dcd370389c69d27ad8781ddba1a56fce168479.tar.gz scala-34dcd370389c69d27ad8781ddba1a56fce168479.tar.bz2 scala-34dcd370389c69d27ad8781ddba1a56fce168479.zip | |
Merge pull request #2533 from soc/SI-6503
SI-6503 Fix doctype, remove processing instructions, ...
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala | 6 | ||||
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala b/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala index 159e16375c..f6373e9e97 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala @@ -42,8 +42,7 @@ abstract class HtmlPage extends Page { thisPage => def body: NodeSeq def writeFor(site: HtmlFactory) { - val doctype = - DocType("html", PublicID("-//W3C//DTD XHTML 1.1//EN", "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"), Nil) + val doctype = DocType("html") val html = <html> <head> @@ -57,7 +56,6 @@ abstract class HtmlPage extends Page { thisPage => </html> writeFile(site) { (w: Writer) => - w.write("<?xml version='1.0' encoding='" + site.encoding + "'?>\n") w.write(doctype.toString + "\n") w.write(xml.Xhtml.toXhtml(html)) } @@ -67,8 +65,6 @@ abstract class HtmlPage extends Page { thisPage => // we're only interested in the body, as this will go into the diff _.write(body.text) } - - //XML.save(pageFile.getPath, html, site.encoding, xmlDecl = false, doctype = doctype) } /** Transforms an optional comment into an styled HTML tree representing its body if it is defined, or into an empty diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala index c034647320..ce3a5eb1fc 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala @@ -35,10 +35,10 @@ class Index(universe: doc.Universe, val index: doc.Index) extends HtmlPage { val body = <body> <div id="library"> - <img class='class icon' src={ relativeLinkTo{List("class.png", "lib")} }/> - <img class='trait icon' src={ relativeLinkTo{List("trait.png", "lib")} }/> - <img class='object icon' src={ relativeLinkTo{List("object.png", "lib")} }/> - <img class='package icon' src={ relativeLinkTo{List("package.png", "lib")} }/> + <img class='class icon' alt='class icon' src={ relativeLinkTo{List("class.png", "lib")} }/> + <img class='trait icon' alt='trait icon' src={ relativeLinkTo{List("trait.png", "lib")} }/> + <img class='object icon' alt='trait icon' src={ relativeLinkTo{List("object.png", "lib")} }/> + <img class='package icon' alt='trait icon' src={ relativeLinkTo{List("package.png", "lib")} }/> </div> { browser } <div id="content" class="ui-layout-center"> |