Tweak kws html format to match output of old format

6 files changed, 39 insertions, 32 deletions

diff --git a/core/testdata/format/website-html/dataTags/multiplatform.package.html b/core/testdata/format/website-html/dataTags/multiplatform.package.html
index 0430c6f2..15e1fc12 100644
--- a/core/testdata/format/website-html/dataTags/multiplatform.package.html
+++ b/core/testdata/format/website-html/dataTags/multiplatform.package.html
@@ -4,56 +4,64 @@
 <table class="api-docs-table">
 <tbody>
 <tr data-platform="JVM" data-jre-version="JRE7"><td>
-<a href="test/foo/jre7">jre7</a>
+<p><a href="test/foo/jre7">jre7</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jre7</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM" data-kotlin-version="Kotlin 1.1" data-jre-version="JRE7"><td>
-<a href="test/foo/jre7-new">jre7New</a>
+<p><a href="test/foo/jre7-new">jre7New</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jre7New</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JS"><td>
-<a href="test/foo/js">js</a>
+<p><a href="test/foo/js">js</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">js</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JS" data-kotlin-version="Kotlin 1.1"><td>
-<a href="test/foo/js-new">jsNew</a>
+<p><a href="test/foo/js-new">jsNew</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jsNew</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM"><td>
-<a href="test/foo/jvm">jvm</a>
+<p><a href="test/foo/jvm">jvm</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jvm</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM" data-kotlin-version="Kotlin 1.1"><td>
-<a href="test/foo/jvm-new">jvmNew</a>
+<p><a href="test/foo/jvm-new">jvmNew</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jvmNew</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM, JS" data-jre-version="JRE7"><td>
-<a href="test/foo/shared">shared</a>
+<p><a href="test/foo/shared">shared</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">shared</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM, JS" data-kotlin-version="Kotlin 1.1" data-jre-version="JRE7"><td>
-<a href="test/foo/shared-new">sharedNew</a>
+<p><a href="test/foo/shared-new">sharedNew</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">sharedNew</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html
index bca7d36d..35773561 100644
--- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html
+++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html
@@ -1,17 +1,17 @@
 <div class='api-docs-breadcrumbs'><a href="test/index">test</a> / <a href="test/pack/index">pack</a> / <a href="test/pack/-some/index">Some</a></div>
 <h1>Some</h1>
-<p><div class="overload-group" data-platform="JVM"><div class="signature"><code><span class="keyword">typealias </span><span class="identifier">Some</span>&nbsp;<span class="symbol">=</span>&nbsp;<span class="identifier">SomeCoolJvmClass</span></code></div>
+<div class="overload-group" data-platform="JVM"><div class="signature"><code><span class="keyword">typealias </span><span class="identifier">Some</span>&nbsp;<span class="symbol">=</span>&nbsp;<span class="identifier">SomeCoolJvmClass</span></code></div>
 <p><strong>Platform and version requirements:</strong> JVM</p>
 </div>
-</p>
-<p><div class="overload-group" data-platform="JS"><div class="signature"><code><span class="keyword">class </span><span class="identifier">Some</span></code></div>
+<div class="overload-group" data-platform="JS"><div class="signature"><code><span class="keyword">class </span><span class="identifier">Some</span></code></div>
 <p><strong>Platform and version requirements:</strong> JS</p>
-<p>Constructors</p>
+<h3>Constructors</h3>
 <table class="api-docs-table">
 <tbody>
 <tr>
 <td>
-<a href="test/pack/-some/-some/-init-">&lt;init&gt;</a>
+<p><a href="test/pack/-some/-some/-init-">&lt;init&gt;</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="identifier">Some</span><span class="symbol">(</span><span class="symbol">)</span></code></div>
@@ -20,12 +20,13 @@
 </tr>
 </tbody>
 </table>
-<p>Functions</p>
+<h3>Functions</h3>
 <table class="api-docs-table">
 <tbody>
 <tr>
 <td>
-<a href="test/pack/-some/-some/magic">magic</a>
+<p><a href="test/pack/-some/-some/magic">magic</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
@@ -35,4 +36,3 @@
 </tbody>
 </table>
 </div>
-</p>
diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html
index 985f9f04..15ae2a5b 100644
--- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html
+++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html
@@ -4,14 +4,16 @@
 <table class="api-docs-table">
 <tbody>
 <tr data-platform="JS"><td>
-<a href="test/pack/-some/index">Some</a>
+<p><a href="test/pack/-some/index">Some</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">class </span><span class="identifier">Some</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM"><td>
-<a href="test/pack/-some-cool-jvm-class/index">SomeCoolJvmClass</a>
+<p><a href="test/pack/-some-cool-jvm-class/index">SomeCoolJvmClass</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">class </span><span class="identifier">SomeCoolJvmClass</span></code></div>
@@ -23,7 +25,8 @@
 <table class="api-docs-table">
 <tbody>
 <tr data-platform="JVM"><td>
-<a href="test/pack/-some/index">Some</a>
+<p><a href="test/pack/-some/index">Some</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">typealias </span><span class="identifier">Some</span>&nbsp;<span class="symbol">=</span>&nbsp;<span class="identifier">SomeCoolJvmClass</span></code></div>
diff --git a/core/testdata/format/website-html/overloadGroup.html b/core/testdata/format/website-html/overloadGroup.html
index 2482f8fb..3ea7de94 100644
--- a/core/testdata/format/website-html/overloadGroup.html
+++ b/core/testdata/format/website-html/overloadGroup.html
@@ -1,18 +1,16 @@
 <div class='api-docs-breadcrumbs'><a href="test/index">test</a> / <a href="test/magic">magic</a></div>
 <h1>magic</h1>
-<p><div class="overload-group"><a name="$magic(kotlin.String)"></a>
+<div class="overload-group"><a name="$magic(kotlin.String)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="parameterName" id="$magic(kotlin.String)/spell">spell</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
-<p>Parameters</p>
+<h3>Parameters</h3>
 <p><a name="spell"></a>
 <code>spell</code> - The text of spell, often distributed on scrolls</p>
-<p><strong>Return</strong>Spell ID for future casts</p>
+<p><strong>Return</strong> Spell ID for future casts</p>
 </div>
-</p>
-<p><div class="overload-group"><a name="$magic(kotlin.Int)"></a>
+<div class="overload-group"><a name="$magic(kotlin.Int)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="parameterName" id="$magic(kotlin.Int)/spell">spell</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
-<p>Parameters</p>
+<h3>Parameters</h3>
 <p><a name="spell"></a>
 <code>spell</code> - Spell ID of previously casted spell</p>
-<p><strong>Return</strong>Spell ID for future casts</p>
+<p><strong>Return</strong> Spell ID for future casts</p>
 </div>
-</p>
diff --git a/core/testdata/format/website-html/returnTag.html b/core/testdata/format/website-html/returnTag.html
index 92253130..d4190fa1 100644
--- a/core/testdata/format/website-html/returnTag.html
+++ b/core/testdata/format/website-html/returnTag.html
@@ -6,4 +6,4 @@
 <h3>Parameters</h3>
 <p><a name="ignoreCase"></a>
 <code>ignoreCase</code> - <code>true</code> to ignore character case when matching a character. By default <code>false</code>.</p>
-<p><strong>Returns</strong>An index of the first occurrence of <a href="test/index-of#$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/char">char</a> or -1 if none is found.</p>
+<p><strong>Returns</strong> An index of the first occurrence of <a href="test/index-of#$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/char">char</a> or -1 if none is found.</p>
diff --git a/core/testdata/format/website-html/sample.html b/core/testdata/format/website-html/sample.html
index 00646a11..55d321c0 100644
--- a/core/testdata/format/website-html/sample.html
+++ b/core/testdata/format/website-html/sample.html
@@ -1,6 +1,6 @@
 <div class='api-docs-breadcrumbs'><a href="test/index">test</a> / <a href="test/foo">foo</a></div>
 <h1>foo</h1>
-<p><div class="overload-group"><a name="$foo()"></a>
+<div class="overload-group"><a name="$foo()"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 <p>Groups elements of the original sequence by the key returned by the given <a href="#">keySelector</a> function
 applied to each element and returns a map where each group key is associated with a list of corresponding elements.</p>
@@ -14,8 +14,6 @@ if (true) {
 //sampleEnd
 }</code></pre></div>
 </div>
-</p>
-<p><div class="overload-group"><a name="$foo(kotlin.Int)"></a>
+<div class="overload-group"><a name="$foo(kotlin.Int)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="parameterName" id="$foo(kotlin.Int)/i">i</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 </div>
-</p>