diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt index 972d4a3e071..500b01a1809 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt @@ -13,14 +13,12 @@ class AllClassesFrameTemplate(val model: KModel, val classAttributes: String = " println(""" -""") - - println("") - println(""" + + -""") - println("All Classes (${model.title})") - print(""" + +All Classes (${model.title}) @@ -35,8 +33,8 @@ class AllClassesFrameTemplate(val model: KModel, val classAttributes: String = " """) for (c in model.classes) { - println("${c.simpleName}") - println("
") + println("""${c.simpleName} +
""") } println(""" diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt index 9ed434a2e25..94a68f71d2d 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt @@ -19,24 +19,20 @@ class ClassExtensionsTemplate(m: KModel, p: KPackage, k: KClass, var functions: println("""

-""") - println("${pkg.name}") - println("
") - println("Extensions on ${klass.name}

") - println("
") - print("
") - print("extension functions on class ${klass.name}
") - - println("from package ") - println(link(pkg)) - println("
") - println(""" + +${pkg.name} +
+Extensions on ${klass.name} +
+
+extension functions on class ${klass.name}
+from package ${link(pkg)} +
+

""") - printFunctionSummary(functions) printFunctionDetail(functions) - println("""

""") diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt index 0d795c80cce..5964fed1f17 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt @@ -21,7 +21,7 @@ open class ClassTemplate(open val model: KModel, pkg: KPackage, open val klass: """) - println("") + println("""""") println(""" """) println(pageTitle()) @@ -29,13 +29,13 @@ open class ClassTemplate(open val model: KModel, pkg: KPackage, open val klass: <META NAME="date" CONTENT="2012-01-09"> <META NAME="date" CONTENT="2012-01-09">""") - println("<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"${pkg.nameAsRelativePath}stylesheet.css\" TITLE=\"Style\">") + println("""<LINK REL="stylesheet" TYPE="text/css" HREF="${pkg.nameAsRelativePath}stylesheet.css" TITLE="Style">""") println(""" <SCRIPT type="text/javascript"> function windowTitle() { if (location.href.indexOf('is-external=true') == -1) {""") - println(" parent.document.title=\"${klass.name} (${model.title})\";") + println(""" parent.document.title="${klass.name} (${model.title})";""") println(""" } } </SCRIPT> @@ -57,14 +57,14 @@ function windowTitle() <A NAME="navbar_top_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top">""") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}overview-summary.html\"><FONT CLASS=\"NavBarFont1\"><B>Overview</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"package-summary.html\"><FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#FFFFFF\" CLASS=\"NavBarCell1Rev\">  <FONT CLASS=\"NavBarFont1Rev\"><B>Class</B></FONT> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"class-use/${klass.simpleName}.html\"><FONT CLASS=\"NavBarFont1\"><B>Use</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"package-tree.html\"><FONT CLASS=\"NavBarFont1\"><B>Tree</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}deprecated-list.html\"><FONT CLASS=\"NavBarFont1\"><B>Deprecated</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}index-all.html\"><FONT CLASS=\"NavBarFont1\"><B>Index</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}help-doc.html\"><FONT CLASS=\"NavBarFont1\"><B>Help</B></FONT></A> </TD>") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/${klass.simpleName}.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>""") println(""" </TR> </TABLE> </TD> @@ -78,17 +78,17 @@ function windowTitle() printPrevNextClass() println("""<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">""") - println(" <A HREF=\"${pkg.nameAsRelativePath}index.html?${klass.nameAsPath}.html\" target=\"_top\"><B>FRAMES</B></A>  ") - println(" <A HREF=\"${klass.simpleName}.html\" target=\"_top\"><B>NO FRAMES</B></A>  ") + println(""" <A HREF="${pkg.nameAsRelativePath}index.html?${klass.nameAsPath}.html" target="_top"><B>FRAMES</B></A>  """) + println(""" <A HREF="${klass.simpleName}.html" target="_top"><B>NO FRAMES</B></A>  """) println(""" <SCRIPT type="text/javascript"> <!-- if(window==top) {""") - println(" document.writeln('<A HREF=\"${pkg.nameAsRelativePath}allclasses-noframe.html\"><B>All Classes</B></A>');") + println(""" document.writeln('<A HREF="${pkg.nameAsRelativePath}allclasses-noframe.html"><B>All Classes</B></A>');""") println(""" } //--> </SCRIPT> <NOSCRIPT>""") - println(" <A HREF=\"${pkg.nameAsRelativePath}allclasses-noframe.html\"><B>All Classes</B></A>") + println(""" <A HREF="${pkg.nameAsRelativePath}allclasses-noframe.html"><B>All Classes</B></A>""") println("""</NOSCRIPT> @@ -117,14 +117,14 @@ DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHO <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top">""") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}overview-summary.html\"><FONT CLASS=\"NavBarFont1\"><B>Overview</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"package-summary.html\"><FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#FFFFFF\" CLASS=\"NavBarCell1Rev\">  <FONT CLASS=\"NavBarFont1Rev\"><B>Class</B></FONT> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"class-use/${klass.simpleName}.html\"><FONT CLASS=\"NavBarFont1\"><B>Use</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"package-tree.html\"><FONT CLASS=\"NavBarFont1\"><B>Tree</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}deprecated-list.html\"><FONT CLASS=\"NavBarFont1\"><B>Deprecated</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}index-all.html\"><FONT CLASS=\"NavBarFont1\"><B>Index</B></FONT></A> </TD>") - println(" <TD BGCOLOR=\"#EEEEFF\" CLASS=\"NavBarCell1\"> <A HREF=\"${pkg.nameAsRelativePath}help-doc.html\"><FONT CLASS=\"NavBarFont1\"><B>Help</B></FONT></A> </TD>") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/${klass.simpleName}.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD>""") + println(""" <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="${pkg.nameAsRelativePath}help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD>""") println(""" </TR> </TABLE> @@ -137,17 +137,17 @@ DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHO <TR>""") printPrevNextClass() println("""<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">""") - println(" <A HREF=\"${pkg.nameAsRelativePath}index.html?${klass.nameAsPath}.html\" target=\"_top\"><B>FRAMES</B></A>  ") - println(" <A HREF=\"${klass.simpleName}.html\" target=\"_top\"><B>NO FRAMES</B></A>  ") + println(""" <A HREF="${pkg.nameAsRelativePath}index.html?${klass.nameAsPath}.html" target="_top"><B>FRAMES</B></A>  """) + println(""" <A HREF="${klass.simpleName}.html" target="_top"><B>NO FRAMES</B></A>  """) println(""" <SCRIPT type="text/javascript"> <!-- if(window==top) {""") - println(" document.writeln('<A HREF=\"${pkg.nameAsRelativePath}allclasses-noframe.html\"><B>All Classes</B></A>');") + println(""" document.writeln('<A HREF="${pkg.nameAsRelativePath}allclasses-noframe.html"><B>All Classes</B></A>');""") println(""" } //--> </SCRIPT> <NOSCRIPT>""") - println(" <A HREF=\"${pkg.nameAsRelativePath}allclasses-noframe.html\"><B>All Classes</B></A>") + println(""" <A HREF="${pkg.nameAsRelativePath}allclasses-noframe.html"><B>All Classes</B></A>""") println("""</NOSCRIPT> @@ -174,44 +174,44 @@ DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHO <!-- ======== START OF CLASS DATA ======== --> <H2> <FONT SIZE="-1">""") - println("${pkg.name}</FONT>") - println("<BR>") - println("Class ${klass.simpleName}</H2>") - println("<PRE>") + println("""${pkg.name}</FONT>""") + println("""<BR>""") + println("""Class ${klass.simpleName}</H2>""") + println("""<PRE>""") for (bc in klass.baseClasses) { println(link(bc, true)) } - println(" <IMG SRC=\"${pkg.nameAsRelativePath}resources/inherit.gif\" ALT=\"extended by \"><B>${klass.name}</B>") + println(""" <IMG SRC="${pkg.nameAsRelativePath}resources/inherit.gif" ALT="extended by "><B>${klass.name}</B>""") println("""</PRE> <HR> <DL>""") - print("<DT><PRE><FONT SIZE=\"-1\">") + print("""<DT><PRE><FONT SIZE="-1">""") printAnnotations(klass.annotations) - print("</FONT>public class <A HREF=\"${pkg.nameAsRelativePath}src-html/${klass.nameAsPath}.html#line.${klass.sourceLine}\"><B>${klass.simpleName}</B></A><DT>") + print("""</FONT>public class <A HREF="${pkg.nameAsRelativePath}src-html/${klass.nameAsPath}.html#line.${klass.sourceLine}"><B>${klass.simpleName}</B></A><DT>""") if (!klass.baseClasses.isEmpty()) { - print("extends ") + print("""extends """) for (bc in klass.baseClasses) { println(link(bc)) } } - println("</DL>") + println("""</DL>""") println("""</PRE> <P>""") println(klass.detailedDescription) if (klass.since.size > 0 || klass.authors.size > 0) { - println("<P>") - println("<DL>") + println("""<P>""") + println("""<DL>""") if (klass.since.size > 0) { - println("<DT><B>Since:</B></DT>") - println(" <DD>${klass.since}</DD>") + println("""<DT><B>Since:</B></DT>""") + println(""" <DD>${klass.since}</DD>""") } for (author in klass.authors) { - println("<DT><B>Author:</B></DT>") - println(" <DD>${author}</DD>") + println("""<DT><B>Author:</B></DT>""") + println(""" <DD>${author}</DD>""") } - println("</DL>") + println("""</DL>""") } println("""<HR> @@ -231,10 +231,10 @@ DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHO println("""<TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>static class</CODE></FONT></TD>""") - println("<TD><CODE><B><A HREF=\"${pkg.nameAsRelativePath}${nc.nameAsPath}.html\" title=\"class in ${nc.packageName}\">${klass.simpleName}.${nc.simpleName}</A></B></CODE>") - println("<BR>") - println("          ${nc.description}") - println("</TD>") + println("""<TD><CODE><B><A HREF="${pkg.nameAsRelativePath}${nc.nameAsPath}.html" title="class in ${nc.packageName}">${klass.simpleName}.${nc.simpleName}</A></B></CODE>""") + println("""<BR>""") + println("""          ${nc.description}""") + println("""</TD>""") } println("""</TR> </TABLE> @@ -254,12 +254,12 @@ DETAIL: FIELD | CONSTR | <A HREF="#method_detail">METHO println("""<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">""") val prev = pkg.previous(klass) if (prev != null) { - println(" <A HREF=\"${pkg.nameAsRelativePath}${prev.nameAsPath}.html\" title=\"class in ${prev.packageName}\"><B>PREV CLASS</B></A> ") + println(""" <A HREF="${pkg.nameAsRelativePath}${prev.nameAsPath}.html" title="class in ${prev.packageName}"><B>PREV CLASS</B></A> """) } val next = pkg.next(klass) if (next != null) { - println(" <A HREF=\"${pkg.nameAsRelativePath}${next.nameAsPath}.html\" title=\"class in ${next.packageName}\"><B>NEXT CLASS</B></A>") + println(""" <A HREF="${pkg.nameAsRelativePath}${next.nameAsPath}.html" title="class in ${next.packageName}"><B>NEXT CLASS</B></A>""") } println("""</FONT></TD>""") } diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt index 7a87904bf41..56137be58f6 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt @@ -16,7 +16,7 @@ class HelpDocTemplate(val model: KModel) : KDocTemplate() { <!-- Generated by javadoc on Mon Jan 09 13:32:00 EST 2012--> <META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <TITLE>""") - println("API Help (${model.title})") + println("""API Help (${model.title})""") println(""" @@ -27,7 +27,7 @@ class HelpDocTemplate(val model: KModel) : KDocTemplate() { function windowTitle() { if (location.href.indexOf('is-external=true') == -1) {""") - println(" parent.document.title=\"API Help (${model.title})\";") + println(""" parent.document.title="API Help (${model.title})";""") println(""" } } diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt index be83a3bec56..5dedcbb1f93 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt @@ -14,10 +14,10 @@ class OverviewFrameTemplate(val model: KModel) : KDocTemplate() { """) - println("") + println("""""") println(""" """) - println("Overview List (${model.title})") + println("""Overview List (${model.title})""") print(""" @@ -41,8 +41,8 @@ class OverviewFrameTemplate(val model: KModel) : KDocTemplate() { Packages
""") for (p in model.packages) { - println("${p.name}") - println("
") + println("""${p.name}""") + println("""
""") } println(""" diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt index 97a9d3bd58d..d9834ee532c 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt @@ -16,7 +16,7 @@ class OverviewSummaryTemplate(val model: KModel) : KDocTemplate() { """) - println("Overview (${model.title})") + println("""Overview (${model.title})""") println(""" @@ -27,7 +27,7 @@ class OverviewSummaryTemplate(val model: KModel) : KDocTemplate() { function windowTitle() { if (location.href.indexOf('is-external=true') == -1) {""") - println(" parent.document.title=\"Overview (${model.title})\";") + println(""" parent.document.title="Overview (${model.title})";""") println(""" } } @@ -103,10 +103,10 @@ function windowTitle() Packages """) for (p in model.packages) { - println("") - println("${p.nameAsPath}") - println("${p.description}") - println("") + println("""""") + println("""${p.nameAsPath}""") + println("""${p.description}""") + println("""""") } println(""" diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt index 963c5637809..5a001da09ae 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt @@ -16,7 +16,7 @@ class OverviewTreeTemplate(val model: KModel) : KDocTemplate() { """) - println("Class Hierarchy (${model.title})") + println("""Class Hierarchy (${model.title})""") println(""" @@ -27,7 +27,7 @@ class OverviewTreeTemplate(val model: KModel) : KDocTemplate() { function windowTitle() { if (location.href.indexOf('is-external=true') == -1) {""") - println(" parent.document.title=\"Class Hierarchy (${model.title})\";") + println(""" parent.document.title="Class Hierarchy (${model.title})";""") println(""" } } @@ -103,8 +103,8 @@ Hierarchy For All Packages if (first) { first = false } else { - print(", ") - print("${p.nameAsPath}") + print(""", """) + print("""${p.nameAsPath}""") } } println(""" diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt index 484dd452192..3aac0bede1a 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt @@ -18,20 +18,20 @@ class PackageFrameTemplate(val model: KModel, p: KPackage) : PackageTemplateSupp """) - println("") + println("""""") println(""" """) - println("${pkg.name} (${model.title})") + println("""${pkg.name} (${model.title})""") println(""" """) - println("") + println("""""") println(""" """) - println("${pkg.name}") + println("""${pkg.name}""") printClasses("interface", "Interfaces") printClasses("class", "Classes") @@ -57,8 +57,8 @@ class PackageFrameTemplate(val model: KModel, p: KPackage) : PackageTemplateSupp
""") for (c in classes) { val formatted = if (kind == "interface") "${c.simpleName}" else c.simpleName - println("$formatted") - println("
") + println("""$formatted""") + println("""
""") } println(""" """) @@ -74,8 +74,8 @@ class PackageFrameTemplate(val model: KModel, p: KPackage) : PackageTemplateSupp
""") for (c in functions) { - println("${c.name}") - println("
") + println("""${c.name}""") + println("""
""") } println(""" """) @@ -93,8 +93,8 @@ class PackageFrameTemplate(val model: KModel, p: KPackage) : PackageTemplateSupp for (e in map.entrySet()) { val c = e?.getKey() if (c != null) { - println("${c.name}") - println("
") + println("""${c.name}""") + println("""
""") } } println(""" diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt index 46a6af73f30..6190a531c3e 100644 --- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt +++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt @@ -17,21 +17,21 @@ class PackageSummaryTemplate(val model: KModel, pkg: KPackage) : PackageTemplate """) - println("") + println("""""") println(""" """) - println("${pkg.name} (${model.title})") + println("""${pkg.name} (${model.title})""") println(""" """) - println("") + println("""""") println(""" @@ -54,15 +54,15 @@ function windowTitle() """) - println("") + println("""""") println("""""") - println("") - println("") - println("") + println("""""") + println("""""") + println("""""") println("""
Overview  Overview   Package  Class  Use  Tree  Deprecated  Index  Help  Deprecated  Index  Help 
@@ -75,17 +75,17 @@ function windowTitle() printNextPrevPackages() println("""""") - println(" FRAMES  ") + println(""" FRAMES  """) println(""" NO FRAMES     @@ -101,12 +101,12 @@ function windowTitle() for (a in pkg.annotations) { val url = a.url if (url != null) { - println("@${a.simpleName}") + println("""@${a.simpleName}""") } } - println("

") - println("Package ${pkg.name}") - println("

") + println("""

""") + println("""Package ${pkg.name}""") + println("""

""") println(pkg.description) println("""

See: @@ -125,7 +125,7 @@ function windowTitle() printExtensionFunctions() println("""

""") - println("Package ${pkg.name} Description") + println("""Package ${pkg.name} Description""") println("""

""") @@ -142,17 +142,17 @@ function windowTitle() val group = e?.getKey() ?: "Other" val list = e?.getValue() if (list != null) { - println("

$group

") + println("""

$group

""") println(""" """) } } - println("

") + println("""

""") printFunctionDetail(pkg.packageFunctions()) @@ -194,7 +194,7 @@ function windowTitle() printNextPrevPackages() println("""""") - println(") FRAMES  ") + println(""") FRAMES  """) println(""" NO FRAMES